From 9f3fa31c0e8f436c3ab28f48ecfd151f71da5e70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Feb 2026 19:23:16 +0000
Subject: [PATCH 001/221] pdftoipe: 7.2.29.1 -> 7.2.29.2

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

diff --git a/pkgs/by-name/pd/pdftoipe/package.nix b/pkgs/by-name/pd/pdftoipe/package.nix
index 54593bfc433d..761e2582077b 100644
--- a/pkgs/by-name/pd/pdftoipe/package.nix
+++ b/pkgs/by-name/pd/pdftoipe/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pdftoipe";
-  version = "7.2.29.1";
+  version = "7.2.29.2";
 
   src = fetchFromGitHub {
     owner = "otfried";
     repo = "ipe-tools";
     rev = "v${version}";
-    hash = "sha256-6FI0ZLRrDmNFAKyht7hB94MsCy+TasD6Mb/rx6sdCdg=";
+    hash = "sha256-BLZKOq7/3QSuwR0yjrDiiIh9N93qk8ihbEPIQ2h+Ffc=";
   };
 
   sourceRoot = "${src.name}/pdftoipe";

From f914d7e320518c8d7ec6f1bc79035ca605c76c63 Mon Sep 17 00:00:00 2001
From: ners <ners@gmx.ch>
Date: Fri, 24 Apr 2026 14:20:38 +0200
Subject: [PATCH 002/221] nixos-shell: add updateScript

---
 pkgs/by-name/ni/nixos-shell/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ni/nixos-shell/package.nix b/pkgs/by-name/ni/nixos-shell/package.nix
index 9d42bb2b05d0..aedd88179e0b 100644
--- a/pkgs/by-name/ni/nixos-shell/package.nix
+++ b/pkgs/by-name/ni/nixos-shell/package.nix
@@ -5,6 +5,7 @@
   jq,
   fetchFromGitHub,
   makeWrapper,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   installFlags = [ "PREFIX=${placeholder "out"}" ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Spawns lightweight nixos vms in a shell";
     inherit (finalAttrs.src.meta) homepage;

From 43e5365edada73b6edea0bc7da197a864d186705 Mon Sep 17 00:00:00 2001
From: ners <ners@gmx.ch>
Date: Fri, 24 Apr 2026 14:21:17 +0200
Subject: [PATCH 003/221] nixos-shell: 2.0.0 -> 2.2.0

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

diff --git a/pkgs/by-name/ni/nixos-shell/package.nix b/pkgs/by-name/ni/nixos-shell/package.nix
index aedd88179e0b..237195bb2014 100644
--- a/pkgs/by-name/ni/nixos-shell/package.nix
+++ b/pkgs/by-name/ni/nixos-shell/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nixos-shell";
-  version = "2.0.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixos-shell";
     rev = finalAttrs.version;
-    sha256 = "sha256-plRKXQqww7easx0wgGKAkOJH1TW/PeeB20dq9XUN8J4=";
+    sha256 = "sha256-sVlbbhRVpAJ8fcjdwJFXlw9MOpb9aqFmAzDCzDi0jqo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ce4d1f665ded48cbfa6ed4451e7ea26a5ff03ce7 Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer@bar-yam.me>
Date: Wed, 29 Apr 2026 17:36:26 +0200
Subject: [PATCH 004/221] nominatim: 5.2.0 -> 5.3.2

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

diff --git a/pkgs/by-name/no/nominatim/package.nix b/pkgs/by-name/no/nominatim/package.nix
index 49cf33ce65e6..f5b8f182c175 100644
--- a/pkgs/by-name/no/nominatim/package.nix
+++ b/pkgs/by-name/no/nominatim/package.nix
@@ -21,14 +21,14 @@ let
 in
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "nominatim";
-  version = "5.2.0";
+  version = "5.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "Nominatim";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ao4oEPz5rtRQtPC2UcIHH1M+o914JraASf+hcB2SDKA=";
+    hash = "sha256-jP/OkEuFdVdvA8Uztv/49FXm9dsExVDjw2l2gyMOSsg=";
   };
 
   postPatch = ''
@@ -57,6 +57,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     pyicu
     python-dotenv
     pyyaml
+    mwparserfromhell
   ];
 
   propagatedBuildInputs = [

From 5a631804a3f43e22884ad32d993c634234f72776 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 May 2026 12:30:01 +0000
Subject: [PATCH 005/221] nedit: 5.7 -> 5.8

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

diff --git a/pkgs/by-name/ne/nedit/package.nix b/pkgs/by-name/ne/nedit/package.nix
index 8e54bc06ae7d..fce42db7de94 100644
--- a/pkgs/by-name/ne/nedit/package.nix
+++ b/pkgs/by-name/ne/nedit/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nedit";
-  version = "5.7";
+  version = "5.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/nedit/nedit-source/nedit-${finalAttrs.version}-src.tar.gz";
-    sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd";
+    sha256 = "sha256-WFGqclLa2VIIRSkXNkAjJWLexKfEQCCfGW1T1KWoB00=";
   };
 
   hardeningDisable = [ "format" ];

From 67bf3bcc1ad15029ebedf0988461b6a162da0b0e Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sun, 3 May 2026 04:47:14 +0000
Subject: [PATCH 006/221] cjdns: 22.1 -> 22.3

---
 pkgs/by-name/cj/cjdns/package.nix | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index e30db3812057..e9e8f81cae95 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -15,36 +15,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cjdns";
-  version = "22.1";
+  version = "22.3";
 
   src = fetchFromGitHub {
     owner = "cjdelisle";
     repo = "cjdns";
     tag = "cjdns-v${finalAttrs.version}";
-    hash = "sha256-0imQrkcvIA+2Eq/zlC65USMR7T3OUKwQxrB1KtVexyU=";
+    hash = "sha256-A5KPcjFrCIYhT/6W+J4Nvb1y23cAgv9M6PWcyN43st4=";
   };
 
   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=";
-    })
-    # Fix build failure with Rust 1.89.0 (https://github.com/cjdelisle/cjdns/pull/1271)
-    (fetchpatch {
-      url = "https://github.com/cjdelisle/cjdns/commit/68b786aca5bfa427e5f58c029e4d9cc74969ef87.patch";
-      hash = "sha256-FmrooDzrIWUIAnzwZTVDXI+Cl8pMngPqxsJjUHVhry8=";
-    })
   ];
 
-  cargoHash = "sha256-f96y6ZW0HxC+73ts5re8GIo2aigQgK3gXyF7fMrcJ0o=";
+  cargoHash = "sha256-tob45/99svE0R1Kk7G1+H7waBWYmI9VKC8ffl3ZmdcU=";
 
   nativeBuildInputs = [
     which

From 927c5b72f13a78d9f1dc4cfd60b5fa771a69a1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Tich=C3=BD?= <richard@tichy.io>
Date: Sun, 3 May 2026 18:53:46 +0200
Subject: [PATCH 007/221] openttd-jgrpp: 0.69.2 -> 0.72.0

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

diff --git a/pkgs/by-name/op/openttd-jgrpp/package.nix b/pkgs/by-name/op/openttd-jgrpp/package.nix
index 4d0794d4d7d9..7bae65bcdbc1 100644
--- a/pkgs/by-name/op/openttd-jgrpp/package.nix
+++ b/pkgs/by-name/op/openttd-jgrpp/package.nix
@@ -6,13 +6,13 @@
 
 openttd.overrideAttrs (oldAttrs: rec {
   pname = "openttd-jgrpp";
-  version = "0.69.2";
+  version = "0.72.0";
 
   src = fetchFromGitHub {
     owner = "JGRennison";
     repo = "OpenTTD-patches";
     rev = "jgrpp-${version}";
-    hash = "sha256-D9Oh05Isf7Atsih6tZBA8xS04aCuE8VS5Ghf0FvrU5A=";
+    hash = "sha256-bja6SiXnA4hdM/h6dyTMxmuII+waHm3iW3AjP0C3dnU=";
   };
   patches = [ ];
 

From 58bd622688e74b239cd6a152d20e438a0073c94f Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Sun, 3 May 2026 21:12:25 +0200
Subject: [PATCH 008/221] luaPackages.mega-logging: init at 1.1.6

---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 30e305795d40..353a6c279e98 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -123,6 +123,7 @@ magick,,,,,5.1,donovanglover
 markdown,,,,,,
 md5,,,,,,
 mediator_lua,,,,,,
+mega.logging,,,,,,
 middleclass,,,,,,
 mimetypes,,,,,,
 mini.test,,,,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 304cac321285..a96c12456764 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -4477,6 +4477,33 @@ final: prev: {
     }
   ) { };
 
+  mega-logging = callPackage (
+    {
+      buildLuarocksPackage,
+      fetchurl,
+      fetchzip,
+    }:
+    buildLuarocksPackage {
+      pname = "mega.logging";
+      version = "1.1.6-1";
+      knownRockspec =
+        (fetchurl {
+          url = "mirror://luarocks/mega.logging-1.1.6-1.rockspec";
+          sha256 = "1va6vl4iqnc3ip2ws1ff65xavw1m6wgdrsal1gvqnjn0gh20vxbg";
+        }).outPath;
+      src = fetchzip {
+        url = "https://github.com/ColinKennedy/mega.logging/archive/v1.1.6.zip";
+        sha256 = "0sy7f42rbdanz9bi0kq6vzllykqcrp04bp7b5k3cqpml5ckywpl5";
+      };
+
+      meta = {
+        homepage = "https://github.com/ColinKennedy/mega.logging";
+        license.fullName = "MIT";
+        description = "A Neovim plugin for logging to Neovim or to disk";
+      };
+    }
+  ) { };
+
   middleclass = callPackage (
     {
       buildLuarocksPackage,

From 37d80aeaeebaf644fdccbdc90cecb9b5ee2293ef Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Sun, 3 May 2026 21:12:25 +0200
Subject: [PATCH 009/221] luaPackages.mega-cmdparse: init at 1.2.1

---
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 353a6c279e98..4488219ecf07 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -123,6 +123,7 @@ magick,,,,,5.1,donovanglover
 markdown,,,,,,
 md5,,,,,,
 mediator_lua,,,,,,
+mega.cmdparse,,,,,,
 mega.logging,,,,,,
 middleclass,,,,,,
 mimetypes,,,,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index a96c12456764..ee057d7ddce9 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -4477,6 +4477,36 @@ final: prev: {
     }
   ) { };
 
+  mega-cmdparse = callPackage (
+    {
+      buildLuarocksPackage,
+      fetchurl,
+      fetchzip,
+      mega-logging,
+    }:
+    buildLuarocksPackage {
+      pname = "mega.cmdparse";
+      version = "1.2.1-1";
+      knownRockspec =
+        (fetchurl {
+          url = "mirror://luarocks/mega.cmdparse-1.2.1-1.rockspec";
+          sha256 = "1766pqazkr3zfwaaj541m53y90n5zr0r7068hd67d9hgvd7za6sb";
+        }).outPath;
+      src = fetchzip {
+        url = "https://github.com/ColinKennedy/mega.cmdparse/archive/v1.2.1.zip";
+        sha256 = "1bf3rf80m65jc51dlv3vcs2jhzk5ni2kr7v5rsmb31k7wk3002qb";
+      };
+
+      propagatedBuildInputs = [ mega-logging ];
+
+      meta = {
+        homepage = "https://github.com/ColinKennedy/mega.cmdparse";
+        license.fullName = "MIT";
+        description = "A Neovim command-mode parser. Similar to Python's argparse module";
+      };
+    }
+  ) { };
+
   mega-logging = callPackage (
     {
       buildLuarocksPackage,

From 9a0bec4b8860f4740dd5440e4d7730593eea0536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Tich=C3=BD?= <richard@tichy.io>
Date: Sun, 3 May 2026 22:46:28 +0200
Subject: [PATCH 010/221] maintainers: add artifycz

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b771a590c9dd..b5241a5133eb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2323,6 +2323,13 @@
     githubId = 14922630;
     name = "Richard Smith";
   };
+  artifycz = {
+    email = "richard@tichy.io";
+    github = "ArtifyCZ";
+    githubId = 57506608;
+    matrix = "@artify:artify.zone";
+    name = "Richard Tichy";
+  };
   artturin = {
     email = "artturin@artturin.com";
     matrix = "@artturin:matrix.org";

From da2f37970281cf2eee19d55ca9d7468865a1667d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Tich=C3=BD?= <richard@tichy.io>
Date: Sun, 3 May 2026 23:01:47 +0200
Subject: [PATCH 011/221] openttd-jgrpp: add artifycz as maintainer

---
 pkgs/by-name/op/openttd-jgrpp/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/op/openttd-jgrpp/package.nix b/pkgs/by-name/op/openttd-jgrpp/package.nix
index 7bae65bcdbc1..6cb0ad949e16 100644
--- a/pkgs/by-name/op/openttd-jgrpp/package.nix
+++ b/pkgs/by-name/op/openttd-jgrpp/package.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   fetchFromGitHub,
   openttd,
   zstd,
@@ -22,6 +23,7 @@ openttd.overrideAttrs (oldAttrs: rec {
     homepage = "https://github.com/JGRennison/OpenTTD-patches";
     changelog = "https://github.com/JGRennison/OpenTTD-patches/blob/jgrpp-${version}/jgrpp-changelog.md";
     mainProgram = "openttd";
+    maintainers = with lib.maintainers; [ artifycz ];
   };
 
 })

From 63e5d6b5d3af307f86a8aeaa90d207976b6d70cf Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Sun, 3 May 2026 17:35:11 -0700
Subject: [PATCH 012/221] petidomo: fix build with gcc15

---
 pkgs/by-name/pe/petidomo/fix-gcc15.patch | 68 ++++++++++++++++++++++++
 pkgs/by-name/pe/petidomo/package.nix     |  7 ++-
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/pe/petidomo/fix-gcc15.patch

diff --git a/pkgs/by-name/pe/petidomo/fix-gcc15.patch b/pkgs/by-name/pe/petidomo/fix-gcc15.patch
new file mode 100644
index 000000000000..6a35ac0b9985
--- /dev/null
+++ b/pkgs/by-name/pe/petidomo/fix-gcc15.patch
@@ -0,0 +1,68 @@
+diff --git a/liblists/lists.h b/liblists/lists.h
+index 6643552..982c8bc 100644
+--- a/liblists/lists.h
++++ b/liblists/lists.h
+@@ -32,7 +32,7 @@
+ #ifndef __cplusplus
+ #ifndef PETIDOMO_HAS_DEFINED_BOOL
+ #  define PETIDOMO_HAS_DEFINED_BOOL 1
+-typedef int bool;
++#include <stdbool.h>
+ #endif
+ #ifndef FALSE
+ #  define FALSE (0==1)
+diff --git a/libtext/text.h b/libtext/text.h
+index a258c79..1fd5274 100644
+--- a/libtext/text.h
++++ b/libtext/text.h
+@@ -36,7 +36,7 @@ extern "C" {
+ #ifndef __cplusplus
+ #ifndef PETIDOMO_HAS_DEFINED_BOOL
+ #  define PETIDOMO_HAS_DEFINED_BOOL 1
+-typedef int bool;
++#include <stdbool.h>
+ #endif
+ 
+ #ifndef FALSE
+diff --git a/petidomo.h b/petidomo.h
+index d503de0..a0c1308 100644
+--- a/petidomo.h
++++ b/petidomo.h
+@@ -26,7 +26,7 @@
+ 
+ #ifndef PETIDOMO_HAS_DEFINED_BOOL
+ #    define PETIDOMO_HAS_DEFINED_BOOL 1
+-     typedef int bool;
++#include <stdbool.h>
+ #endif
+ 
+ #ifndef DEBUG_DMALLOC
+@@ -135,7 +135,7 @@ struct Mail
+     };
+ 
+ void RemoveCarrigeReturns(char *buffer);
+-int isRFC822Address(const char *buffer);
++bool isRFC822Address(const char *buffer);
+ int ParseAddressLine(char *buffer);
+ int ParseReplyToLine(char *buffer);
+ int ParseFromLine(char *buffer);
+@@ -157,8 +157,8 @@ int ArchiveMail(const struct Mail *MailStruct, const char *listname);
+ /********** authen.c **********/
+ 
+ int FindBodyPassword(struct Mail *MailStruct);
+-int isValidAdminPassword(const char *password, const char *listname);
+-int isValidPostingPassword(const char *password, const char *listname);
++bool isValidAdminPassword(const char *password, const char *listname);
++bool isValidPostingPassword(const char *password, const char *listname);
+ 
+ /********** filter.c **********/
+ 
+@@ -226,7 +226,7 @@ const char *getPassword(void  );
+ /********** tool.c **********/
+ 
+ char *buildFuzzyMatchAddress(const char *);
+-int isValidListName(const char *);
++bool isValidListName(const char *);
+ bool isSubscribed(const char *, const char *, char **, char **, bool);
+ 
+ /********** unsubscribe.c **********/
diff --git a/pkgs/by-name/pe/petidomo/package.nix b/pkgs/by-name/pe/petidomo/package.nix
index f277e5e3dfbd..bb66483f5d96 100644
--- a/pkgs/by-name/pe/petidomo/package.nix
+++ b/pkgs/by-name/pe/petidomo/package.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ddNw0fq2MQLJd6YCmIkf9lvq9/Xscl94Ds8xR1hfjXQ=";
   };
 
+  patches = [
+    # https://github.com/peti/petidomo/pull/1
+    ./fix-gcc15.patch
+  ];
+
   buildInputs = [
     flex
     bison
@@ -38,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://petidomo.sourceforge.net/";
     description = "Simple and easy to administer mailing list server";
     license = lib.licenses.gpl3Plus;
-
+    mainProgram = "petidomo";
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.peti ];
   };

From e93563e6a8bc0130c9122cf07406fafa96c7bafb Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 4 May 2026 13:13:04 +0200
Subject: [PATCH 013/221] python3Packages.pyramid-beaker: set license

source: https://github.com/Pylons/pyramid_beaker/blob/master/LICENSE.txt
---
 pkgs/development/python-modules/pyramid-beaker/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyramid-beaker/default.nix b/pkgs/development/python-modules/pyramid-beaker/default.nix
index 4bec91496e21..bb3c620a27fc 100644
--- a/pkgs/development/python-modules/pyramid-beaker/default.nix
+++ b/pkgs/development/python-modules/pyramid-beaker/default.nix
@@ -33,8 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Beaker session factory backend for Pyramid";
     homepage = "https://docs.pylonsproject.org/projects/pyramid_beaker/en/latest/";
-    # idk, see https://github.com/Pylons/pyramid_beaker/blob/master/LICENSE.txt
-    # license = licenses.mpl20;
+    license = lib.licenses.bsd3Modification;
     maintainers = [ ];
   };
 }

From beab2cf395e54b6085768ef13c91b39852e029fa Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 4 May 2026 14:36:14 +0200
Subject: [PATCH 014/221] python3Packages.recursive-pth-loader: set license

This code is part of nixpkgs so it should be under `MIT`
---
 .../python-modules/recursive-pth-loader/default.nix        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix
index c5a21d488fcf..b379c6bfbc6e 100644
--- a/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, python }:
+{
+  lib,
+  stdenv,
+  python,
+}:
 
 stdenv.mkDerivation {
   pname = "python-recursive-pth-loader";
@@ -20,5 +24,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Enable recursive processing of pth files anywhere in sys.path";
+    license = lib.licenses.mit;
   };
 }

From 816dadc58cd2ffedd868cc84f5a6a6ad613cf255 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 4 May 2026 14:47:47 +0200
Subject: [PATCH 015/221] python3Packages.unicodecsv: set license

source: https://github.com/jdunck/python-unicodecsv/blob/master/LICENSE
---
 pkgs/development/python-modules/unicodecsv/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix
index e5e6578e607a..d17af2994b96 100644
--- a/pkgs/development/python-modules/unicodecsv/default.nix
+++ b/pkgs/development/python-modules/unicodecsv/default.nix
@@ -21,5 +21,6 @@ buildPythonPackage rec {
     description = "Drop-in replacement for Python2's stdlib csv module, with unicode support";
     homepage = "https://github.com/jdunck/python-unicodecsv";
     maintainers = with lib.maintainers; [ koral ];
+    license = lib.licenses.bsd2WithViews;
   };
 }

From d887cb9758b6fbc43d2217202be3474933a5921c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 4 May 2026 16:10:50 +0200
Subject: [PATCH 016/221] ocamlPackages.reason-native.src: set license

source: https://github.com/reasonml/reason-native/blob/master/LICENSE
---
 pkgs/development/ocaml-modules/reason-native/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/ocaml-modules/reason-native/default.nix b/pkgs/development/ocaml-modules/reason-native/default.nix
index 46df185ce87c..fbffaab4ae9a 100644
--- a/pkgs/development/ocaml-modules/reason-native/default.nix
+++ b/pkgs/development/ocaml-modules/reason-native/default.nix
@@ -29,6 +29,9 @@ lib.makeScope newScope (self: {
     # When updating this make sure to also update the `version` above
     rev = "20b1997b6451d9715dfdbeec86a9d274c7430ed8";
     hash = "sha256-96Ucq70eSy6pqh5ne9xoODWe/nPuriZnFAdx0OkLVCs=";
+    meta = {
+      license = lib.licenses.mit;
+    };
   };
 
   cli = self.callPackage ./cli.nix { };

From 96b54b19433a2dfb09430a24e22a11dab30fd9e8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 5 May 2026 19:22:41 +0200
Subject: [PATCH 017/221] quill-qr: set license

reason: could not find a license in the source code
---
 pkgs/by-name/qu/quill-qr/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/qu/quill-qr/package.nix b/pkgs/by-name/qu/quill-qr/package.nix
index 79b0c16cb4c0..2ede6e9feee2 100644
--- a/pkgs/by-name/qu/quill-qr/package.nix
+++ b/pkgs/by-name/qu/quill-qr/package.nix
@@ -45,5 +45,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/colonelpanic8/quill-qr";
     maintainers = with lib.maintainers; [ imalison ];
     platforms = with lib.platforms; linux;
+    license = lib.licenses.unfree;
   };
 }

From 748036a3df1a94f5f97dd15b6af0dcae24f126d6 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 5 May 2026 19:27:46 +0200
Subject: [PATCH 018/221] replace: set license

reason: could not find a license in the source code
---
 pkgs/by-name/re/replace/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/re/replace/package.nix b/pkgs/by-name/re/replace/package.nix
index 0030d562f921..1d8550f4870f 100644
--- a/pkgs/by-name/re/replace/package.nix
+++ b/pkgs/by-name/re/replace/package.nix
@@ -38,5 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://replace.richardlloyd.org.uk/";
     mainProgram = "replace-literal";
     platforms = lib.platforms.unix;
+    license = lib.licenses.unfree;
   };
 })

From ab481c5c42c962c25f847a42b1b720f4ad1e414e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 5 May 2026 19:35:10 +0200
Subject: [PATCH 019/221] rofi-menugen: set license

reason: could not find any license in the source code
---
 pkgs/by-name/ro/rofi-menugen/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ro/rofi-menugen/package.nix b/pkgs/by-name/ro/rofi-menugen/package.nix
index 2b5ac7ed0281..55fd7ac1f2a7 100644
--- a/pkgs/by-name/ro/rofi-menugen/package.nix
+++ b/pkgs/by-name/ro/rofi-menugen/package.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/octotep/menugen";
     maintainers = [ ];
     platforms = lib.platforms.all;
+    license = lib.licenses.unfree;
   };
 }

From 629ef0430dada7da0e16f7223aed3b2f5fc70c38 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 5 May 2026 19:36:51 +0200
Subject: [PATCH 020/221] rofi-power-menu: set license

source: https://github.com/jluttine/rofi-power-menu/blob/master/COPYING
---
 pkgs/by-name/ro/rofi-power-menu/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ro/rofi-power-menu/package.nix b/pkgs/by-name/ro/rofi-power-menu/package.nix
index 1d1219cc31f7..1b149a5b785c 100644
--- a/pkgs/by-name/ro/rofi-power-menu/package.nix
+++ b/pkgs/by-name/ro/rofi-power-menu/package.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ ikervagyok ];
     platforms = lib.platforms.linux;
     mainProgram = "rofi-power-menu";
+    license = lib.licenses.mit;
   };
 })

From a352e32786fb99922864944e1503e185a68a086c Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 5 May 2026 19:47:03 +0200
Subject: [PATCH 021/221] rt: set license

source: https://github.com/bestpractical/rt/blob/stable/COPYING
---
 pkgs/by-name/rt/rt/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/rt/rt/package.nix b/pkgs/by-name/rt/rt/package.nix
index 71e4ab7b5841..1acee7c45088 100644
--- a/pkgs/by-name/rt/rt/package.nix
+++ b/pkgs/by-name/rt/rt/package.nix
@@ -177,5 +177,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     platforms = lib.platforms.unix;
+    license = lib.licenses.gpl2Only;
   };
 })

From 7a72b3ecb54c69e94e84d45c8e70eb13d26ad46e Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 6 May 2026 01:41:56 +0800
Subject: [PATCH 022/221] writeHaskell: allow providing function for libraries

This is much safer at avoiding version mismatches.
---
 pkgs/build-support/writers/scripts.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix
index 43880c62ccaf..bb649db24575 100644
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@@ -17,6 +17,7 @@ let
     last
     optionalString
     strings
+    toFunction
     types
     ;
 in
@@ -751,7 +752,7 @@ rec {
     ## `pkgs.writers.writeHaskell` usage example
 
     ```nix
-    writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } ''
+    writeHaskell "missiles" { libraries = hpkgs: [ hpkgs.acme-missiles ]; } ''
       import Acme.Missiles
 
       main = launchMissiles
@@ -777,7 +778,7 @@ rec {
     makeBinWriter {
       compileScript = ''
         cp $contentPath tmp.hs
-        ${(ghc.withPackages (_: libraries))}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs
+        ${(ghc.withPackages (toFunction libraries))}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs
         mv tmp $out
       '';
       inherit makeWrapperArgs strip;

From 0bedef69d94798619f3246aad0f29889a3b9d785 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 5 May 2026 19:54:25 +0200
Subject: [PATCH 023/221] rubik: set license

source: https://fonts.google.com/specimen/Rubik/license
---
 pkgs/by-name/ru/rubik/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ru/rubik/package.nix b/pkgs/by-name/ru/rubik/package.nix
index 67ac23964f55..2cfa62c3b8d5 100644
--- a/pkgs/by-name/ru/rubik/package.nix
+++ b/pkgs/by-name/ru/rubik/package.nix
@@ -46,5 +46,6 @@ stdenvNoCC.mkDerivation {
       glyphs were improved, and glyph set was expanded to GF Cyrillic Plus.
     '';
     platforms = lib.platforms.all;
+    license = lib.licenses.ofl;
   };
 }

From 304be79271cf70a42db5da3cf12ac33de72e4b3b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 5 May 2026 20:00:11 +0200
Subject: [PATCH 024/221] setconf: set license

source: https://github.com/xyproto/setconf/blob/main/COPYING
---
 pkgs/by-name/se/setconf/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/se/setconf/package.nix b/pkgs/by-name/se/setconf/package.nix
index 17acd52dcad0..275adf7f4b41 100644
--- a/pkgs/by-name/se/setconf/package.nix
+++ b/pkgs/by-name/se/setconf/package.nix
@@ -26,6 +26,7 @@ let
       changelog = "https://github.com/xyproto/setconf/releases/tag/${self.src.rev}";
       mainProgram = "setconf";
       maintainers = [ ];
+      license = lib.licenses.gpl2Only;
     };
   };
 in

From b5702359f00e0274bd7773bab40564d97a475beb Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 5 May 2026 20:02:59 +0200
Subject: [PATCH 025/221] sqlboiler-crdb: set license

reason: could not find a license in the source code
---
 pkgs/by-name/sq/sqlboiler-crdb/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sq/sqlboiler-crdb/package.nix b/pkgs/by-name/sq/sqlboiler-crdb/package.nix
index e3fdb1e00d7a..53e22d98c956 100644
--- a/pkgs/by-name/sq/sqlboiler-crdb/package.nix
+++ b/pkgs/by-name/sq/sqlboiler-crdb/package.nix
@@ -25,5 +25,6 @@ buildGoModule {
     homepage = "https://github.com/glerchundi/sqlboiler-crdb/";
     maintainers = with lib.maintainers; [ dgollings ];
     platforms = lib.platforms.unix;
+    license = lib.licenses.unfree;
   };
 }

From 0c86c139b1561781fa96ae6526e56953294d1a61 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 5 May 2026 20:18:53 +0200
Subject: [PATCH 026/221] tesh: set license

source: https://github.com/OceanSprint/tesh/blob/main/LICENSE
---
 pkgs/by-name/te/tesh/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/te/tesh/package.nix b/pkgs/by-name/te/tesh/package.nix
index dc969dd93b8d..9a6eae86f6ec 100644
--- a/pkgs/by-name/te/tesh/package.nix
+++ b/pkgs/by-name/te/tesh/package.nix
@@ -1,4 +1,8 @@
-{ python3Packages, fetchFromGitHub }:
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
 
 let
   version = "0.3.2";
@@ -23,4 +27,8 @@ python3Packages.buildPythonPackage rec {
     pexpect
     distutils
   ];
+
+  meta = {
+    license = lib.licenses.mit;
+  };
 }

From 41eb2fdedf16abb07eafb8bbd75b9c8920ae9b5c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 5 May 2026 21:15:19 +0200
Subject: [PATCH 027/221] python3Packages.pyrealsense2: fix build

fixes https://hydra.nixos.org/build/326870962 zhf https://github.com/NixOS/nixpkgs/issues/516381

upstream pr: https://github.com/realsenseai/librealsense/pull/15022

The fix i pushed to https://github.com/NixOS/nixpkgs/pull/427314 was needed to build all non-gui variants after updating, but the python wrapper had a second issue.
I did not uncover that before the merge because because my builders OOMed trying to build more than one variant in parallel.
---
 .../librealsense/0001-fix-pybind11.patch      | 31 +++++++++++++++++++
 .../libraries/librealsense/default.nix        |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/librealsense/0001-fix-pybind11.patch

diff --git a/pkgs/development/libraries/librealsense/0001-fix-pybind11.patch b/pkgs/development/libraries/librealsense/0001-fix-pybind11.patch
new file mode 100644
index 000000000000..1468eb5847d7
--- /dev/null
+++ b/pkgs/development/libraries/librealsense/0001-fix-pybind11.patch
@@ -0,0 +1,31 @@
+From 1d4f6917c1e71c6f4716be844bc4ef99e07a64f1 Mon Sep 17 00:00:00 2001
+From: Peder Bergebakken Sundt <pbsds@hotmail.com>
+Date: Tue, 5 May 2026 20:58:35 +0200
+Subject: [PATCH] Fix building with pybind11 v3.0.2
+
+pyrealsense2 fails to build with pybind11 v3.0.2
+
+Build error log: https://cache.nixos.org/log/kcry0khph8g0crka6zzkznn8izfvsrq1-librealsense-2.56.3.drv
+
+Cause: https://github.com/pybind/pybind11/pull/5533
+
+I based this fix on https://github.com/NGSolve/netgen/commit/ceacae3844ed2f0c48c8b6a3a82904b16c594f41
+
+I'm not very familiar with pybind11, please double check whether this fix is correct.
+---
+ wrappers/python/pyrs_frame.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wrappers/python/pyrs_frame.cpp b/wrappers/python/pyrs_frame.cpp
+index c5e07bd17f..a2a974eb1b 100644
+--- a/wrappers/python/pyrs_frame.cpp
++++ b/wrappers/python/pyrs_frame.cpp
+@@ -144,7 +144,7 @@ void init_frame(py::module &m) {
+         .def_property_readonly("frame_number", &rs2::frame::get_frame_number, "The frame number. Identical to calling get_frame_number.")
+         .def("get_data_size", &rs2::frame::get_data_size, "Retrieve data size from frame handle.")
+         .def("get_data", get_frame_data, "Retrieve data from the frame handle.", py::keep_alive<0, 1>())
+-        .def_property_readonly("data", get_frame_data, "Data from the frame handle. Identical to calling get_data.", py::keep_alive<0, 1>())
++        .def_property_readonly("data", py::cpp_function(get_frame_data, "Data from the frame handle. Identical to calling get_data.", py::keep_alive<0, 1>()))
+         .def("get_profile", &rs2::frame::get_profile, "Retrieve stream profile from frame handle.")
+         .def_property_readonly("profile", &rs2::frame::get_profile, "Stream profile from frame handle. Identical to calling get_profile.")
+         .def("keep", &rs2::frame::keep, "Keep the frame, otherwise if no refernce to the frame, the frame will be released.")
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 815a6b8b2d8f..abef5142282f 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -78,6 +78,8 @@ stdenv'.mkDerivation rec {
   patches = [
     ./py_pybind11_no_external_download.patch
     ./install-presets.patch
+    # upstream pr: https://github.com/realsenseai/librealsense/pull/15022
+    ./0001-fix-pybind11.patch
   ];
 
   postPatch = ''

From ce5e5116a00c234decb2098ddcfa2fa62243ae57 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 6 May 2026 10:32:46 +0200
Subject: [PATCH 028/221] zsh-autoenv: set license

reason: no license found in source code
---
 pkgs/by-name/zs/zsh-autoenv/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/zs/zsh-autoenv/package.nix b/pkgs/by-name/zs/zsh-autoenv/package.nix
index 63d7bc8b9484..09bdf8afca26 100644
--- a/pkgs/by-name/zs/zsh-autoenv/package.nix
+++ b/pkgs/by-name/zs/zsh-autoenv/package.nix
@@ -42,5 +42,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/Tarrasch/zsh-autoenv";
     mainProgram = "zsh-autoenv-share";
     platforms = lib.platforms.all;
+    license = lib.licenses.unfree;
   };
 }

From 257689de3d626085b008ecc0c05d940acf7c4e27 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 6 May 2026 11:48:00 +0200
Subject: [PATCH 029/221] mailutils: fix portability issue affecting musl

---
 pkgs/by-name/ma/mailutils/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ma/mailutils/package.nix b/pkgs/by-name/ma/mailutils/package.nix
index 33011d4ddf08..493c25cf05b0 100644
--- a/pkgs/by-name/ma/mailutils/package.nix
+++ b/pkgs/by-name/ma/mailutils/package.nix
@@ -92,6 +92,12 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.archlinux.org/archlinux/packaging/packages/mailutils/-/raw/87c3614083260f52dd1222e872a1836f0ff9abe1/fix-build.patch";
       hash = "sha256-RN62l5mYqtViEjXpAlQKWhFez1TPynRMj/1nvZkq5Gs=";
     })
+    # Fix for non-portable assumptions causing test failures on musl
+    (fetchpatch {
+      name = "portability.patch";
+      url = "https://cgit.git.savannah.gnu.org/cgit/mailutils.git/patch/?id=6e038f04d575731cf90a44cf0114e485a9827a26";
+      hash = "sha256-kamIiQty+/PEB9gC4tPsEMzz1GMGuZAe+DXqjdTeg70=";
+    })
   ];
 
   enableParallelBuilding = true;

From 55216bc8d523bda62d8699d0c6691fa054d22835 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 6 May 2026 21:11:06 +0000
Subject: [PATCH 030/221] apidog: 2.8.26 -> 2.8.27

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

diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix
index 9f40de3c39b6..2d27ba4157c2 100644
--- a/pkgs/by-name/ap/apidog/package.nix
+++ b/pkgs/by-name/ap/apidog/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "apidog";
-  version = "2.8.26";
+  version = "2.8.27";
 
   src = fetchurl {
     url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
-    hash = "sha256-u+J5OKgqOKEE35IhMpL7LUB4UgaX2XZKfnUczfLhjoU=";
+    hash = "sha256-elZR7IhS+0PvcO/WowADjsPyjM0NB+5BCDz7PTA+Lr0=";
   };
 
   appimageContents = appimageTools.extract {

From a6f37ca30c27fc06d4266a79dd95c0515bde54e7 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Thu, 7 May 2026 11:43:43 +0700
Subject: [PATCH 031/221] asha-pipewire-sink: 0-unstable-2024-10-22 ->
 0-unstable-2025-05-20

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

diff --git a/pkgs/by-name/as/asha-pipewire-sink/package.nix b/pkgs/by-name/as/asha-pipewire-sink/package.nix
index e80af67f50e3..0dccf53a9896 100644
--- a/pkgs/by-name/as/asha-pipewire-sink/package.nix
+++ b/pkgs/by-name/as/asha-pipewire-sink/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation {
   pname = "asha-pipewire-sink";
-  version = "0-unstable-2024-10-22";
+  version = "0-unstable-2025-05-20";
 
   src = fetchFromGitHub {
     owner = "thewierdnut";
     repo = "asha_pipewire_sink";
-    rev = "bbf665b9a3b90fcdbaeb092799ea3c5ba4347e31";
-    hash = "sha256-PuJ6lBV7s5OqGe1X4wD7T+8LVMCFpgvM1pnMjXYr8gs=";
+    rev = "16a9c1cfba2d9aaa2cedbd86b4aa4f8e556736ae";
+    hash = "sha256-9nfcFB37rBvgu0usySxovbxwQLrGCKDg6dk5kBU50C4=";
   };
 
   nativeBuildInputs = [

From af6d58f9b5fb54e890e6c1535d25ae1a553909cf Mon Sep 17 00:00:00 2001
From: Jack Rosenberg <mail@jackr.eu>
Date: Thu, 7 May 2026 11:13:01 +0200
Subject: [PATCH 032/221] ugarit-manifest-maker: drop

---
 .../by-name/ug/ugarit-manifest-maker/eggs.nix | 430 ------------------
 .../ug/ugarit-manifest-maker/package.nix      |  37 --
 pkgs/top-level/aliases.nix                    |   1 +
 3 files changed, 1 insertion(+), 467 deletions(-)
 delete mode 100644 pkgs/by-name/ug/ugarit-manifest-maker/eggs.nix
 delete mode 100644 pkgs/by-name/ug/ugarit-manifest-maker/package.nix

diff --git a/pkgs/by-name/ug/ugarit-manifest-maker/eggs.nix b/pkgs/by-name/ug/ugarit-manifest-maker/eggs.nix
deleted file mode 100644
index eaf2b9617cce..000000000000
--- a/pkgs/by-name/ug/ugarit-manifest-maker/eggs.nix
+++ /dev/null
@@ -1,430 +0,0 @@
-{ eggDerivation, fetchegg }:
-rec {
-  blob-utils = eggDerivation {
-    name = "blob-utils-1.0.3";
-
-    src = fetchegg {
-      name = "blob-utils";
-      version = "1.0.3";
-      sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml";
-    };
-
-    buildInputs = [
-      setup-helper
-      string-utils
-    ];
-  };
-
-  check-errors = eggDerivation {
-    name = "check-errors-1.13.0";
-
-    src = fetchegg {
-      name = "check-errors";
-      version = "1.13.0";
-      sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi";
-    };
-
-    buildInputs = [
-      setup-helper
-    ];
-  };
-
-  crypto-tools = eggDerivation {
-    name = "crypto-tools-1.3";
-
-    src = fetchegg {
-      name = "crypto-tools";
-      version = "1.3";
-      sha256 = "0442wly63zis19vh8xc9nhxgp9sabaccxylpzmchd5f1d48iag65";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  fnmatch = eggDerivation {
-    name = "fnmatch-1.0.1";
-
-    src = fetchegg {
-      name = "fnmatch";
-      version = "1.0.1";
-      sha256 = "1m3jmyhkyqmjr7v628g6w5n3cqihcfnryrxn91k4597q7vjhikqr";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  foreigners = eggDerivation {
-    name = "foreigners-1.4.1";
-
-    src = fetchegg {
-      name = "foreigners";
-      version = "1.4.1";
-      sha256 = "07nvyadhkd52q0kkvch1a5d7ivpmrhmyg295s4mxb1nw4wz46gfz";
-    };
-
-    buildInputs = [
-      matchable
-    ];
-  };
-
-  lookup-table = eggDerivation {
-    name = "lookup-table-1.13.5";
-
-    src = fetchegg {
-      name = "lookup-table";
-      version = "1.13.5";
-      sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb";
-    };
-
-    buildInputs = [
-      setup-helper
-      check-errors
-      miscmacros
-      record-variants
-      synch
-    ];
-  };
-
-  lru-cache = eggDerivation {
-    name = "lru-cache-0.5.3";
-
-    src = fetchegg {
-      name = "lru-cache";
-      version = "0.5.3";
-      sha256 = "0z6g3106c4j21v968hfzy9nnbfq2d83y0nyd20aifpq4g55c0d40";
-    };
-
-    buildInputs = [
-      record-variants
-    ];
-  };
-
-  matchable = eggDerivation {
-    name = "matchable-3.3";
-
-    src = fetchegg {
-      name = "matchable";
-      version = "3.3";
-      sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  message-digest = eggDerivation {
-    name = "message-digest-3.1.0";
-
-    src = fetchegg {
-      name = "message-digest";
-      version = "3.1.0";
-      sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s";
-    };
-
-    buildInputs = [
-      setup-helper
-      miscmacros
-      check-errors
-      variable-item
-      blob-utils
-      string-utils
-    ];
-  };
-
-  miscmacros = eggDerivation {
-    name = "miscmacros-2.96";
-
-    src = fetchegg {
-      name = "miscmacros";
-      version = "2.96";
-      sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  numbers = eggDerivation {
-    name = "numbers-4.4";
-
-    src = fetchegg {
-      name = "numbers";
-      version = "4.4";
-      sha256 = "0bg5zs6jcr9arj4a7r2xqxf2n17bx93640jaivgchbdj1gixranm";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  parley = eggDerivation {
-    name = "parley-0.9.2";
-
-    src = fetchegg {
-      name = "parley";
-      version = "0.9.2";
-      sha256 = "1vsbx4dk1240gzq02slzmavd1jrq04qj7ssnvg15h8xh81xwhbbz";
-    };
-
-    buildInputs = [
-      stty
-      srfi-71
-      miscmacros
-    ];
-  };
-
-  pathname-expand = eggDerivation {
-    name = "pathname-expand-0.1";
-
-    src = fetchegg {
-      name = "pathname-expand";
-      version = "0.1";
-      sha256 = "14llya7l04z49xpi3iylk8aglrw968vy304ymavhhqlyzmzwkx3g";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  posix-extras = eggDerivation {
-    name = "posix-extras-0.1.6";
-
-    src = fetchegg {
-      name = "posix-extras";
-      version = "0.1.6";
-      sha256 = "0gnmhn2l0161ham7f8i0lx1ay94ap8l8l7ga4nw9qs86lk024abi";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  record-variants = eggDerivation {
-    name = "record-variants-0.5.1";
-
-    src = fetchegg {
-      name = "record-variants";
-      version = "0.5.1";
-      sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  regex = eggDerivation {
-    name = "regex-1.0";
-
-    src = fetchegg {
-      name = "regex";
-      version = "1.0";
-      sha256 = "1z9bh7xvab6h5cdlsz8jk02pv5py1i6ryqarbcs3wdgkkjgmmkif";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  setup-helper = eggDerivation {
-    name = "setup-helper-1.5.5";
-
-    src = fetchegg {
-      name = "setup-helper";
-      version = "1.5.5";
-      sha256 = "1lpplp8f2wyc486dd98gs4wl1kkhh1cs6vdqkxrdk7f92ikmwbx3";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  sql-de-lite = eggDerivation {
-    name = "sql-de-lite-0.6.6";
-
-    src = fetchegg {
-      name = "sql-de-lite";
-      version = "0.6.6";
-      sha256 = "1mh3hpsibq2gxcpjaycqa4ckznj268xpfzsa6pn0i6iac6my3qra";
-    };
-
-    buildInputs = [
-      lru-cache
-      foreigners
-    ];
-  };
-
-  srfi-37 = eggDerivation {
-    name = "srfi-37-1.3.1";
-
-    src = fetchegg {
-      name = "srfi-37";
-      version = "1.3.1";
-      sha256 = "1a2zdkdzrv15fw9dfdy8067fsgh4kr8ppffm8mc3cmlczrrd58cb";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  srfi-71 = eggDerivation {
-    name = "srfi-71-1.1";
-
-    src = fetchegg {
-      name = "srfi-71";
-      version = "1.1";
-      sha256 = "01mlaxw2lfczykmx69xki2s0f4ywlg794rl4kz07plvzn0s3fbqq";
-    };
-
-    buildInputs = [
-
-    ];
-  };
-
-  ssql = eggDerivation {
-    name = "ssql-0.2.4";
-
-    src = fetchegg {
-      name = "ssql";
-      version = "0.2.4";
-      sha256 = "0qhnghhx1wrvav4s7l780mspwlh8s6kzq4bl0cslwp1km90fx9bk";
-    };
-
-    buildInputs = [
-      matchable
-    ];
-  };
-
-  string-utils = eggDerivation {
-    name = "string-utils-1.2.4";
-
-    src = fetchegg {
-      name = "string-utils";
-      version = "1.2.4";
-      sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1";
-    };
-
-    buildInputs = [
-      setup-helper
-      miscmacros
-      lookup-table
-      check-errors
-    ];
-  };
-
-  stty = eggDerivation {
-    name = "stty-0.2.6";
-
-    src = fetchegg {
-      name = "stty";
-      version = "0.2.6";
-      sha256 = "09jmjpdsd3yg6d0f0imcihmn49i28x09lgl60i2dllffs25k22s4";
-    };
-
-    buildInputs = [
-      setup-helper
-      foreigners
-    ];
-  };
-
-  synch = eggDerivation {
-    name = "synch-2.1.2";
-
-    src = fetchegg {
-      name = "synch";
-      version = "2.1.2";
-      sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00";
-    };
-
-    buildInputs = [
-      setup-helper
-      check-errors
-    ];
-  };
-
-  tiger-hash = eggDerivation {
-    name = "tiger-hash-3.1.0";
-
-    src = fetchegg {
-      name = "tiger-hash";
-      version = "3.1.0";
-      sha256 = "0j9dsbjp9cw0y4w4srg0qwgh53jw2v3mx4y4h040ds0fkxlzzknx";
-    };
-
-    buildInputs = [
-      message-digest
-    ];
-  };
-
-  ugarit = eggDerivation {
-    name = "ugarit-2.0";
-
-    src = fetchegg {
-      name = "ugarit";
-      version = "2.0";
-      sha256 = "1l5zkr6b8l5dw9p5mimbva0ncqw1sbvp3d4cywm1hqx2m03a0f1n";
-    };
-
-    buildInputs = [
-      miscmacros
-      sql-de-lite
-      crypto-tools
-      srfi-37
-      stty
-      matchable
-      regex
-      tiger-hash
-      message-digest
-      posix-extras
-      parley
-      ssql
-      pathname-expand
-    ];
-  };
-
-  ugarit-manifest-maker = eggDerivation {
-    name = "ugarit-manifest-maker-0.1";
-
-    src = fetchegg {
-      name = "ugarit-manifest-maker";
-      version = "0.1";
-      sha256 = "1jv8lhn4s5a3qphqd3zfwl1py0m5cmqj1h55ys0935m5f422547q";
-    };
-
-    buildInputs = [
-      matchable
-      srfi-37
-      fnmatch
-      miscmacros
-      ugarit
-      numbers
-    ];
-  };
-
-  variable-item = eggDerivation {
-    name = "variable-item-1.3.1";
-
-    src = fetchegg {
-      name = "variable-item";
-      version = "1.3.1";
-      sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n";
-    };
-
-    buildInputs = [
-      setup-helper
-      check-errors
-    ];
-  };
-}
diff --git a/pkgs/by-name/ug/ugarit-manifest-maker/package.nix b/pkgs/by-name/ug/ugarit-manifest-maker/package.nix
deleted file mode 100644
index 2811980c095f..000000000000
--- a/pkgs/by-name/ug/ugarit-manifest-maker/package.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  chickenPackages_4,
-}:
-
-let
-  eggs = import ./eggs.nix { inherit (chickenPackages_4) eggDerivation fetchegg; };
-in
-
-chickenPackages_4.eggDerivation rec {
-  pname = "ugarit-manifest-maker";
-  version = "0.1";
-  name = "${pname}-${version}";
-
-  src = chickenPackages_4.fetchegg {
-    inherit version;
-    name = pname;
-    sha256 = "1jv8lhn4s5a3qphqd3zfwl1py0m5cmqj1h55ys0935m5f422547q";
-  };
-
-  buildInputs = with eggs; [
-    matchable
-    srfi-37
-    fnmatch
-    miscmacros
-    ugarit
-    numbers
-  ];
-
-  meta = {
-    homepage = "https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/";
-    description = "Tool for generating import manifests for Ugarit";
-    mainProgram = "ugarit-manifest-maker";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index de766a5981cd..5eb29125a349 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2087,6 +2087,7 @@ mapAliases {
   ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27
   udisks2 = udisks; # Added 2025-10-30
   ue4demos = throw "'ue4demos' has been removed because it is unmaintained"; # Added 2026-02-07
+  ugarit-manifest-maker = throw "'ugarit-manifest-maker' has been removed because it is unmaintained"; # Added 2026-05-07
   unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
   unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
   unixODBC = warnAlias "'unixODBC' has been renamed to 'unixodbc'" unixodbc; # Added 2026-02-12

From 5e918e015ebb6026056966d425bcc1c22fb9ab94 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Thu, 7 May 2026 12:19:17 -0700
Subject: [PATCH 033/221] inklingreader: unstable-2017-09-07 ->
 0.8-unstable-2026-05-06

---
 pkgs/by-name/in/inklingreader/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/inklingreader/package.nix b/pkgs/by-name/in/inklingreader/package.nix
index c89c3c7b4e4c..76c76bb131a5 100644
--- a/pkgs/by-name/in/inklingreader/package.nix
+++ b/pkgs/by-name/in/inklingreader/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
+  wrapGAppsHook3,
   gtk3,
   librsvg,
   libusb1,
@@ -11,18 +12,19 @@
 
 stdenv.mkDerivation {
   pname = "inklingreader";
-  version = "unstable-2017-09-07";
+  version = "0.8-unstable-2026-05-06";
 
   src = fetchFromGitHub {
     owner = "roelj";
     repo = "inklingreader";
-    rev = "90f9d0d7f5353657f4d25fd75635e29c10c08d2e";
-    sha256 = "sha256-852m8g61r+NQhCYz9ghSbCG0sjao2E8B9GS06NG4GyY=";
+    rev = "44026d82e494b8068ebd8be377516053487cc2c6";
+    hash = "sha256-NfjLzgFxo3h3gpPeQ+un5f8n1kIxUBQLLRV2CptuxzA=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
+    wrapGAppsHook3
   ];
   buildInputs = [
     gtk3

From bd1234e4757c879e80f2b6c5dbb736e898b84213 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Thu, 7 May 2026 18:41:12 -0700
Subject: [PATCH 034/221] typodermic-{free-fonts,public-domain}: drop

---
 .../ty/typodermic-free-fonts/package.nix      | 38 -------------------
 .../ty/typodermic-public-domain/package.nix   | 36 ------------------
 pkgs/top-level/aliases.nix                    |  2 +
 3 files changed, 2 insertions(+), 74 deletions(-)
 delete mode 100644 pkgs/by-name/ty/typodermic-free-fonts/package.nix
 delete mode 100644 pkgs/by-name/ty/typodermic-public-domain/package.nix

diff --git a/pkgs/by-name/ty/typodermic-free-fonts/package.nix b/pkgs/by-name/ty/typodermic-free-fonts/package.nix
deleted file mode 100644
index 07b43ae4386e..000000000000
--- a/pkgs/by-name/ty/typodermic-free-fonts/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchzip,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "typodermic-free-fonts";
-  version = "2024-12";
-
-  src = fetchzip {
-    url = "https://typodermicfonts.com/wp-content/uploads/2024/12/typodermic-free-fonts-2024d.zip";
-    hash = "sha256-tfv0PTu1gOWXxaoiQJNqnhJKGChGlGJqsqsb/xvBfGU=";
-    curlOptsList = [
-      "--user-agent"
-      "Mozilla/5.0"
-    ]; # unbreak their wordpress
-    stripRoot = false;
-  };
-
-  dontUnpack = true;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/fonts/opentype/
-    cp "$src/"*.otf $out/share/fonts/opentype/
-    runHook postInstall
-  '';
-
-  meta = {
-    homepage = "https://typodermicfonts.com/";
-    description = "Typodermic fonts";
-    license = lib.licenses.unfree // {
-      fullName = "Font Software for Desktop End User License Agreement";
-      url = "https://typodermicfonts.com/end-user-license-agreement/";
-    }; # Font is fine for use in printing and display but cannot be embbeded.
-  };
-}
diff --git a/pkgs/by-name/ty/typodermic-public-domain/package.nix b/pkgs/by-name/ty/typodermic-public-domain/package.nix
deleted file mode 100644
index 7cb52113b50e..000000000000
--- a/pkgs/by-name/ty/typodermic-public-domain/package.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchzip,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "typodermic-public-domain";
-  version = "2024-04";
-
-  src = fetchzip {
-    url = "https://typodermicfonts.com/wp-content/uploads/2024/04/typodermic-public-domain-2024-04.zip";
-    hash = "sha256-grAAU/yL/Q1EyZtrvcgrB6bcXMZoNs7suVYaKibqBOE=";
-    curlOptsList = [
-      "--user-agent"
-      "Mozilla/5.0"
-    ]; # unbreak their wordpress
-    stripRoot = false;
-  };
-
-  dontUnpack = true;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/fonts
-    cp -a "$src/OpenType Fonts" "$out/share/fonts/opentype"
-    runHook postInstall
-  '';
-
-  meta = {
-    homepage = "https://typodermicfonts.com/";
-    description = "Vintage Typodermic fonts";
-    license = lib.licenses.cc0;
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 92cd669ee0c1..4513e3637823 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2082,6 +2082,8 @@ mapAliases {
   trust-dns = throw "'trust-dns' has been renamed to/replaced by 'hickory-dns'"; # Converted to throw 2025-10-27
   tvbrowser-bin = throw "'tvbrowser-bin' has been renamed to/replaced by 'tvbrowser'"; # Converted to throw 2025-10-27
   twitterBootstrap = warnAlias "'twitterBootstrap' has been renamed to 'twitter-bootstrap'"; # Added 2026-02-12
+  typodermic-free-fonts = throw "'typodermic-free-fonts' has been removed as it is unmaintained in nixpkgs, and the src is prone to breakage."; # Added 2026-05-07
+  typodermic-public-domain = throw "'typodermic-public-domain' has been removed as it is unmaintained in nixpkgs, and the src is prone to breakage."; # Added 2026-05-07
   typst-fmt = throw "'typst-fmt' has been renamed to/replaced by 'typstfmt'"; # Converted to throw 2025-10-27
   typstfmt = throw "'typstfmt' has been removed due to lack of upstream maintenance, consider using 'typstyle' instead"; # Added 2025-10-26
   uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27

From b582171d3334903c126909d18d179ba40275ef98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 May 2026 05:28:44 +0000
Subject: [PATCH 035/221] seconlay: 0-unstable-2026-04-13 ->
 0-unstable-2026-04-30

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

diff --git a/pkgs/by-name/se/seconlay/package.nix b/pkgs/by-name/se/seconlay/package.nix
index ba75dfa78942..96f91cf3e929 100644
--- a/pkgs/by-name/se/seconlay/package.nix
+++ b/pkgs/by-name/se/seconlay/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "seconlay";
-  version = "0-unstable-2026-04-13";
+  version = "0-unstable-2026-04-30";
 
   src = fetchFromGitLab {
     group = "alasca.cloud";
     owner = "scl";
     repo = "scl-management";
-    rev = "af2a66ba496a39246ff180ec85b638a24dc74be9";
-    hash = "sha256-T5j7tWcZsHG+LLJHxg+bhT+/8Nh1GznX3u3RLarT9J8=";
+    rev = "a2020efbbc950d037e17a3ae8d628e3205a80447";
+    hash = "sha256-/m2HUdyT/euFVvWPZAHjPGsBH9XeUMuNGlfJFfH/A8Y=";
   };
 
   cargoHash = "sha256-pb9xqdgWrf8Lc10jSkkDb/1n0e15fMQ3AcKNPw6/vi8=";

From f72ac56df28d638720d76b98e845e3855a2031b8 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 6 May 2026 09:27:18 -0300
Subject: [PATCH 036/221] dotnet: fix indentation in update scripts

---
 .../compilers/dotnet/binary/update.sh         | 522 +++++++++---------
 .../compilers/dotnet/source/update.sh         | 238 ++++----
 2 files changed, 380 insertions(+), 380 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/binary/update.sh b/pkgs/development/compilers/dotnet/binary/update.sh
index 116fed9c9aad..63ad985e965f 100755
--- a/pkgs/development/compilers/dotnet/binary/update.sh
+++ b/pkgs/development/compilers/dotnet/binary/update.sh
@@ -10,94 +10,94 @@ trap 'exit 1' ERR
 rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}})
 
 release () {
-    local content="$1"
-    local version="$2"
+  local content="$1"
+  local version="$2"
 
-    jq -er '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content"
+  jq -er '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content"
 }
 
 release_files () {
-    local release="$1"
-    local expr="$2"
+  local release="$1"
+  local expr="$2"
 
-    jq -er '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release"
+  jq -er '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release"
 }
 
 release_platform_attr () {
-    local release_files="$1"
-    local platform="$2"
-    local attr="$3"
+  local release_files="$1"
+  local platform="$2"
+  local attr="$3"
 
-    jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("-composite-") or contains("-pack-") | not)) | ."'"$attr"'"' <<< "$release_files"
+  jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("-composite-") or contains("-pack-") | not)) | ."'"$attr"'"' <<< "$release_files"
 }
 
 platform_sources () {
-    local release_files="$1"
+  local release_files="$1"
 
-    echo "srcs = {"
-    for rid in "${rids[@]}"; do
-        local url hash
+  echo "srcs = {"
+  for rid in "${rids[@]}"; do
+    local url hash
 
-        url=$(release_platform_attr "$release_files" "$rid" url)
-        hash=$(release_platform_attr "$release_files" "$rid" hash)
+    url=$(release_platform_attr "$release_files" "$rid" url)
+    hash=$(release_platform_attr "$release_files" "$rid" hash)
 
-        [[ -z "$url" || -z "$hash" ]] && continue
+    [[ -z "$url" || -z "$hash" ]] && continue
 
-        hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash")
+    hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash")
 
-        echo "      $rid = {
+    echo "      $rid = {
         url = \"$url\";
         hash = \"$hash\";
       };"
-    done
-    echo "    };"
+  done
+  echo "    };"
 }
 
 nuget_index="$(curl -fsSL "https://api.nuget.org/v3/index.json")"
 
 get_nuget_resource() {
-    jq -er '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index"
+  jq -er '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index"
 }
 
 nuget_package_base_url="$(get_nuget_resource "PackageBaseAddress/3.0.0")"
 nuget_registration_base_url="$(get_nuget_resource "RegistrationsBaseUrl/3.6.0")"
 
 generate_package_list() {
-    local version="$1" indent="$2"
-    shift 2
-    local pkgs=( "$@" ) pkg url hash catalog_url catalog hash_algorithm
+  local version="$1" indent="$2"
+  shift 2
+  local pkgs=( "$@" ) pkg url hash catalog_url catalog hash_algorithm
 
-    for pkg in "${pkgs[@]}"; do
-        url=${nuget_package_base_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg
+  for pkg in "${pkgs[@]}"; do
+    url=${nuget_package_base_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg
 
-        if hash=$(curl -s --head "$url" -o /dev/null -w '%header{x-ms-meta-sha512}') && [[ -n "$hash" ]]; then
-            # Undocumented fast path for nuget.org
-            # https://github.com/NuGet/NuGetGallery/issues/9433#issuecomment-1472286080
-            hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash")
-        elif {
-            catalog_url=$(curl -sL --compressed "${nuget_registration_base_url}${pkg,,}/${version,,}.json" | jq -r ".catalogEntry") && [[ -n "$catalog_url" ]] &&
-            catalog=$(curl -sL "$catalog_url") && [[ -n "$catalog" ]] &&
-            hash_algorithm="$(jq -er '.packageHashAlgorithm' <<<"$catalog")"&& [[ -n "$hash_algorithm" ]] &&
-            hash=$(jq -er '.packageHash' <<<"$catalog") && [[ -n "$hash" ]]
-        }; then
-            # Documented but slower path (requires 2 requests)
-            hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo "${hash_algorithm,,}" "$hash")
-        elif hash=$(nix-prefetch-url "$url" --type sha512); then
-            # Fallback to downloading and hashing locally
-            echo "Failed to fetch hash from nuget for $url, falling back to downloading locally" >&2
-            hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash")
-        else
-            echo "Failed to fetch hash for $url" >&2
-            exit 1
-        fi
+    if hash=$(curl -s --head "$url" -o /dev/null -w '%header{x-ms-meta-sha512}') && [[ -n "$hash" ]]; then
+      # Undocumented fast path for nuget.org
+      # https://github.com/NuGet/NuGetGallery/issues/9433#issuecomment-1472286080
+      hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash")
+    elif {
+      catalog_url=$(curl -sL --compressed "${nuget_registration_base_url}${pkg,,}/${version,,}.json" | jq -r ".catalogEntry") && [[ -n "$catalog_url" ]] &&
+        catalog=$(curl -sL "$catalog_url") && [[ -n "$catalog" ]] &&
+        hash_algorithm="$(jq -er '.packageHashAlgorithm' <<<"$catalog")"&& [[ -n "$hash_algorithm" ]] &&
+        hash=$(jq -er '.packageHash' <<<"$catalog") && [[ -n "$hash" ]]
+    }; then
+      # Documented but slower path (requires 2 requests)
+      hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo "${hash_algorithm,,}" "$hash")
+    elif hash=$(nix-prefetch-url "$url" --type sha512); then
+      # Fallback to downloading and hashing locally
+      echo "Failed to fetch hash from nuget for $url, falling back to downloading locally" >&2
+      hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash")
+    else
+      echo "Failed to fetch hash for $url" >&2
+      exit 1
+    fi
 
-        echo "$indent(fetchNupkg { pname = \"${pkg}\"; version = \"${version}\"; hash = \"${hash}\"; })"
-    done
+    echo "$indent(fetchNupkg { pname = \"${pkg}\"; version = \"${version}\"; hash = \"${hash}\"; })"
+  done
 }
 
 versionAtLeast () {
-    local cur_version=$1 min_version=$2
-    printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC
+  local cur_version=$1 min_version=$2
+  printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC
 }
 
 # These packages are implicitly references by the build process,
@@ -123,120 +123,120 @@ versionAtLeast () {
 # This should not happend in minor or bugfix updates, but probably happens
 # with every new major .NET release.
 aspnetcore_packages () {
-    local version=$1
-    local pkgs=(
-        Microsoft.AspNetCore.App.Ref
+  local version=$1
+  local pkgs=(
+    Microsoft.AspNetCore.App.Ref
+  )
+
+  if versionAtLeast "$version" 10; then
+    pkgs+=(
+      Microsoft.AspNetCore.App.Internal.Assets
     )
+  fi
 
-    if versionAtLeast "$version" 10; then
-        pkgs+=(
-            Microsoft.AspNetCore.App.Internal.Assets
-        )
-    fi
-
-    generate_package_list "$version" '    ' "${pkgs[@]}"
+  generate_package_list "$version" '    ' "${pkgs[@]}"
 }
 
 aspnetcore_target_packages () {
-    local version=$1
-    local rid=$2
-    local pkgs=(
-        "Microsoft.AspNetCore.App.Runtime.$rid"
-    )
+  local version=$1
+  local rid=$2
+  local pkgs=(
+    "Microsoft.AspNetCore.App.Runtime.$rid"
+  )
 
-    generate_package_list "$version" '      ' "${pkgs[@]}"
+  generate_package_list "$version" '      ' "${pkgs[@]}"
 }
 
 netcore_packages () {
-    local version=$1
-    local pkgs=(
-        Microsoft.NETCore.DotNetAppHost
-        Microsoft.NETCore.App.Ref
+  local version=$1
+  local pkgs=(
+    Microsoft.NETCore.DotNetAppHost
+    Microsoft.NETCore.App.Ref
+  )
+
+  if ! versionAtLeast "$version" 9; then
+    pkgs+=(
+      Microsoft.NETCore.DotNetHost
+      Microsoft.NETCore.DotNetHostPolicy
+      Microsoft.NETCore.DotNetHostResolver
     )
+  fi
 
-    if ! versionAtLeast "$version" 9; then
-        pkgs+=(
-            Microsoft.NETCore.DotNetHost
-            Microsoft.NETCore.DotNetHostPolicy
-            Microsoft.NETCore.DotNetHostResolver
-        )
-    fi
+  if versionAtLeast "$version" 7; then
+    pkgs+=(
+      Microsoft.DotNet.ILCompiler
+    )
+  fi
 
-    if versionAtLeast "$version" 7; then
-        pkgs+=(
-            Microsoft.DotNet.ILCompiler
-        )
-    fi
+  if versionAtLeast "$version" 8; then
+    pkgs+=(
+      Microsoft.NET.ILLink.Tasks
+    )
+  fi
 
-    if versionAtLeast "$version" 8; then
-        pkgs+=(
-            Microsoft.NET.ILLink.Tasks
-        )
-    fi
-
-    generate_package_list "$version" '    ' "${pkgs[@]}"
+  generate_package_list "$version" '    ' "${pkgs[@]}"
 }
 
 netcore_host_packages () {
-    local version=$1
-    local rid=$2
-    local pkgs=(
-        "Microsoft.NETCore.App.Crossgen2.$rid"
+  local version=$1
+  local rid=$2
+  local pkgs=(
+    "Microsoft.NETCore.App.Crossgen2.$rid"
+  )
+
+  local min_ilcompiler=
+  case "$rid" in
+    linux-musl-arm) ;;
+    linux-arm) ;;
+    win-x86) ;;
+    osx-arm64) min_ilcompiler=8 ;;
+    *) min_ilcompiler=7 ;;
+  esac
+
+  if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then
+    pkgs+=(
+      "runtime.$rid.Microsoft.DotNet.ILCompiler"
     )
+  fi
 
-    local min_ilcompiler=
-    case "$rid" in
-        linux-musl-arm) ;;
-        linux-arm) ;;
-        win-x86) ;;
-        osx-arm64) min_ilcompiler=8 ;;
-        *) min_ilcompiler=7 ;;
-    esac
-
-    if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then
-        pkgs+=(
-            "runtime.$rid.Microsoft.DotNet.ILCompiler"
-        )
-    fi
-
-    generate_package_list "$version" '      ' "${pkgs[@]}"
+  generate_package_list "$version" '      ' "${pkgs[@]}"
 }
 
 netcore_target_packages () {
-    local version=$1
-    local rid=$2
-    local pkgs=(
-        "Microsoft.NETCore.App.Host.$rid"
-        "Microsoft.NETCore.App.Runtime.$rid"
-        "runtime.$rid.Microsoft.NETCore.DotNetAppHost"
+  local version=$1
+  local rid=$2
+  local pkgs=(
+    "Microsoft.NETCore.App.Host.$rid"
+    "Microsoft.NETCore.App.Runtime.$rid"
+    "runtime.$rid.Microsoft.NETCore.DotNetAppHost"
+  )
+
+  if ! versionAtLeast "$version" 9; then
+    pkgs+=(
+      "runtime.$rid.Microsoft.NETCore.DotNetHost"
+      "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy"
+      "runtime.$rid.Microsoft.NETCore.DotNetHostResolver"
     )
+    case "$rid" in
+      linux-musl-arm*) ;;
+      win-arm64) ;;
+      *) pkgs+=(
+           "Microsoft.NETCore.App.Runtime.Mono.$rid"
+         ) ;;
+    esac
+  fi
 
-    if ! versionAtLeast "$version" 9; then
-        pkgs+=(
-            "runtime.$rid.Microsoft.NETCore.DotNetHost"
-            "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy"
-            "runtime.$rid.Microsoft.NETCore.DotNetHostResolver"
-        )
-        case "$rid" in
-            linux-musl-arm*) ;;
-            win-arm64) ;;
-            *) pkgs+=(
-                     "Microsoft.NETCore.App.Runtime.Mono.$rid"
-                 ) ;;
-        esac
-    fi
+  if versionAtLeast "$version" 10; then
+    pkgs+=(
+      "Microsoft.NETCore.App.Runtime.NativeAOT.$rid"
+    )
+  fi
 
-    if versionAtLeast "$version" 10; then
-        pkgs+=(
-            "Microsoft.NETCore.App.Runtime.NativeAOT.$rid"
-        )
-    fi
-
-    generate_package_list "$version" '      ' "${pkgs[@]}"
+  generate_package_list "$version" '      ' "${pkgs[@]}"
 }
 
 usage () {
-    echo "Usage: $pname [[--sdk] [-o output] sem-version] ...
+  echo "Usage: $pname [[--sdk] [-o output] sem-version] ...
 Get updated dotnet src (platform - url & sha512) expressions for specified versions
 
 Exit codes:
@@ -251,61 +251,61 @@ Examples:
 }
 
 update() {
-    local -r sem_version=$1 sdk=$2
-    local output=$3
+  local -r sem_version=$1 sdk=$2
+  local output=$3
 
-    local patch_specified=false
-    # Check if a patch was specified as an argument.
-    # If so, generate file for the specific version.
-    # If only x.y version was provided, get the latest patch
-    # version of the given x.y version.
-    if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then
-        patch_specified=true
-    elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then
-        usage
-        return 1
-    fi
+  local patch_specified=false
+  # Check if a patch was specified as an argument.
+  # If so, generate file for the specific version.
+  # If only x.y version was provided, get the latest patch
+  # version of the given x.y version.
+  if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then
+    patch_specified=true
+  elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then
+    usage
+    return 1
+  fi
 
-    : ${output:="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"/../$sem_version/releases.nix}
-    echo "Generating $output"
+  : ${output:="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"/../$sem_version/releases.nix}
+  echo "Generating $output"
 
-    # Make sure the x.y version is properly passed to .NET release metadata url.
-    # Then get the json file and parse it to find the latest patch release.
-    local major_minor content major_minor_patch
-    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" '
+  # Make sure the x.y version is properly passed to .NET release metadata url.
+  # Then get the json file and parse it to find the latest patch release.
+  local major_minor content major_minor_patch
+  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" || 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
-    local major_minor_underscore=${major_minor/./_}
+    trap 'exit 1' ERR
+  else
+    major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -er '."latest-release"' <<< "$content")
+  fi
+  local major_minor_underscore=${major_minor/./_}
 
-    local release_content aspnetcore_version runtime_version
-    local -a sdk_versions
+  local release_content aspnetcore_version runtime_version
+  local -a sdk_versions
 
-    release_content=$(release "$content" "$major_minor_patch")
-    aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content")
-    runtime_version=$(jq -er '.runtime.version' <<< "$release_content")
+  release_content=$(release "$content" "$major_minor_patch")
+  aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content")
+  runtime_version=$(jq -er '.runtime.version' <<< "$release_content")
 
-    if [[ -n $sdk ]]; then
-        sdk_versions=("$sem_version")
-    else
-        mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn)
-    fi
+  if [[ -n $sdk ]]; then
+    sdk_versions=("$sem_version")
+  else
+    mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn)
+  fi
 
-    # If patch was not specified, check if the package is already the latest version
-    # If it is, exit early
-    if [ "$patch_specified" == false ] && [ -f "$output" ]; then
-        local -a versions
-        IFS= readarray -d '' versions < <(
-            nix-instantiate --eval --json -E "{ output }: with (import output {
+  # If patch was not specified, check if the package is already the latest version
+  # If it is, exit early
+  if [ "$patch_specified" == false ] && [ -f "$output" ]; then
+    local -a versions
+    IFS= readarray -d '' versions < <(
+      nix-instantiate --eval --json -E "{ output }: with (import output {
                 buildAspNetCore = { ... }: {};
                 buildNetSdk = { version, ... }: { inherit version; };
                 buildNetRuntime = { version, ... }: { inherit version; };
@@ -314,54 +314,54 @@ update() {
                 runtime_${major_minor_underscore}.version
                 sdk_${major_minor_underscore}.version
             ]" --argstr output "$output" | jq -e --raw-output0 .[])
-        if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then
-            echo "Nothing to update."
-            return
-        fi
+    if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then
+      echo "Nothing to update."
+      return
     fi
+  fi
 
-    local aspnetcore_files runtime_files
-    aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")"
-    runtime_files="$(release_files "$release_content" .runtime)"
+  local aspnetcore_files runtime_files
+  aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")"
+  runtime_files="$(release_files "$release_content" .runtime)"
 
-    local channel_version support_phase
-    channel_version=$(jq -er '."channel-version"' <<< "$content")
-    support_phase=$(jq -er '."support-phase"' <<< "$content")
+  local channel_version support_phase
+  channel_version=$(jq -er '."channel-version"' <<< "$content")
+  support_phase=$(jq -er '."support-phase"' <<< "$content")
 
-    local aspnetcore_sources runtime_sources
-    aspnetcore_sources="$(platform_sources "$aspnetcore_files")"
-    runtime_sources="$(platform_sources "$runtime_files")"
+  local aspnetcore_sources runtime_sources
+  aspnetcore_sources="$(platform_sources "$aspnetcore_files")"
+  runtime_sources="$(platform_sources "$runtime_files")"
 
-    result=$(mktemp -t dotnet-XXXXXX.nix)
-    trap "rm -f $result" TERM INT EXIT
+  result=$(mktemp -t dotnet-XXXXXX.nix)
+  trap "rm -f $result" TERM INT EXIT
 
-    (
-        echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }:
+  (
+    echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }:
 
 # v$channel_version ($support_phase)
 
 let
   commonPackages = ["
-        aspnetcore_packages "${aspnetcore_version}"
-        netcore_packages "${runtime_version}"
-        echo "  ];
+    aspnetcore_packages "${aspnetcore_version}"
+    netcore_packages "${runtime_version}"
+    echo "  ];
 
   hostPackages = {"
-        for rid in "${rids[@]}"; do
-            echo "    $rid = ["
-            netcore_host_packages "${runtime_version}" "$rid"
-            echo "    ];"
-        done
-        echo "  };
+    for rid in "${rids[@]}"; do
+      echo "    $rid = ["
+      netcore_host_packages "${runtime_version}" "$rid"
+      echo "    ];"
+    done
+    echo "  };
 
   targetPackages = {"
-        for rid in "${rids[@]}"; do
-            echo "    $rid = ["
-            aspnetcore_target_packages "${aspnetcore_version}" "$rid"
-            netcore_target_packages "${runtime_version}" "$rid"
-            echo "    ];"
-        done
-        echo "  };
+    for rid in "${rids[@]}"; do
+      echo "    $rid = ["
+      aspnetcore_target_packages "${aspnetcore_version}" "$rid"
+      netcore_target_packages "${runtime_version}" "$rid"
+      echo "    ];"
+    done
+    echo "  };
 
 in rec {
   release_$major_minor_underscore = \"$major_minor_patch\";
@@ -376,22 +376,22 @@ in rec {
     $runtime_sources
   };"
 
-        local -A feature_bands
-        unset latest_sdk
+    local -A feature_bands
+    unset latest_sdk
 
-        for sdk_version in "${sdk_versions[@]}"; do
-            local sdk_base_version=${sdk_version%-*}
-            local feature_band=${sdk_base_version:0:-2}xx
-            # sometimes one release has e.g. both 8.0.202 and 8.0.203
-            [[ ! ${feature_bands[$feature_band]+true} ]] || continue
-            feature_bands[$feature_band]=$sdk_version
-            local sdk_files sdk_sources
-            sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")"
-            sdk_sources="$(platform_sources "$sdk_files")"
-            local sdk_attrname=sdk_${feature_band//./_}
-            [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname
+    for sdk_version in "${sdk_versions[@]}"; do
+      local sdk_base_version=${sdk_version%-*}
+      local feature_band=${sdk_base_version:0:-2}xx
+      # sometimes one release has e.g. both 8.0.202 and 8.0.203
+      [[ ! ${feature_bands[$feature_band]+true} ]] || continue
+      feature_bands[$feature_band]=$sdk_version
+      local sdk_files sdk_sources
+      sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")"
+      sdk_sources="$(platform_sources "$sdk_files")"
+      local sdk_attrname=sdk_${feature_band//./_}
+      [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname
 
-            echo "
+      echo "
   $sdk_attrname = buildNetSdk {
     version = \"${sdk_version}\";
     $sdk_sources
@@ -399,49 +399,49 @@ in rec {
     runtime = runtime_$major_minor_underscore;
     aspnetcore = aspnetcore_$major_minor_underscore;
   };"
-        done
+    done
 
-        if [[ -n $sdk ]]; then
-            echo "
+    if [[ -n $sdk ]]; then
+      echo "
   sdk = sdk_$major_minor_underscore;
 "
-        fi
+    fi
 
-        echo "
+    echo "
   sdk_$major_minor_underscore = $latest_sdk;
 }"
-        )> "$result"
+  )> "$result"
 
-    nixfmt "$result"
-    mkdir -p "$(dirname -- "$output")"
-    cp "$result" "$output"
-    echo "Generated $output"
+  nixfmt "$result"
+  mkdir -p "$(dirname -- "$output")"
+  cp "$result" "$output"
+  echo "Generated $output"
 }
 
 main () {
-    local pname sdk output
-    pname=$(basename "$0")
+  local pname sdk output
+  pname=$(basename "$0")
 
-        sdk=
-        output=
+  sdk=
+  output=
 
-        while [ $# -gt 0 ]; do
-            case $1 in
-                --sdk)
-                    shift
-                    sdk=1
-                    ;;
-                -o)
-                    shift
-                    output=$1
-                    shift
-                    ;;
-                *)
-                    update "$1" "$sdk" "$output"
-                    shift
-                    ;;
-            esac
-        done
+  while [ $# -gt 0 ]; do
+    case $1 in
+      --sdk)
+        shift
+        sdk=1
+        ;;
+      -o)
+        shift
+        output=$1
+        shift
+        ;;
+      *)
+        update "$1" "$sdk" "$output"
+        shift
+        ;;
+    esac
+  done
 }
 
 main "$@"
diff --git a/pkgs/development/compilers/dotnet/source/update.sh b/pkgs/development/compilers/dotnet/source/update.sh
index fc78d31aab08..585f45e71f19 100755
--- a/pkgs/development/compilers/dotnet/source/update.sh
+++ b/pkgs/development/compilers/dotnet/source/update.sh
@@ -3,30 +3,30 @@
 set -euo pipefail
 
 updateSdk() {
-    tag=${1-}
+  tag=${1-}
 
-    if [[ -n $tag ]]; then
-        query=$(cat <<EOF
+  if [[ -n $tag ]]; then
+    query=$(cat <<EOF
             map(
                 select(
                     (.tag_name == "$tag"))) |
             first
 EOF
-        )
-    else
-        sdkVersionPrefix=$channel.1
+         )
+  else
+    sdkVersionPrefix=$channel.1
 
-        query=$(cat <<EOF
+    query=$(cat <<EOF
             map(
                 select(
                     .draft == false and
                     (.tag_name | startswith("v$sdkVersionPrefix")))) |
             first
 EOF
-        )
-    fi
+         )
+  fi
 
-    query="$query "$(cat <<EOF
+  query="$query "$(cat <<EOF
         | (
             .tag_name,
             (.assets |
@@ -39,152 +39,152 @@ EOF
                 select(.name | endswith(".tar.gz.sig")) |
                 .browser_download_url))
 EOF
-    )
+       )
 
-    (
-        curl -fsSL https://api.github.com/repos/dotnet/dotnet/releases | \
-        jq -er "$query" \
-    ) | (
-        read tagName
-        read releaseUrl
-        read sigUrl
+  (
+    curl -fsSL https://api.github.com/repos/dotnet/dotnet/releases | \
+      jq -er "$query" \
+      ) | (
+    read tagName
+    read releaseUrl
+    read sigUrl
 
-        release=${tagName#*.*.}
-        band=${release:0:1}xx
+    release=${tagName#*.*.}
+    band=${release:0:1}xx
 
-        output="$(dirname "${BASH_SOURCE[0]}")"/../"$channel"
+    output="$(dirname "${BASH_SOURCE[0]}")"/../"$channel"
 
-        if [[ $band != 1xx ]]; then
-          output+=/$band
-        fi
+    if [[ $band != 1xx ]]; then
+      output+=/$band
+    fi
 
-        mkdir -p "$output"
+    mkdir -p "$output"
 
-        [[ ! -e "$output"/release.json || $(jq -r .tag "$output"/release.json) != "$tagName" ]] || {
-            >&2 echo "release is already $tagName"
-            exit
-        }
+    [[ ! -e "$output"/release.json || $(jq -r .tag "$output"/release.json) != "$tagName" ]] || {
+      >&2 echo "release is already $tagName"
+      exit
+    }
 
-        # TMPDIR might be really long, which breaks gpg
-        tmp="$(TMPDIR=/tmp mktemp -d)"
-        trap 'rm -rf "$tmp"' EXIT
+    # TMPDIR might be really long, which breaks gpg
+    tmp="$(TMPDIR=/tmp mktemp -d)"
+    trap 'rm -rf "$tmp"' EXIT
 
-        cd "$tmp"
+    cd "$tmp"
 
-        curl -fsSL "$releaseUrl" -o release.json
+    curl -fsSL "$releaseUrl" -o release.json
 
-        tarballUrl=https://github.com/dotnet/dotnet/archive/refs/tags/$tagName.tar.gz
+    tarballUrl=https://github.com/dotnet/dotnet/archive/refs/tags/$tagName.tar.gz
 
-        mapfile -t prefetch < <(nix-prefetch-url --print-path "$tarballUrl")
-        tarballHash=$(nix-hash --to-sri --type sha256 "${prefetch[0]}")
-        tarball=${prefetch[1]}
+    mapfile -t prefetch < <(nix-prefetch-url --print-path "$tarballUrl")
+    tarballHash=$(nix-hash --to-sri --type sha256 "${prefetch[0]}")
+    tarball=${prefetch[1]}
 
-        # recent dotnet 10 releases don't have a signature for the github tarball
-        if [[ ! $sigUrl = */dotnet-source-* ]]; then
-          curl -fssL "$sigUrl" -o release.sig
-          curl -fssLO https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc
-          echo '17aebc401e7999dd0642fa06d23780eba15bd916ebb118454f34db5c85f7194a  release-key-2023.asc' |
-            sha256sum -c
+    # recent dotnet 10 releases don't have a signature for the github tarball
+    if [[ ! $sigUrl = */dotnet-source-* ]]; then
+      curl -fssL "$sigUrl" -o release.sig
+      curl -fssLO https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc
+      echo '17aebc401e7999dd0642fa06d23780eba15bd916ebb118454f34db5c85f7194a  release-key-2023.asc' |
+        sha256sum -c
 
-          (
-              export GNUPGHOME=$PWD/.gnupg
-              mkdir -m 700 -p $GNUPGHOME
-              trap 'gpgconf --kill all' EXIT
-              gpg --no-autostart --batch --import release-key-2023.asc
-              gpg --no-autostart --batch --verify release.sig "$tarball"
-          )
-        fi
+      (
+        export GNUPGHOME=$PWD/.gnupg
+        mkdir -m 700 -p $GNUPGHOME
+        trap 'gpgconf --kill all' EXIT
+        gpg --no-autostart --batch --import release-key-2023.asc
+        gpg --no-autostart --batch --verify release.sig "$tarball"
+      )
+    fi
 
-        tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh
-        artifactsVersion=$(xq -r '.Project.PropertyGroup |
+    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
-            artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh)
-            eval "$artifactVar"
+    if [[ "$artifactsVersion" != "" ]]; then
+      artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh)
+      eval "$artifactVar"
 
-            artifactsFile=Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz
+      artifactsFile=Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz
 
-            dotnetBuildUrl=https://builds.dotnet.microsoft.com/
+      dotnetBuildUrl=https://builds.dotnet.microsoft.com/
 
-            if [[ $major -ge 10 ]]; then
-                dotnetBuildUrl+=dotnet/source-build
-            else
-                dotnetBuildUrl+=source-built-artifacts/assets
-            fi
+      if [[ $major -ge 10 ]]; then
+        dotnetBuildUrl+=dotnet/source-build
+      else
+        dotnetBuildUrl+=source-built-artifacts/assets
+      fi
 
-            artifactsUrl=$dotnetBuildUrl/$artifactsFile
+      artifactsUrl=$dotnetBuildUrl/$artifactsFile
 
-            curl -fsSL "$artifactsUrl" --head || {
-              [[ $? == 22 ]]
-              artifactsUrl=https://ci.dot.net/public/source-build/$artifactsFile
-            }
-        else
-            artifactsUrl=$(xq -r '.Project.PropertyGroup |
+      curl -fsSL "$artifactsUrl" --head || {
+        [[ $? == 22 ]]
+        artifactsUrl=https://ci.dot.net/public/source-build/$artifactsFile
+      }
+    else
+      artifactsUrl=$(xq -r '.Project.PropertyGroup |
                 map(select(.PrivateSourceBuiltArtifactsUrl))
                 | .[] | .PrivateSourceBuiltArtifactsUrl' eng/Versions.props)
-            artifactsUrl="${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}"
-        fi
+      artifactsUrl="${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}"
+    fi
 
-        artifactsHash=$(nix-prefetch-url "$artifactsUrl")
-        artifactsHash=$(nix-hash --to-sri --type sha256 "$artifactsHash")
+    artifactsHash=$(nix-prefetch-url "$artifactsUrl")
+    artifactsHash=$(nix-hash --to-sri --type sha256 "$artifactsHash")
 
-        sdkVersion=$(jq -er .tools.dotnet global.json)
+    sdkVersion=$(jq -er .tools.dotnet global.json)
 
-        # below needs to be run in nixpkgs because toOutputPath uses relative paths
-        cd -
+    # below needs to be run in nixpkgs because toOutputPath uses relative paths
+    cd -
 
-        cp "$tmp"/release.json "$output"
+    cp "$tmp"/release.json "$output"
 
-        jq --null-input \
-            --arg _0 "$tarballHash" \
-            --arg _1 "$artifactsUrl" \
-            --arg _2 "$artifactsHash" \
-            '{
-                "tarballHash": $_0,
-                "artifactsUrl": $_1,
-                "artifactsHash": $_2,
-            }' > "$output"/release-info.json
+    jq --null-input \
+       --arg _0 "$tarballHash" \
+       --arg _1 "$artifactsUrl" \
+       --arg _2 "$artifactsHash" \
+       '{
+          "tarballHash": $_0,
+          "artifactsUrl": $_1,
+          "artifactsHash": $_2,
+        }' > "$output"/release-info.json
 
-        if [[ $band == 1xx ]]; then
-            getBootstrap() {
-                pkgs/development/compilers/dotnet/binary/update.sh \
-                    -o "$output"/bootstrap-sdk.nix --sdk "$1" >&2
-            }
+    if [[ $band == 1xx ]]; then
+      getBootstrap() {
+        pkgs/development/compilers/dotnet/binary/update.sh \
+          -o "$output"/bootstrap-sdk.nix --sdk "$1" >&2
+      }
 
-            getBootstrap "$sdkVersion" || if [[ $? == 2 ]]; then
-                >&2 echo "WARNING: bootstrap sdk missing, attempting to bootstrap with self"
-                getBootstrap "$(jq -er .sdkVersion "$tmp"/release.json)"
-            else
-                exit 1
-            fi
+      getBootstrap "$sdkVersion" || if [[ $? == 2 ]]; then
+        >&2 echo "WARNING: bootstrap sdk missing, attempting to bootstrap with self"
+        getBootstrap "$(jq -er .sdkVersion "$tmp"/release.json)"
+      else
+        exit 1
+      fi
 
-            $(nix-build -A dotnetCorePackages.dotnet_$major.vmr.fetch-deps --no-out-link) >&2
-        fi
-    )
+      $(nix-build -A dotnetCorePackages.dotnet_$major.vmr.fetch-deps --no-out-link) >&2
+    fi
+  )
 }
 
 while [ $# -gt 0 ]; do
-    channel="$1"
-    shift
+  channel="$1"
+  shift
 
-    major="${channel%.*}"
+  major="${channel%.*}"
 
-    if [[ $major -lt 8 ]]; then
-        >&2 echo "dotnet $major has no vmr"
+  if [[ $major -lt 8 ]]; then
+    >&2 echo "dotnet $major has no vmr"
+    continue
+  fi
+
+  curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$channel"/releases.json |
+    jq -r '.releases[0].sdks.[] | .version' | {
+    while read sdk; do
+      if [[ $major -lt 10 && $sdk != *.*.1* ]]; then
+        >&2 echo "sdk $sdk has no vmr"
         continue
-    fi
+      fi
 
-    curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$channel"/releases.json |
-        jq -r '.releases[0].sdks.[] | .version' | {
-        while read sdk; do
-            if [[ $major -lt 10 && $sdk != *.*.1* ]]; then
-                >&2 echo "sdk $sdk has no vmr"
-                continue
-            fi
-
-            updateSdk v"$sdk"
-        done
-    }
+      updateSdk v"$sdk"
+    done
+  }
 done

From 5a2c4a386e482fe0a217d4a29aec9fcc21b60cac Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 8 May 2026 15:12:55 -0300
Subject: [PATCH 037/221] dotnet: don't evaluate missing packages

This allows the update scripts to work when the generated files have
been removed.
---
 pkgs/development/compilers/dotnet/default.nix | 2 --
 pkgs/development/compilers/dotnet/dotnet.nix  | 9 +++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index b0629746d176..3eadb90bfa24 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -84,12 +84,10 @@ makeScopeWithSplicing' {
       let
         dotnet_6 = callWithUtils ./dotnet.nix {
           channel = "6.0";
-          withVMR = false;
         };
 
         dotnet_7 = callWithUtils ./dotnet.nix {
           channel = "7.0";
-          withVMR = false;
         };
 
         dotnet_8 = callWithUtils ./dotnet.nix {
diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix
index b484ef3e3ef4..fd9783f9d980 100644
--- a/pkgs/development/compilers/dotnet/dotnet.nix
+++ b/pkgs/development/compilers/dotnet/dotnet.nix
@@ -5,12 +5,17 @@
   channel,
   dir ? ./. + ("/" + channel),
   buildDotnetSdk,
-  withVMR ? true,
   ...
 }@attrs:
 
 let
-  binary = buildDotnetSdk (dir + "/releases.nix");
+  binary =
+    let
+      path = dir + "/releases.nix";
+    in
+    if lib.pathExists path then buildDotnetSdk path else { };
+
+  withVMR = lib.pathExists (dir + "/release.json");
 
   sourcePackages = lib.optionalAttrs withVMR (callPackage ./source (attrs // { inherit binary; }));
 

From 74650a5ad1f0f10692d18b470d78a3aa658d89b5 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 9 May 2026 12:00:00 +0000
Subject: [PATCH 038/221] bombono: fix build

---
 pkgs/by-name/bo/bombono/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/bombono/package.nix b/pkgs/by-name/bo/bombono/package.nix
index f7fe83f4ab9e..4f2213c4d577 100644
--- a/pkgs/by-name/bo/bombono/package.nix
+++ b/pkgs/by-name/bo/bombono/package.nix
@@ -49,7 +49,9 @@ stdenv.mkDerivation {
 
   postPatch = ''
     substituteInPlace src/mbase/SConscript \
-      --replace "lib_mbase_env['CPPDEFINES']" "list(lib_mbase_env['CPPDEFINES'])"
+      --replace-fail "lib_mbase_env['CPPDEFINES']" "list(lib_mbase_env['CPPDEFINES'])"
+    # adapt to recent C standards
+    substituteInPlace Autoconfig --replace-fail "void (*signal ()) ();" "void (*signal(int,  void (*)(int)))(int);"
   '';
 
   nativeBuildInputs = [

From 69bb196372c81c16c30f1da42ab2dda85a2b2e52 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 9 May 2026 12:00:00 +0000
Subject: [PATCH 039/221] gimp2: fix build

---
 pkgs/applications/graphics/gimp/2.0/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix
index 9dd68e31322e..eaa2d87417b3 100644
--- a/pkgs/applications/graphics/gimp/2.0/default.nix
+++ b/pkgs/applications/graphics/gimp/2.0/default.nix
@@ -149,6 +149,11 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://salsa.debian.org/gnome-team/gimp/-/raw/4cb293ec1a3b273281d5d9daf94b833c293797d7/debian/patches/CVE-2025-10934.patch";
       hash = "sha256-MmYdh74cky/dF3UTHC0xpDW6+aa8Vzh+4ADHCDtIDzo=";
     })
+    (fetchurl {
+      name = "c23.patch";
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/85bdad2b2ca7ba36a01bef945b1c4b193a2fa9d0.patch";
+      hash = "sha256-6g2Zhbx+WxX7lOCYAFII0yDbwILecExwFD22tZDED50=";
+    })
   ];
 
   # error: possibly undefined macro: AM_NLS

From 6129439e5abb334e70d838f4e12ce253d18fb217 Mon Sep 17 00:00:00 2001
From: aaravrav <37036762+aaravrav@users.noreply.github.com>
Date: Sat, 9 May 2026 19:55:48 +0530
Subject: [PATCH 040/221] shufflecake: 0.5.5 -> 0.5.8

---
 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 327fb031e606..a32e61db6c63 100644
--- a/pkgs/os-specific/linux/shufflecake/default.nix
+++ b/pkgs/os-specific/linux/shufflecake/default.nix
@@ -10,13 +10,13 @@
 stdenv.mkDerivation (finalAttrs: {
   name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
   pname = "shufflecake";
-  version = "0.5.5";
+  version = "0.5.8";
 
   src = fetchFromCodeberg {
     owner = "shufflecake";
     repo = "shufflecake-c";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xVuI7tRARPFuETCCKYt507WpvZVZLaj9dhBkhJ03zc8=";
+    hash = "sha256-eI5tWujUHj9S8d1aOFMuokjVWI2GGEml68cuQ6K0/C8=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 31ab3029dd9e3150b01d30d612b05bb32407cb99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 May 2026 19:48:35 +0000
Subject: [PATCH 041/221] pawn-appetit: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/by-name/pa/pawn-appetit/package.nix b/pkgs/by-name/pa/pawn-appetit/package.nix
index 6152bb4502fe..50dd83f55a9f 100644
--- a/pkgs/by-name/pa/pawn-appetit/package.nix
+++ b/pkgs/by-name/pa/pawn-appetit/package.nix
@@ -27,13 +27,13 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pawn-appetit";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "Pawn-Appetit";
     repo = "pawn-appetit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WJ/tFOizESDqdLy4maMKUZ79mgyyxqLuwCxWZ0+NVX4=";
+    hash = "sha256-9D8zeo62+xb5EsVQ39nPcwCx1w/47oY0NNFQyrSpFGQ=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       ;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-amXrz/ZzvjvNYlqxzTtQXiZw/NnUVJ7PhqG8oHsEe88=";
+    hash = "sha256-c4ckvmzosWrB5eXG/xpOH8mYgNNMgqBZ9q8yU7Pjve4=";
   };
 
   postPatch = ''
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoRoot = "src-tauri";
 
-  cargoHash = "sha256-UKaW+NiNA398nyGs9+SjY+tUvLjCPrSxX6bZLSl7/EQ=";
+  cargoHash = "sha256-bglNpRsHUZoHE7/KGAc9UHWI6Dtg7foA7/8NZ7qtfqw=";
 
   buildAndTestSubdir = finalAttrs.cargoRoot;
 

From 3aadd2474373d079e1cc6c1d798c9254d63edab3 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sat, 9 May 2026 22:49:37 +0200
Subject: [PATCH 042/221] neofetch: improve throw message

See discussion in #495887 and #501520.

Co-authored-by: Yiyu Zhou <yiyu@yiyuzhou.io>
Co-authored-by: NullCube <nullcub3@gmail.com>
---
 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 403b2b4aa6ed..e10bfcb172a0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1471,7 +1471,7 @@ mapAliases {
   nekoray = lib.warnOnInstantiate "nekoray has been renamed to throne" throne; # Added 2025-11-10
   neo4j-desktop = throw "neo4j-desktop has been removed as it was out-of-date"; # Added 2025-11-01
   neocities-cli = throw "'neocities-cli' has been renamed to/replaced by 'neocities'"; # Converted to throw 2025-10-27
-  neofetch = throw "'neofetch' has been removed because it is unmaintained upstream. Consider using 'fastfetch' instead."; # Added 2026-03-02
+  neofetch = throw "'neofetch' has been removed because it was unmaintained upstream. Consider using the updated fork 'neowofetch' provided by the 'hyfetch' package or the alternative 'fastfetch' instead."; # Added 2026-03-02
   netbox_4_1 = throw "netbox 4.1 series has been removed as it was EOL"; # Added 2025-10-14
   netbsdCross = throw "'netbsdCross' has been renamed to/replaced by 'netbsd'"; # Converted to throw 2025-10-27
   netsurf.browser = throw "'netsurf.browser' has been renamed to/replaced by 'netsurf-browser'"; # Converted to throw 2025-10-27

From bf30317baf551c4d6cb31bb92a3961ff368e7ae1 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sat, 9 May 2026 22:52:10 +0200
Subject: [PATCH 043/221] neofetch: add release note for removal

See discussion in #495887.
---
 doc/release-notes/rl-2605.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index 5953d676210c..a585781131d8 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -288,6 +288,8 @@
 
 - `spacefm` was removed because it appeared to be unmaintained upstream.
 
+- `neofetch` has been removed because it was unmaintained upstream. Consider using the updated fork `neowofetch` provided by the `hyfetch` package or the alternative `fastfetch` instead.
+
 - `vimPlugins.nvim-treesitter` has been updated to `main` branch, which is a full and incompatible rewrite. If you can't or don't want to update, you should use `vimPlugins.nvim-treesitter-legacy`.
 
 - `services.taskchampion-sync-server` module have been added an option `services.taskchampion-sync-server.dynamicUser` to use systemd's DynamicUser feature. This is enabled by default when stateVersion is at least 26.05, and disabled otherwise. If you need this feature, you need to set `services.taskchampion-sync-server.dynamicUser` to `true` and migrate `/var/lib/taskchampion-sync-server` to `/var/lib/private/taskchampion-sync-server`.

From a8b04525998391b38fdd0ad621c3967e52dc0cc9 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 8 May 2026 15:05:13 -0300
Subject: [PATCH 044/221] dotnet: reduce update time

The update bot is currently failing to update dotnet due to fetch-deps
30m.

- add a --vmr-bootstrap flag to binary/update.sh

This allows us to skip a bunch of packages and platforms that aren't
needed for bootstrapping the VMR.  We also add the IL[D]Asm packages
that were previously in deps.json for versions 9+.

- disable fetch-deps in versions 9+.
---
 .../compilers/dotnet/10.0/bootstrap-sdk.nix   | 431 ++-----------
 .../compilers/dotnet/10.0/deps.json           |  51 +-
 .../compilers/dotnet/11.0/bootstrap-sdk.nix   | 431 ++-----------
 .../compilers/dotnet/8.0/bootstrap-sdk.nix    | 571 ------------------
 .../compilers/dotnet/8.0/deps.json            |  54 --
 .../compilers/dotnet/9.0/bootstrap-sdk.nix    | 371 ++----------
 .../compilers/dotnet/9.0/deps.json            |  51 +-
 .../compilers/dotnet/binary/update.sh         | 174 +++---
 .../compilers/dotnet/source/stage0.nix        |   9 +-
 .../compilers/dotnet/source/update.sh         |  25 +-
 10 files changed, 247 insertions(+), 1921 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix
index 7b013ed2a62c..abe039f3df55 100644
--- a/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix
@@ -9,31 +9,6 @@
 
 let
   commonPackages = [
-    (fetchNupkg {
-      pname = "Microsoft.AspNetCore.App.Ref";
-      version = "10.0.5";
-      hash = "sha512-Ktpg7S9q0hqEU61eFrv9MD9Tjlh1dzp2SgoDjr7JaiBOaNQOLtyYVAceV9ezAcJ4psLKsTKO81oX+Iuf4RhIEQ==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.AspNetCore.App.Internal.Assets";
-      version = "10.0.5";
-      hash = "sha512-EVPO8CrM8wNIL1LpwgDzAzgAd/9GbyA6PiphaH678yedlzzMLZ5u5CINri9JAbJ3iW7QiTzOclPXhu0TWnQGlA==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "10.0.5";
-      hash = "sha512-LAqUC8iR3isE1E/FjWZ3ro1MyMXl3EnjkxlyNDr92fOxlcnnA4G5tdy67Vet3EuXIAtVNR2KPfCmykB7bEJgHA==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.App.Ref";
-      version = "10.0.5";
-      hash = "sha512-vO3fy0Y/qnWjyZbWNWh+ccnwHhlwhm7Hz/HgN/YnkU03zWgqXHLzu2FSzvmkgk6RAsbzw8Nm+Co1FRA4dz+Fkg==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.DotNet.ILCompiler";
-      version = "10.0.5";
-      hash = "sha512-Y6R0+8pMvCi7vq0R9RFtU6vj+gE6hFfAzXNMWKULFFHUlqbbVWhj3QBoQCOe5/4bQChk0QWg8k7i/pAxyj1WiA==";
-    })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
       version = "10.0.5";
@@ -42,19 +17,22 @@ let
   ];
 
   hostPackages = {
-    linux-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "10.0.5";
-        hash = "sha512-D7Hz+xRec/A2VH9rwqrPxIM/YlHwbfDZV0Eikloh4eJl5LytP2EBCQjg+PWFmQnDoh4NxRFE5HKbtTaU9pqVkA==";
-      })
-    ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
         version = "10.0.5";
         hash = "sha512-pUikpkbJmTObQh5v7CrIGshp2kW+qYrxUVDML5pirTLPga3LI8PFp/IGaApvM2vO9nCj4QXwLCEm3WDi/aXNYg==";
       })
+      (fetchNupkg {
+        pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm";
+        version = "10.0.5";
+        hash = "sha512-lwuqcJBXzERKfQsvyazrysr8w/sTXMX4yEWHQpxVbYbbJ0Q3NYZuBFF5b8Kj95CotZ7tROihtaj6NSU5H0Fl/g==";
+      })
+      (fetchNupkg {
+        pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm";
+        version = "10.0.5";
+        hash = "sha512-xrlbKJinxm8YW7jJztS4jsWA67o82rK+sw0/3kB6LGBO0OfTWAAyn2wiM9nNGc7mwatWlaJsz1VpRnsFXPzhXQ==";
+      })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
         version = "10.0.5";
@@ -67,49 +45,38 @@ let
         version = "10.0.5";
         hash = "sha512-NM7MFm5+nQ/sic0P2iGXgxwDj/bGZ2r3cjK+Ax2vvvQNHIJl5knw8y5r9lFSYpIwE4gA1FN66W5Yb8rQopHoyA==";
       })
+      (fetchNupkg {
+        pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm";
+        version = "10.0.5";
+        hash = "sha512-mLRe66IRBIpPbQupO82l/PWn5ZPPdQf3DcN+cSgpP58cgCyEpFj3Q7jCRRS3f7tLe9jc8B50yrybb3ztBJ8kpA==";
+      })
+      (fetchNupkg {
+        pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm";
+        version = "10.0.5";
+        hash = "sha512-4uwzf2oSww5VcpDeI66ie4uRAB/CVJtuvWjbSunQp7tSxJcPIl7OnCY+TljJak8yFpJcFW4BiMlUGMIKBpKKjg==";
+      })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
         version = "10.0.5";
         hash = "sha512-Gi+ZdJq9xBsllyMv9TJAVtlMXeMpAWf3ArxJ49RJ2bpSW1lKc1nWEVQ3xI53MgGQTSi2D8fk/+mFP++jvBxD9w==";
       })
     ];
-    linux-musl-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "10.0.5";
-        hash = "sha512-cobJfKOo+3sLAO6DRwHUuwDVfbDYiXXtoR/lKyGbSfmWSLY1qfGzJTVBuNp/+Rtncn/OBJ6jQ1fAP9Sul1OH9Q==";
-      })
-    ];
-    linux-musl-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "10.0.5";
-        hash = "sha512-qplAXaAnkLbVwaSI3zQB9YTfxrwv6xK4Ti3NPR0Hpywjqe1UhjHrefz4bJRVgh9QcNqLxdgH4ja6pMlvF2G10g==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.5";
-        hash = "sha512-+4RIyAnPeoRDC1pxfS1fqlq5I8KRQgUc2hgLrNqbPmyO4M6QB3+e9u39fOZi/Hg/FHYx5TTVbB0GrhiCbMr+GQ==";
-      })
-    ];
-    linux-musl-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "10.0.5";
-        hash = "sha512-kNH0Wr161xmHhtwvu6hLn7ReMHHF/rr6orocFeAj7tXP1Mt3Hjpydl4ieTNXd+Q6QD2ufs14kQOcmXrWA6XCTg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.5";
-        hash = "sha512-X8JiYyQFwRvpM63TI+szjk/2EVjkdn3QaxlDld7WrTB2EL/e6YPU5Vmot3Pjg4U/ORBi1bnygoAJIZWDBd1W/g==";
-      })
-    ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
         version = "10.0.5";
         hash = "sha512-GPptAxSiLpFiXblT0g+ourLNofK6j30a3KjIt74OiFklg9Tr5M2MKhV8KfzJ7kqeG8jgviYuHy+2yZ1+8QchGA==";
       })
+      (fetchNupkg {
+        pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm";
+        version = "10.0.5";
+        hash = "sha512-nhqDpYsJ0ZtIzmCz14yZxLGb3NWqi6+UUOvX8oWK4TppwB6k+BUSbxJqizxnZiPOdvEtDGgUg82Mjy85oDKZww==";
+      })
+      (fetchNupkg {
+        pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm";
+        version = "10.0.5";
+        hash = "sha512-gvHj4jcm27QN4VdA88D5LesFQduNQhmOteIsxpmmT6RZSnvgGV5nm7QEAsAD8hcfLMJanC4LPT8wkSsXahSYrQ==";
+      })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
         version = "10.0.5";
@@ -122,99 +89,36 @@ let
         version = "10.0.5";
         hash = "sha512-zTRKBdj7hhJJJyXrlkcMiE+5rF/0JkiADnxVP2MRLyUvj4d0COAIsczwQgO3RxyYtsAgOiwwLscOWmb8A5pvvw==";
       })
+      (fetchNupkg {
+        pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm";
+        version = "10.0.5";
+        hash = "sha512-CZRQIfY04HIsdEFKvgAvjv4yV9X/odFOhgAl7cEBFAdZAfvdnnpZpXEPGxBmQsA9lNvwDr610O0vVeDO4AKfUQ==";
+      })
+      (fetchNupkg {
+        pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm";
+        version = "10.0.5";
+        hash = "sha512-wistTWcuIbhOz4BI3tYLnkY5w6IjJkk1QCbHzQHHX0o15qvsmMT1eb25CM81ZJRAwMSxPjhZLshPdTdhHPHARA==";
+      })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
         version = "10.0.5";
         hash = "sha512-ZajiQZT7q2tQtOM18Lk8SWVoCcYLKg0YXDybHpIast0mqM4DXXvNXDeTOERufdioEoxy5s6STiOy7BPN7XnX6A==";
       })
     ];
-    win-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "10.0.5";
-        hash = "sha512-mkjk4oeHj7mutqsszAWhxtFRwwjXFr1uI5JopdN31Y1v/rxFwfwzjftsnlEwNcMtxWftooVZK9+uBQ66iWE7Kw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.5";
-        hash = "sha512-1bwi83hLpxKRElgr80UES+FV8uhIVX0T14hOSukAy6cgjxPVmkPvllcL2wcVL862IZ8mNvMubFMyIHI9X5tzKg==";
-      })
-    ];
-    win-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "10.0.5";
-        hash = "sha512-AEDznHbzYo0x/j4NJmGN2+9iaVC4G+f/O7MZWJfgS1ghSlQ1nE78/9n/CaKRaLV0kJszOrHSVtVT+WpXygQBJw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.5";
-        hash = "sha512-LVHy/0yiKtncb1QOk3ixTfpT7HyLqX0ahpybFSbr/E7D8jJOijQ3eFNHpyzO9IQ6yKpA1/f1maFy7xg9hMPxJQ==";
-      })
-    ];
-    win-x86 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "10.0.5";
-        hash = "sha512-rsn1PvaakbpQfUOtyLodRcJuUyyn1I6ubGmt2Lfn6yVdLi761gEUqy+uPbyqw7UUBOVZHn4RPhspAXjIufixlQ==";
-      })
-    ];
   };
 
   targetPackages = {
-    linux-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "10.0.5";
-        hash = "sha512-+ilMva1bCAUMrOpPRiNfzSewq/Tp1JkrdioTJDxqpzsfBuOizDynqr0tBbckZnWiygo/tKjZWP8uoZNAscroZQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "10.0.5";
-        hash = "sha512-ov3HneAvNdMPK9ALqRKEu13VADbbZ6D+jdRHqkx2pGAu6RvueNGLLbiufNTlTSLkXsZMI6XlU26aqycPG2zXdw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "10.0.5";
-        hash = "sha512-JkHJiR7vL6mUtdIZz2YXIQtWqabjdgHaFxyt5jQWOJHCvc3RFAsOVSMMsAC8l+npjkjipTy1JDidbiygJtFGYw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-qRze/kRX3MyRvmudB+SkxSdisBYtYCI/0s6uCq15j8MC5ls1slhDOQohBhpGqokJvO9p1/BkRyogAejmpveAmw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm";
-        version = "10.0.5";
-        hash = "sha512-GqlBlcnxxNX14NUTl13Hc/AewEadOuaWRpmQURs3zfvWjqMXkE1yDOxA/1j0KnFfJEjFXqYiAn8Q52gIYq1Wag==";
-      })
-    ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
         version = "10.0.5";
         hash = "sha512-Kp+MsuKVXftYrRfCCSG1iX0Bx9PXtE6dkKof5WwgW4OKwEmQrZR1u/shk0pXlTt/j18sALS2HaZd0sHuHjVfXQ==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "10.0.5";
-        hash = "sha512-qt1Ap/tRTi6CavFtXJmBnzHpIBv+MXi8x2SZuNdolC5f9PJ91Knd3cRMl0doebNFo3USyWeSEMuox8opiVtdSQ==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
         version = "10.0.5";
         hash = "sha512-7/upjkbj/5xKViNzlVkYPq0hIwCnjApGmxRCLWdW3HBXdwVUrVsvNtvXJW1L58HlIK9/AaErmZMrjjhfbZMUlA==";
       })
-      (fetchNupkg {
-        pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-ucjmiECPTHBzvBe6H2fmsY6Ensjj7Ke5NUlOxFebQWhkdwS60zPOcMnSrns7qSJffL6jp9X0FOHWYUeImBc9dQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64";
-        version = "10.0.5";
-        hash = "sha512-Z5+MK4jKA1mNwXAvtI0UTg67vop5LoHRtNgKtQLZkjk+ge+F36ybFQOOhcwBu2Yso5b0rn9V9H5DI0n8osNp3Q==";
-      })
     ];
     linux-x64 = [
       (fetchNupkg {
@@ -222,107 +126,11 @@ let
         version = "10.0.5";
         hash = "sha512-S/cZ4FGOWCCdkeV7itqKS5j7kui8GDnJW16yAWCT6QRRkbXF0yP7NE18hdnEydZaQT8NjECxRjp3mkwl/xkawQ==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "10.0.5";
-        hash = "sha512-zL01730sNpJABOrMaIYjZvX1dYGB7FnIHHbFBuxUoRxxCKCxO/g+Xc3OHq5omR0R1Tj9VFrYZckPxSAh7tM3JA==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
         version = "10.0.5";
         hash = "sha512-geyVni1xsr4NPqWB1ygit+ewOhJv3cHoh2PKT1dP+6AlBkeALZZnAhyrSuG0CHgIE8+mpFSv/CxQoWPWqFDZ/Q==";
       })
-      (fetchNupkg {
-        pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-7GDrN+V3+go78AbI8EGZRbI4d1/446XUDrPs1fo8bXOUKmW3MhpVty5Yur/rShI+g0AaGtsOsETawLRKfrUxmA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64";
-        version = "10.0.5";
-        hash = "sha512-767sIOnHoYvcik6wLCvJg/aemlmHSqDQRaCghd36Go9QYJMuXcYtdGEk6m4mRVM3pEirS5/kVqZWtWhDdL5RpA==";
-      })
-    ];
-    linux-musl-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "10.0.5";
-        hash = "sha512-DkRALJnKSi/+0zTBkQfLVZP8FR7Hb33CwS+upyYxq/Dpdi2oBjnr0pbJLdINR83j530P47VgUKwKr+l74ED51A==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "10.0.5";
-        hash = "sha512-SonDz+TLIIBe6rVjdzfKR7SyqvOn84ZAwrSLDWX2miRSwMN3iIYAHL1nkKii5aJhqUM0xbl69zRxEp0cbqkPbw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "10.0.5";
-        hash = "sha512-g0ETxPNUff6SxCXrjUlzj9zy2nPpmgzbkEwayQngZTGR/zpgL5jLI1Q6e/GGGMCrpFc+SWIO1hxpqui1H4TARA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-I4riXKiTE1O7a/H4aCTmIFRE4LlmMLwzyAo8HwbZUdqYNtFhqm7ByTJ3nHi8BTG5CPaE6BNJ27/MPNqN+sJ30w==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm";
-        version = "10.0.5";
-        hash = "sha512-yXSmkwzv6MdUniaBk7+lj/oV0Q5CoGiX6HF4ZxlUxaCTcLkg7XI+kRfBjD9ZYZHv8qChc/nkU9zJaZkpbQuOdw==";
-      })
-    ];
-    linux-musl-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.5";
-        hash = "sha512-IZTJ4sSam7VntRBhvpCjJoCDnb6F/uLy2wpdOTyrenwYxfdBYQPIPLJeAemH9wYuIAv1/ljd9N9HR3K/l8hT5Q==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "10.0.5";
-        hash = "sha512-8JZThCg9zOAu9PEJ/ETfAmGqL2sY88KNBp3MTZrjfQhYHGN+uTnqfUA7TpJtiTYFSrmY3kYJ5KBzv0jj/cNBHg==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.5";
-        hash = "sha512-YLR/sCAc99a+zAWZEvP5NzdOg48vifHRdEx8PKIx9AG7upx7NUnp7Wi2HAfC9jzAMziP4Nsmk3qdAPKh3l2gyg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-f0/gO5PzVXMrqeRATua6zobitnZ+iUE+JxYSw3P0BDgDFPt3+uWI/eULbLjTosr3nJdLF1Td9sNGYxpi54ivpA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64";
-        version = "10.0.5";
-        hash = "sha512-3gLTjeteK89N5/onUYJm1KPt+xoTf37ZTJwJ+G9dv709v1zLDpZEUtG+puLOIZzCFpzqnBj+2+JDdYrX0skmkw==";
-      })
-    ];
-    linux-musl-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "10.0.5";
-        hash = "sha512-ao2tW5jlik4441BgZSpspSbcJneWxQhu/3eGL91EjY7JsQsOT5ga59ULSBWo9X6VuqeHQN8dVMkvNbRzMha7cw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "10.0.5";
-        hash = "sha512-+McjW48YCQx/uNHsyMjowcG0cFg/fv+P9wAQ3ra3cwjbkkSbuAQcfEDiF98mwfPOdcF5xFVSiUJKErnOX4YScw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "10.0.5";
-        hash = "sha512-dvIY+3OjpqPeYN7nUzmCE0AcOAuzAFzH6/XnRq6MeqEHjFaTAU0uapdxn+qDOvAvspF37mdIUVuNFrlTGkCC6A==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-RoiIBfpNaQReuCqRqzJ0pe06udmDpf5mgKRDdXilw19ZXhz1rs6apVKbaMQAPUDwdxQoiuxhFIA1EQSZCfImsA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64";
-        version = "10.0.5";
-        hash = "sha512-z/tKLcDLBPdTiyq9LiHb2OcvxhizFcN2lOdkmMdOP1Eh1BQ06ws+8yzdtQGSzDzmvo1uGES+7Dor4qDtMcUYiw==";
-      })
     ];
     osx-arm64 = [
       (fetchNupkg {
@@ -330,26 +138,11 @@ let
         version = "10.0.5";
         hash = "sha512-E49zQ382W6Tdx+kTqxwS/6AaWXhOn1ToqArv6Q52HQLEPzouYvXKZWgw5cPIUnqk2lDO1xLnWJ3WgLt5t3XxVQ==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "10.0.5";
-        hash = "sha512-tF2X+/u+NZTLFMNA3yhZhbUr/w5dc6J/6ARfV/MDcaiNWawD1XmK/lpNlOPaLJYdSPpzL0cELZ+MdD/bGiL72A==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
         version = "10.0.5";
         hash = "sha512-gSNu28XZcmjXfcbd1k1/05Yt1705LtruRRvU8ISXYaSHDhBkE2b1ylBZEV26OfnJFdxfF30lGXFoVzk1UqvYpg==";
       })
-      (fetchNupkg {
-        pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-6mVo20DumP+FsdR53lOJvDBFYc5707rwqU925HHEsxYhsNk8v/BfRRGynmCINpoCElBZ7YinP+nhCGdWSf31Sg==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64";
-        version = "10.0.5";
-        hash = "sha512-kN11Hky8RX71JccTcYPDXa9FHW0P2MPpZYyeWb0xZcYQX8l+9g6VdOZ1s40g1izuYUWR1LYCcaZkClix8QvPcg==";
-      })
     ];
     osx-x64 = [
       (fetchNupkg {
@@ -357,107 +150,11 @@ let
         version = "10.0.5";
         hash = "sha512-vL/Xgnw66cgdg2cwwttTEJ5BaHokLhjjW/q/eWQfkGwNF8DchzR4PFoMKd+o3Zk+6I5AZneWn1mGYLpo39JS+Q==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "10.0.5";
-        hash = "sha512-aKH4tQCrzWnVntcprnrsQVLpLMrn2gJXSLqRT2AH9+9kCq7qdelzev1JY+O3Fb+/dp+/v9mVOXde9GHu8G2uaw==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
         version = "10.0.5";
         hash = "sha512-Pty0O+hUt8GO3kB3XY3lGic5EKgbMgzY/n8XvkBsaVspJ9VeTvlvbhffZ81vMDfARdeQ4uYXzd5a14NSEfdNhQ==";
       })
-      (fetchNupkg {
-        pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-U/Xph2FJHj79dHtyOWI4+pp2ZGgD4v9Ky+hOQyRmgN42x+uYUe3ylyW5hVQoVH83SjtrZvW0OHJ7TU9dcAZRfA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64";
-        version = "10.0.5";
-        hash = "sha512-+j/ZvkuvYbsipm16qIMyyEoYU9bN1ocGk0Bb9VMFA2nm+u7i6uNCZHgbKirpDeXiw+jLwTagv0542P0++ZqQUw==";
-      })
-    ];
-    win-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "10.0.5";
-        hash = "sha512-XBGMqFcb278bleC2+uieyUHFYAYdCwDlqPKa2JpiLrSdbFwbTD0jd/bACFCfeJj23gPWS0hUrFP9U6sexov1hA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "10.0.5";
-        hash = "sha512-R6wUWrRt8Q01feMFx+rooVC3QgJzoPrqnHkpFOVyFP8vbtJJc0QFADpyGolcTQHdaS1qocx+tOE2O85rxSzfBg==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "10.0.5";
-        hash = "sha512-V9BNBzKC9tb37jjsdkPE3XrLa+9hVIzSy1QQqD79/ZXNbC481DKzJzbSEWqZtlH/jn+oxLTVioo1cyNcMtE5lg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-CMdJ1KpI63ld8rfiiYqB7JPEi1RZ6qRqv0xip5OsieJ1IQGKbje5mdxrVqqLiIveUGsdf99Y0rJMEv7vQwFLDA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64";
-        version = "10.0.5";
-        hash = "sha512-SF1sLHKC/+acZAZzLf6KEHnc35UToczWBIUTJTkG6YgAIxrtkDZ87UuhuJ88nG3SXzUu10oM3iJ2n5BcBAB+8w==";
-      })
-    ];
-    win-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "10.0.5";
-        hash = "sha512-IHCUjslASrwPeYCuVEqNtLfuhIEgvPH0XhfigHyHsmUeV7o6UBKE4XmINjufE2tsgXUnlRG4yHZVgahqFVYQ0Q==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "10.0.5";
-        hash = "sha512-ts+lw10c/3rqMgwwIEq7KKJ1elP4GL4I6h/vZ6L/gdBZTneCqUU/1yiDpKmGWWPc3sRgM/jh+juYibH3ZxrwOg==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "10.0.5";
-        hash = "sha512-GZ8vwTCPtxnQifh60odRfe0aq9+6RkTYkqXa0JxVI4t2HxPDO3JDkwLlUKZdiFgfDRQ4rkux01Pui3rO1kmpLA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-yAa6A28bU0SgTVjKvEHI254vgaRbQOX5zwyqelczF4Up95wnUdbo+dlgVKcDqaQtnGdV3A+FI2lCANj5IPyP8A==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64";
-        version = "10.0.5";
-        hash = "sha512-KNQZFfnPusZJz9KKGQ0MYujNI3OvPr4Ce9l73T3jCXbh7y80y/JFimg+0Whrz/mHBLWOpLt7/1cVJw5psV8rNg==";
-      })
-    ];
-    win-x86 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "10.0.5";
-        hash = "sha512-vYxGmc8gORpENpwj3x5KX799nmztgPAeoCUJIjgffzh//2cSeNxnKSBlDF/UHEMWIxzS+KvIySa3xe/0UWT6tQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "10.0.5";
-        hash = "sha512-56DjoIPiUrCz+KNihIcywDJooPmHzFYpEPgWaZVb6p30OOs1KFNnoQhD9Yy4BqeMR0YrIuf1otKKpb5oeJ20nQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "10.0.5";
-        hash = "sha512-keZXRiTa8DMzEyk5r72fy+KcARATMLx9SjdG8tPt1spm5q53E51r70JgTYUWmy/EArb6agEAWcriBdGH4nhcyA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.5";
-        hash = "sha512-mq3Dk48HNnAlEfVTFpne0lP94hgJrQCYTSxOwWolaS+yc6oMXzCmJ00tBaMn4gH+I5AwBrRhCJu90tRGFw8L8Q==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86";
-        version = "10.0.5";
-        hash = "sha512-uYEXkEpI1YGxnwPAvefr8htm+bsGOZhA+1Lqgr6jecFcsV79tPHNa/RGZtWBi3Jca272oojjqnXIc3ai4QQKRg==";
-      })
     ];
   };
 
@@ -468,10 +165,6 @@ rec {
   aspnetcore_10_0 = buildAspNetCore {
     version = "10.0.5";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-arm.tar.gz";
-        hash = "sha512-GuziriIhK5fpgTan7noU2WkAGceJ8U4LgReFY5B9FSHwlxvITa4we4KWJv9n16tm3+sSAP+EiJnXykBQ/IRUHA==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-arm64.tar.gz";
         hash = "sha512-bKs7gZELo+bhGFlaRZSDMfXRUGtCrwlC956j22Yj6CBVehdXlzvsua/T1vjq2emmQWZ4YPKn+71Zi8r6OPRznA==";
@@ -480,18 +173,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-x64.tar.gz";
         hash = "sha512-cQjs3ajiYH+oDitF8SCdevUwHVNDi2XSJpYFuEFa69SdsjRV2NzXfY/czJBMkgK0g0+couAOJ6UB0gBhdNdsxA==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-musl-arm.tar.gz";
-        hash = "sha512-8QYwDJeXiTDL8weEVdh1kU1JtRgRkPCUZWqmbpJBUhUFiJH8JVH+fW7gMaptsLnWhOLw4lHaFf4sg2EUb+98oQ==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-musl-arm64.tar.gz";
-        hash = "sha512-mHRGpwP/9xNtrY42UX6BAnkuPlerK5G2mkPoPIRV/D6wZy+3ElLuBZ6OlPlstV4ZcGuJgOPfKgbKzVtwUwV35g==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-musl-x64.tar.gz";
-        hash = "sha512-enudhD7jCKrSkqfaGJAfP8oCaV0XoVscuKeFfOEQLrcT+g8VBdTih9sORz0zFkzMas+SdcIx0GsjpUtpvv3T1w==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-osx-arm64.tar.gz";
         hash = "sha512-uGWDyRjReUEAiAhE2hAoQwnQtlcGC5cGixJY319lsQWq42zF+H08z+JAhzro8EUMb/x3MI2OXP0eTLkYelKxDw==";
@@ -506,10 +187,6 @@ rec {
   runtime_10_0 = buildNetRuntime {
     version = "10.0.5";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-arm.tar.gz";
-        hash = "sha512-Jj8OoRHgcpPzA9RnPuNMGR5Ed0CmBLZ8WzXbx1smC7R7w3SX5IuELL39wpppAMKXZbpna0EHZKwrokGciT+OJg==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-arm64.tar.gz";
         hash = "sha512-4jd8PCWQaNhgO6WgF5DexHbd42ELLSXlco733GbqR1BXRuhtMk+lK/yfFW7R4XAziJ95RLdSr66YOova7F6Qeg==";
@@ -518,18 +195,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-x64.tar.gz";
         hash = "sha512-knwiavQKvaWYax05TtlL8ACKJ5aN5A7HAr4vo+2HGsarbSa5aLjMrT9IkSaMz4QLvUQBxqeli6rDyHtf6NyVkQ==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-musl-arm.tar.gz";
-        hash = "sha512-zHRDvb4j4PD++ndXNkOpzI9rjnGLexaz2KIph/jhF8FmeMCkkVqj+18Iz5DJE6mYLKQ3CqDLYHRAidizC5Fipg==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-musl-arm64.tar.gz";
-        hash = "sha512-77by38lmtLmAFobWKvlEJcZ9jzdVfMlCgSIbESrLtgZ9eEENioHrU3qkhPGYta/yjl0KYrfoJqDlU0N6KJC0mg==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-musl-x64.tar.gz";
-        hash = "sha512-v4rFy1JPAwwtOCxhi45R0SWlySjFa1A1H8Lau8ijfTVSvXvCZeLay1W/FSiHaVH1K5CSFlKEu9IX+jyJqqHjfQ==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-osx-arm64.tar.gz";
         hash = "sha512-saRJmrOWdccRiWFctymL5sgJaLbxEehabDflHdc/SYX2gkJcjKX5Zyz5vU0gjZZUxQKb2QH9C/wHKceNRTAQUQ==";
@@ -544,10 +209,6 @@ rec {
   sdk_10_0_1xx = buildNetSdk {
     version = "10.0.105";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-arm.tar.gz";
-        hash = "sha512-BYl4cX5Opk3MeYSeLngTjUOoowyeq+mxKLxSUf+maPHAFD5tBmOK9zQ/ukm7k8weLgVauJsMJfz20MowNo0oXA==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-arm64.tar.gz";
         hash = "sha512-MF3H5/uZ/NiDDTkSKBf/W04EiMz2Mcuc3H16jsHgQFwc93IaWgERVKWpbPzDl1xgzToEjV0OgADbVAWXlP+olw==";
@@ -556,18 +217,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-x64.tar.gz";
         hash = "sha512-Kw7RMQbkyFnMueOl8aRQ6EYF69ib2ErDRTswgQ7PpitpV7qqLtBBzC6TL1EhE+FuOuIA/lxLSL5mdndHoG9OQQ==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-musl-arm.tar.gz";
-        hash = "sha512-6D2zGInXEQdr4eOol/CAA9T3bE5RyGl1rAFA21jN/34mplF078z+pyc2hXE20CvDOqF1wP4K8pZ7SEUXScetUQ==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-musl-arm64.tar.gz";
-        hash = "sha512-EzORZO6Xm5QM66MKrIAzbxVAdNYIIyJBQNAUXYbLvsF/MMtIFQ3fPSVClKJ0ohOivTlLwZdPo1dmHSCaXISdSQ==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-musl-x64.tar.gz";
-        hash = "sha512-JUuwDV5oqtO2+4WEcwG8AIq2iex49gE5fBx2JApm6GZI66oq/32za+NVwl78C7LIHCK1hm903zcQDDlYm8XIng==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-osx-arm64.tar.gz";
         hash = "sha512-kFi8F6r3bQLmamLhJuraDDQwdeQAcx63QVUvF7nMOjPxhUEV2W6TfU45GOnIBdtb8q0wm8RciSIoxOdTSDktYQ==";
diff --git a/pkgs/development/compilers/dotnet/10.0/deps.json b/pkgs/development/compilers/dotnet/10.0/deps.json
index 7f588646f196..fe51488c7066 100644
--- a/pkgs/development/compilers/dotnet/10.0/deps.json
+++ b/pkgs/development/compilers/dotnet/10.0/deps.json
@@ -1,50 +1 @@
-[
-  {
-    "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "17bcd9cdaee1c8949b22fefe5df4f92daf3faf8846179dfb9cebf26bdb4fcbdd",
-    "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/10.0.5/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.5.nupkg",
-    "version": "10.0.5"
-  },
-  {
-    "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "ae2022aecf016718a1807c83c3c66e03ffe48745ad296ab4ce70e1c37c2860f0",
-    "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/10.0.5/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.5.nupkg",
-    "version": "10.0.5"
-  },
-  {
-    "hash": "sha256-mo+oXTx0d1MYBu+EoU82S3Sw6hLpGq8MNDVYpSUlwDc=",
-    "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/10.0.5/runtime.linux-x64.microsoft.netcore.ilasm.10.0.5.nupkg",
-    "version": "10.0.5"
-  },
-  {
-    "hash": "sha256-v/XY6xI4DJV9s8A0iXLPMmFCi4YV1OKPvxNgGZZemG8=",
-    "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/10.0.5/runtime.linux-x64.microsoft.netcore.ildasm.10.0.5.nupkg",
-    "version": "10.0.5"
-  },
-  {
-    "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "dbe5d8ed855732380b551131f96c00756e374a59c08883a914eb0bd101710c94",
-    "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/10.0.5/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.5.nupkg",
-    "version": "10.0.5"
-  },
-  {
-    "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "646dfc625d1f6e92a90e31cb31f50e8b8a39c25cd41991fa61f2cf4884ae28a6",
-    "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/10.0.5/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.5.nupkg",
-    "version": "10.0.5"
-  },
-  {
-    "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "7f2aa235a98b43a1234e0c405f4d94fb06cbaf0db1c7514f567f9ee884ef48ff",
-    "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/10.0.5/runtime.osx-x64.microsoft.netcore.ilasm.10.0.5.nupkg",
-    "version": "10.0.5"
-  },
-  {
-    "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "49a785da3abe8786f6ceadaf629e27272aa649e07ffdfbb8b46182ac5e48a0cd",
-    "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/10.0.5/runtime.osx-x64.microsoft.netcore.ildasm.10.0.5.nupkg",
-    "version": "10.0.5"
-  }
-]
+[]
diff --git a/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix
index 46cdb5d4b0d2..1d9b95bc7c0f 100644
--- a/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix
@@ -9,31 +9,6 @@
 
 let
   commonPackages = [
-    (fetchNupkg {
-      pname = "Microsoft.AspNetCore.App.Ref";
-      version = "11.0.0-preview.3.26207.106";
-      hash = "sha512-v9ejIc1iBCwhl8FAuZY/qCVWJBrgWOr6MfLSsYodTFTx2V/X6LKU1Fe24LegPnbpoXqIJmLsBIQrO4KoIxuvSw==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.AspNetCore.App.Internal.Assets";
-      version = "11.0.0-preview.3.26207.106";
-      hash = "sha512-ecGx9UpGsZkAlNFoZjtDXwuAuh6wCPNz55MLUhmLINpAKyrtIxX5mq6BQETx/P97IeJaEWSWX45OF4+d/YMj2A==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "11.0.0-preview.3.26207.106";
-      hash = "sha512-vm5WP67IC1Np4BKm9Ru+LbzSRhA1bkYy8zrZgvp/UwH3j6ZYrKNqjRt0wO36gNe6h4wWhonU5815ML3pWApN5Q==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.App.Ref";
-      version = "11.0.0-preview.3.26207.106";
-      hash = "sha512-unbntVG3e4LZW6HNkL85AapaCPrvCLdKn7AegdVkIHL+DRaN4uL+Rzu6UyloIx771dnUHqve0E/no8mJ3WHc5A==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.DotNet.ILCompiler";
-      version = "11.0.0-preview.3.26207.106";
-      hash = "sha512-H1D3C+gp/xw1yY4K2dSR2r9KPaRYv5QJ2AThbZVcIhkLEYaXMnw288Qzxp+PnLWUyeUXloTiNpKxZKd5XqDohA==";
-    })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
       version = "11.0.0-preview.3.26207.106";
@@ -42,19 +17,22 @@ let
   ];
 
   hostPackages = {
-    linux-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-qYL5UAYuutTQcgU4mCHmpOrs2kBtNFvcW6TVuLtCbxyiF3bBBF8CEAIdXy60N6pUI3IbCMkXNvXd6g5AeIKwcg==";
-      })
-    ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-vXKuBO0i9nUi9uZbtEl3henxyik4SsWJwjTV5Qwz3W0OcE60wc7vAGiS5mpp/ri8imRoOOwqHv7LOWMwVquCLA==";
       })
+      (fetchNupkg {
+        pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm";
+        version = "11.0.0-preview.3.26207.106";
+        hash = "sha512-a64GvXhuEc4ivI6jI0tgAllXmkhxMUdTZgkfH5VmMpuQqltqYFj/c3HeJp9yeCX0fqO8dRVzeFshWHnEoJk3KA==";
+      })
+      (fetchNupkg {
+        pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm";
+        version = "11.0.0-preview.3.26207.106";
+        hash = "sha512-vBJCIWQCfLS2IBJO7fy2OaADC7nG1GF6lUeJVpZQkjFJaT7NsvNBVV9o7h6lSoP5I0jK7Wi/CY0gJ3fF84wEsw==";
+      })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
         version = "11.0.0-preview.3.26207.106";
@@ -67,49 +45,38 @@ let
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-6Qh5ssxzcqrDlgI8EDs50xdkMSk8QRNCvGzF4pf2PJKrDRwf/JWJZuVhzD9VnUQYj4FT7k2K5E++zTWfmeqjXg==";
       })
+      (fetchNupkg {
+        pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm";
+        version = "11.0.0-preview.3.26207.106";
+        hash = "sha512-v7xwwXjh9DeLO61O4Zg3kbuz3WOhlWssK0bgJ+nqe87IYNw4ky4aQy7OtO9WlASyMA1FB5kr3FUg5nNrkZVpjQ==";
+      })
+      (fetchNupkg {
+        pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm";
+        version = "11.0.0-preview.3.26207.106";
+        hash = "sha512-S8gEsYiwDhFSFVI+pWt8x7fNYYAuYbnb1jevZRUYYh2oKyJtmDqMJmC6wOoppzEFO7qnkYOOrhpEabbeKJsmZQ==";
+      })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-tqmapfWDTNsoVsZD/qFjt9YTnurI2Yk+MRN1O9Imzm50H2xLbcZ+REeozRaetoTJkNjjOqnlnQsBgeFuRLQzpQ==";
       })
     ];
-    linux-musl-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-ufweW8RLeV5oBvsOVIYhhq1fgpf3UHoOj+FYLN/q5MCw1yS7RKQpilpk09Gwqi1yZOPX/0p2DV/RKnIlrtS/Wg==";
-      })
-    ];
-    linux-musl-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-K2IH948OGXOKv3gyUAUQWEES1iyu6Mkbxywl26nU+2QH44A+XAKECcRhXnENQz0K7PX1xmSNaMPfJqZPrqRvPw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-kzqFLg9HiUZYTztg9s8wrOuaL28zcwR4n544ym3RgQZBN8co5irQmxfGYYycNLe90tnZMd33dzTHzCS4w+7Jyg==";
-      })
-    ];
-    linux-musl-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-92+59M17m2iYairYoxMSlGntU9SsyUIO3OFP6rlMwa7m/CKL0rQ5iolCz4m4WbBAuVtKARhe9bWUZl3FyzJI8w==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-JwTIT49618ShygrCZlFxawfdroMPv5tGrtnml/MFw6570F71Xp9hTtWj4HcGgnSAs0q5FWtaZvvoGxfh0PAniA==";
-      })
-    ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-6Wx7R8lAJH9+STlTmhvkeyOPTHwtL88boOFzXBWykV0v0yypzdFvdOfjAvf86zSW5mSQMY147yATjckSE3q2gg==";
       })
+      (fetchNupkg {
+        pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm";
+        version = "11.0.0-preview.3.26207.106";
+        hash = "sha512-mL6CWnO7yosgKNrzCOinLs7ty0UUipr1uRqRjk6qjm8X4tpGAedjjUtarEmXWT6Z9WA1DUNt8GpXnqIthJchRA==";
+      })
+      (fetchNupkg {
+        pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm";
+        version = "11.0.0-preview.3.26207.106";
+        hash = "sha512-FfDI3F7L8vT15tzaubmNYc94APhUfDQFfOaKsBuvcgBiyVaM9qdN7shTH1zbW85pTE3m1G0zvVpGC80Z7y7PYg==";
+      })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
         version = "11.0.0-preview.3.26207.106";
@@ -122,99 +89,36 @@ let
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-k39ojqAMM5zpLrrM70KhDN5dVMkPuaaNDEQqxD/5BIzx8sXH5q3m9wyxhPAjEqE6gNESSuMNUroxLz7U5e+4AQ==";
       })
+      (fetchNupkg {
+        pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm";
+        version = "11.0.0-preview.3.26207.106";
+        hash = "sha512-OTDRYrIgu1WN6Yy+Jb43gSdNMhUF4dXSkOi8pqUfJFn8MH6lHtJfGYSa0KrE61jWwKKUWdXLAx42Gpne2oonOQ==";
+      })
+      (fetchNupkg {
+        pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm";
+        version = "11.0.0-preview.3.26207.106";
+        hash = "sha512-flnO+/DUeZE9SUmkyIlMsZrvVomX8eshmKUxzYgO+E31TazXiXwvA1J7unq86gQVXlrmoV7xutlFVET56UmMBg==";
+      })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-RVOrXi8vm+AB/6Ma3kO3cOTpMxg/B6td8edIeiu96XyrOB43HhoNc4KLJYt3//2Zj92sBip3QZhOB66+XvWMbw==";
       })
     ];
-    win-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-C7DG8JmkW9Sg4eCCRHRNbvKtjLC/gqG87Rc5/98l/ND1lQUt/zpe3i4W7KkRaF27B9J4Gq/Kp8v42lopE0Kc1A==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-8NpmV5Mi9uazvpb5dgKMDaP4h51oaXQm2/zJ9AQkOLCaHTuIC0QU5aNRv4Zv12yhJ+1tQVXtcr7PEGoa6ftdiw==";
-      })
-    ];
-    win-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-/Jg3oEfmXEY4rRR8EGz5Xu/mU5SZnGzqJe0wPoDCgJbtf3STHRTtBZkB8+DdYss25dkq+yMzCqJDg79beJ3atw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-+WSonFTv7KjUG/lpJ8yojhJa0vh7Gi9mpg10WXZeQ/olGKe+IJBf45DpUWKQG3XiehUg5ZbQSKW1Mph13EuLVw==";
-      })
-    ];
-    win-x86 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-+Z4QLOIOxxWnel5s9bKr6xzITVVrLOnmCxq19haSZj8gF5VvtuSvoxysD9mj6JWfGLWrYCMWuw/TLtk1ufVmRQ==";
-      })
-    ];
   };
 
   targetPackages = {
-    linux-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-9xhdqwdodcbW86pgg1bue/1D+OMkoku+HIaOs+Y2HeEWWUkuvGaVknt1ZPURhNN6LoLGioshBwiLX0FZsBm7tg==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-QzRRGW+09aDpSSFtPeDVkSvvZHO8wRV2uDvfwGBXFwAvS7T0srl/iF6yqlGGLm/O00YLexvUbvbo21/I/RvSbg==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-tzRhQBoSzqbQvL82tpdy3AOr+szIxCFSVJd8/8MeauJ0x+Ta4KvqG2XAjB2vaT+YZSo8Wr4OZy5eV9dyZ15IIQ==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-S7t/ntT28m9KTteqe5974dSXa9UgZL5FzZnhLa6+HNvEwJi3I026JExPHNsPKMDanXKd4jspZ1EcMFp93sCZ+w==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-fTn7AT8ohQMd7yUvy/LZlGCrGr+wdZlWzn80UYAVnVmwX0CkXNIJ2FivqyTBFVuIJb6H3iIVYsk9pTebmxAb6Q==";
-      })
-    ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-cqn+9UZlNhkzywCde0Qnn64+DvrneOw63CGt2l49gIlPpROoy3XZ4NxpsSAq2coyeFYzYCc4Yt5zym0Sw4MTfA==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-8dRbxg1l7NmevWCg21XjkBaA5iUmwInnKzOS2CUO/SKDRYpncrZt0vPcVDg61KiQJ+jzixrxuEoYm5UadQwIWA==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-FMwUBAikT2x1waTYFb5BmDqM6l+5u3DUkcLcGUeQRXUlp49llUjDPJ7lNgi2RbWoDKlNGk1uaMs4+TfDzCsdJA==";
       })
-      (fetchNupkg {
-        pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-rztxFHm0e6ZyTVut5NOIDypktJuJmgxi9pXg3FZLCPdQpxyoRGzZAC09jAopN53n8bxfyGt6Fq7uYWlPiSx4GQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-GOfCqW7YBw2quGeJX9iMT2N/rgZqH5iE46DTlie3KCMLYhlu8ZbD4Vx1NAuIc6RG31cyvcwTbo8oXt4OUOqCfg==";
-      })
     ];
     linux-x64 = [
       (fetchNupkg {
@@ -222,107 +126,11 @@ let
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-uy0CwGFb9UBJyud3t9DTNTohncZKKxaL0adsA+/sQ1lRt88qv6fZlOfWj3zH+s9H8RlreDQNmnWVp0R7Ooqb1w==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-3P4sEcwTUuEigYuuqjNhEaUrmuPHlivRosmDqi8FcyXUq+IydBBKScEnaYcyA+84paS7088o4hany+tRNb/ThQ==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-1aPEbl8CyJK+JaSKp5aKGXTptfU+4MqLN1cKeXehibb+ujjrOnsaaDbS2z24l8ygCSSbgiWNtc0AtWoKzGl5Tw==";
       })
-      (fetchNupkg {
-        pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-b1vqxy7kPh3D3nUatLiYFptmTFwokSJp+sqFB1FqNeh6WglDsriuescHjRdLaTY5cpHzPjo04BE4/X7aRARf4Q==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-fgKQBYlDxpda86MWKOQg93vdwLooITudikNPBMX/638+QTG7kisG7XoKV1PQ5XRTumuSfPiXwYrPJ8XJPqFfbw==";
-      })
-    ];
-    linux-musl-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-Meqyq0cWoi3shkYQ/2zMp7/E+OOxS5xh7RFFUOufOj7RcndaDH4R39fNehsEycG+o7VueXQjTDHX5cuQKo9cwA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-pnwWF6BmcbhLGZ3r9AciEZPHRRqeYA42LQgd6RiEdIAX850b0bPoR/K2L9Z9Cmr5eU++WvFm1h6xDSLyps13pw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-529Vmw1f44/cSFtaSgglHfpk9GsgfMx67M2Pd9V4lp07UohhGLnIbWi93tesF8f3f6DVa83HDHZVcoi+tcrqPw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-v/Vou2NCp4TaHuqcmyHwD6tbS9ZeEB8UNpOGiNashSl+oe30PXELQZAPo0jUyhEEFpQXlPv9mLKw3GFwOeZVVQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-UCaLlw6ZA2+CvbTvpT0M0FVHbOiuetvKknr0po864jG5PrlO2rHT3WzmlN4a98Qf9yl2Gdc5LtuwmDVwcfT9ug==";
-      })
-    ];
-    linux-musl-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-HSXS98H8g4asFOGfCIQ9l1v0jMvyn/tVFfMXu+WSkZbImUeIFefdwrwx8yfGDFUwD0HdDyTFZ9Yn5+R/xc1Jfg==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-9kjJVJV9nq3uPmGfLhduXZzd7s7mgG2j+p+/Iy6vUeRz9N1Q9S7tcukj/2M+IVEuR2Hkah+9dbZVhNmexKr9eg==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-OgsUPS0XMjsEaQCE//fEBx6Z2nUl/jzXxD/fUmqM2tzxp7cuFadbMjYhKSiaHJBDgiWv44mJNZv1mZc1z+fjAw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-FTc3titT6ZCr0H0JcgoGWzWB+xRwdXWkOV+pwNo+K78zIXQFJWCQQfo6LAUfLvDZlqxozxkaM+hDrrQpISALhA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-lfR+ifWtlhM4/SIMEa8bLCyCYAg7vU+fARkRcO7/UgfLhMeSI3XQvwDEL3UxCmaFMQjHx+V8z93fA2wCD51rxg==";
-      })
-    ];
-    linux-musl-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-mxKpkfZzMEG5FinMt16xeCtrP9fIgpuUrhabyZIezcllck70tCnJ+no5RMOiGegoa0RS8GlFfktgwbUNGda7gQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-L9Zqe07OOR5e5swhW80GVOVHVOazQzAFMUsQ0OvT1ROoV8GwWxopeLxaduvRIJ8mrrwojr1Qh9R+Wm/L9DNYBQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-8Lf+zLPZA7fdu9qZq58Avr+5Bpwhk4xpK0/IIH0LqXMmuq8yuNlKGdTmzC28kE0aQ28eBUyw+vR3kaUxf+zEmA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-z2V+omJ4hstb53weBUAQSR927a2xDBTDtzba1vZvMLSOciWju19guP17SS9dFd9chaImfskG2+lb11l9guRs0g==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-ZRzzqGejfhzYjJtelFev47nTRlByX23VkSJEMEEbnjm/GIkfAIaoii7zjFzye3Th61z3RODsLNcSIhz3v4ma/g==";
-      })
     ];
     osx-arm64 = [
       (fetchNupkg {
@@ -330,26 +138,11 @@ let
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-hBWzZdGL4XCxxsJ+mL9il/UZeCe1F/p8ifC46u4GpW/r+13LWdxm9DA6Gd9A/gX5IfltOE1CxWZoG8EXP1J5ug==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-COCbrVk2ugW1L+vrn3GEkvbL7mR7yTjQokOfaIuhf07SliM4bt8c4WIL31akDAIKoUPoEiiXcJOLK4iFYdIaDw==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-3UNG8Dpxb3efcwjFkkA4Nll4tYuEsuSG0EV59yVBMWmWDQlqaYvtDHENNCsqpUWtCcRP7ovre5jVQMi0mC9+JQ==";
       })
-      (fetchNupkg {
-        pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-HjhumZ+SKvzN9TBRyJ+wivZGSz3OEYpQ0D+z99Kir00FJD7Lu+fIzkzN71xipPG0PNeo0PdI/GwPowdHl5qsfA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-31FlRjnxww15d9LbWL9ajqZFHrNZheOGkyt0V0QyzyJeTm/MIKY5p9A1QPbS/mFHYAuP4eilAM5mj5seZGUYFQ==";
-      })
     ];
     osx-x64 = [
       (fetchNupkg {
@@ -357,107 +150,11 @@ let
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-yGn04OHjVBBHhbutZdPGYjWIKHV7ezRBKheeeXB0739reyAGH2H0RbGvTN8jgjiUznUku/3os7h5xvq0sxb5Xw==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-oKlkgoPWbrT7ReENkaZfN1PWj7NkDhU1Q9LHXa1O1fQqNZEeqkQ2hidjOlZptV/sE5BhEcAeCjjIl6vzIeLURg==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
         version = "11.0.0-preview.3.26207.106";
         hash = "sha512-6X+HPPT/dFsr5a98MsB98F2jrN4aGOAHCbGWyvaY7uyGJpoODgozPd0BiRHZqi6fHRn/ykEijsoBss9VDqYIfA==";
       })
-      (fetchNupkg {
-        pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-a4S3oDY93J73dNmHnEwMl1AcYzlGFvNIJVN+oSzxGhSk4BNUnzY6Dk9tdNr3jDX07nD1xkvlQfW4su/FbY4wxw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-5n4z/cUu4Vn9Zw7EwuL80Rb1SQky6sc5D0jDYO3AtU5dVCGZ1rIJxN77NQBHiJXGv8GYRfIJRoJs2ygUXRHSnw==";
-      })
-    ];
-    win-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-hwO5tTllyX69qeI+ttGWCIrlE/LgpMz1COGGQ8wWB94G7T/pF9OfL5emLxlDjc2bhiosh9vNTBH9qY15RYIAGw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-JikxGQ5jGAcZZuxnzf6ptRDZaxJatrDFe8jjs8Wk11ZOB2rgpPIWbKgKkbMsZ6ASJhDgNRdaG4bMMKoR1JUodQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-oSSes+mvNzDaym1veBppTyKtZpFyDssRwATN7vdMcRweFw0ubVPJCpo5fnFmqLxG5U54PABrIy9jJUa68blhHw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-JYLW2MD/llna3yW+KiNO/GglWgNfGxelfDP8JeTA3Uz2Dj5yEWxk3kPRuea+Ud3yGTvOiElYwYtSjvrHLyRLyw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-qbBF9p9k1i1UFBini4zHBOYZc07teaa0pAXhK8aBEg5FbxShR0z43npXyUKYF6YHVfiYQ5S8r4WsWKDusjUm0g==";
-      })
-    ];
-    win-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-wnf58a8gyniOGvNkVqOnzTxJ2Wq4iOqYLtNj3Gy+axG8LCDEGBptPEBixCvTx3cO8klwAvvBCOvPJa7NaGcDNA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-cP2ujIMhlAkvwoJC+iQgBQl3GzXeVfUZjUSwMt9iXqfwPBIg+g7gNSobee0IK7DQcBKitcnWRY4qvHA+MloJUQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-aYNS5Y8Lgs7o5OON76iQOEMsAIE/DC5V6TTT6zziS/SdfoZO+UqIDn2ZKTovwRjjjM9Ruvd7GLXRDnN4D9aJWg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-Gm2ctdapd4yqa3G6irUQ266+VWJiFIkNxxJO/xYX72QO0fs9w8IEKdwWSUyWFwxMOMv5x06yeSfNaV2jmOF22g==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-G22Wybh3xwG4wgkciWLOXF1V2Qh/hO541/K7biCBopPtWy1HKSlWckyRks1HoDofqYeeaU7wu2n//G0ntewlPA==";
-      })
-    ];
-    win-x86 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-6KI2quzQCrqmb8gCzhKd5+N8E8SUMtp3YQCZVUbYV1MBr+uIuoPsxxJ8cV+uAzXNjYA2naqdQdayMG5qUw8nLw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-KVSNM7gXfb01Fr/bftCHOGCcuGJyWKMHPITAE1qjjRDETp4MkBhitYYX/UXs6bxQKFpc5/nivuqwqa7dcxbENw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-mfuow256kK9eYtZA/Wam7iZxDSK9wwOKs9gAWB+9+oZZLHEsVMmYLfKDRXf7LBpoSi+dtjiMD7LfV39zrtqKNQ==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-Sp78xXJg9HvC7jVd2D0f+B7Lq0JnvJ0vgz6MrdgbLU/mLZP88g6wqIr7aYkRHwc2P5OkUvVtM26lG7AQIPzYGA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86";
-        version = "11.0.0-preview.3.26207.106";
-        hash = "sha512-bwPLwq/rj4aHjoQjlk66i0UT/amMoQ9y1Ey66gRGzQyHZZZAuaFdPHkzM7JwyfvqPXTQkAMD+cixp0g7gNwo7Q==";
-      })
     ];
   };
 
@@ -468,10 +165,6 @@ rec {
   aspnetcore_11_0 = buildAspNetCore {
     version = "11.0.0-preview.3.26207.106";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-arm.tar.gz";
-        hash = "sha512-/sfiVEck3I4F24pFKjd4MidXLw1hHAADOb3U74QgYEVEYCKU+7spyRIze8smqiEW+2pCXvSkoUeey6Nk1pNS/Q==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-arm64.tar.gz";
         hash = "sha512-7wbJJQgr5bxq0P7AqzPP5HlfltWuJT35MOfM/6AXZD7cYlwn/C0mGeaU+bv2eOQxq51hQ2KqYW6PwYyORNbDHA==";
@@ -480,18 +173,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-x64.tar.gz";
         hash = "sha512-YWlN4Oj3rExdqgOmo+2/mSQana5j2cAhU9kd+d9Fs/2y1UEgMNblL1LCdYLWNq2Ra1T/iadXjecka3c7/XZMBg==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-musl-arm.tar.gz";
-        hash = "sha512-2GKewfZCwsZkUIDnG5Tkbb+WyPC4W17/9A7S5DNI2k6Ff+y4HvI2n/4fbeJq6DyQnGJRajvq6tR36hyaQFeVPw==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-musl-arm64.tar.gz";
-        hash = "sha512-f9q1IpuptkEKR0a3VNptB1iD92ZRhWQ652OV6KRbPpjTE/TJ7kozVn5PwmadDmAUcSaohyghlYxp/nJCiPq0FQ==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-musl-x64.tar.gz";
-        hash = "sha512-uw5RT8FBh4FlTq6eOT4QOFPmZ+s0PjucSKqKkmbLwJX+bLAKxvdSEo8Fm+QlqH0RPI8sxvYPAeu17Bk/GGy3yg==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-osx-arm64.tar.gz";
         hash = "sha512-chpOHW7SSvTiMoiXzFYgbXrri1hL8irvHQrhE44vKpYk1U40uIam2QHTnvylhtbptzA02EZmfjQ7NURXUeDgJA==";
@@ -506,10 +187,6 @@ rec {
   runtime_11_0 = buildNetRuntime {
     version = "11.0.0-preview.3.26207.106";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-arm.tar.gz";
-        hash = "sha512-pV9APsVEunijRkEVPlmZJYL9IW/vmU9Qy+Mc8KAsfPgov3KujshjzgPfzki95CxGQckSNwBsprQQC7MaAHy+tw==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-arm64.tar.gz";
         hash = "sha512-QTXXbJGgJGjO3FnJrHV7C+2x9Yk5F2Aq/d4qJiIaG4KP2q7+92SomqUyAR3Pv3hEc7d0DJK5lF+RJiV8MoSWnQ==";
@@ -518,18 +195,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-x64.tar.gz";
         hash = "sha512-Qk3G2hG1tq0phI/qocAV2jRIqAr0q5U4MqjwUifK+LFtbvxPADtnXkfrI3ugXxVEBlUGye433ZnnAfXf1eCfOg==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-musl-arm.tar.gz";
-        hash = "sha512-uMBduqLNaeeds7uwC0DaBo8bdx2WBj4VxILCWTy7p3qHT8O0KifAz57wmZQFx3+i+k7auYu1OtHKbeZIxSseFw==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-musl-arm64.tar.gz";
-        hash = "sha512-FKB5PUYSxQsrBe0YgPhKsdOu4t7betE7d2OwADfAITsS9H6gGJ5SUpC4EsrXxZ/+bnfctpmMk+E8e9p3FuH27Q==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-musl-x64.tar.gz";
-        hash = "sha512-yRDoYBC5t9UwuFtTMlYH4NmqDI1+UCgaTj/m+0hAGuEpWclg9D6/ZVQEhZRva3vdfmkf1041efgO85X9MmKDqg==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-osx-arm64.tar.gz";
         hash = "sha512-h8DGOlCEbb1uuzXtXlcD0fag7xGEXbe9lAFORo9UcmaAbDQMSE0bagy0VwCdlaK47gR/fbEdqQ8Nz4TygTy+0A==";
@@ -544,10 +209,6 @@ rec {
   sdk_11_0_1xx = buildNetSdk {
     version = "11.0.100-preview.3.26207.106";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-arm.tar.gz";
-        hash = "sha512-8Wdgso1ktVy/qzAzFouiiB6SjICd/61olH2TJYIC3gG+AIKvLjYB3EyT43qPCZdMSzvJnZTt6I8vnqMySqYtMg==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-arm64.tar.gz";
         hash = "sha512-lgL0cIMGlW2QJ39uydsJWDprRnpZWIuo+pWZQODCVZek5YUMP7xcUzvJxh/DxTMJsl5GSNii+ynFDrDfRlO4iA==";
@@ -556,18 +217,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-x64.tar.gz";
         hash = "sha512-A6nmiA7NBzAaKuleTr6gDfdYqAhDaDyjo1xGFd8ySTE5/KjDuCCiKF6xVY7HGS39AIFlYIndDSJhOL3GuY5SGg==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-musl-arm.tar.gz";
-        hash = "sha512-j3IMukJ+JacaLbx9nRXhpdmCMzhz3N2uhMzGO/v9NZiuoazTcjnegupLe9Xj1vHC8FVPUPQNO8ZwIfjrX8XoFA==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-musl-arm64.tar.gz";
-        hash = "sha512-goZIcjbXLoXlP1zF0ZJvL6qV9W05XrQEV1dgeHvAd0KnmThN67odgxp2KoTFTw40TPx4a9ehuvRc6lw16ldveg==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-musl-x64.tar.gz";
-        hash = "sha512-cW56k/pBrVnNAw7QWakLaEYxs2vw7OZGRQUV35TKgVmH2Ikl4A6ygbzLl7/3FS5pJgqbgwyROBH0BSzERSxY0g==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-osx-arm64.tar.gz";
         hash = "sha512-whvgDXbhNV4fiNXn94aBPpe1Yf2MwQQ1b86ic8hVOJ1Ccsjz4n3g8Ne3WVafLHg9QtGUWQ/6lZxGo//4MXRhlw==";
diff --git a/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix
index 0ca7135504be..76f364749f16 100644
--- a/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix
@@ -9,41 +9,6 @@
 
 let
   commonPackages = [
-    (fetchNupkg {
-      pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.25";
-      hash = "sha512-UADgNn3jhsot29Ve5n+8E/J+At888zu38dfKc56TsMIm/Kb0ncgfELgYwSwUGpKI/nASq5XHow1ytueakD6XXg==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.25";
-      hash = "sha512-QBkofLhL1n2YtYtfsIPGhfH2NIr2su0QXJdaX2hmn8BgxCuKhZyN6vt4pp3rHxudqFT4xJETe3aK8UiqQDsSSA==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.25";
-      hash = "sha512-fqnJNvz6zQ6c5ZAQoKFKMSDPyNX+7qzn9KUOw+a0PSlMDMBVj0wiXHyuo7aqVq7whII6kd2ZY9rhbhRogeUNVw==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.25";
-      hash = "sha512-Bzai3fUDV4ffDKwBEBF2IhvOiYbKUKFMnbroIeIMyHs6TFMqeHKLJ3LRy59HZT1FrV85gOnFJ7ye+BD28dvEAQ==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.25";
-      hash = "sha512-d6UrXl6WRQsVr3dvW+pMJs+N/lPeDVOSum8VTkgBdWfFLVPYtKhrpKEJwdM3odmBqpcwjQDtc6Q3/8yz24OsHQ==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.25";
-      hash = "sha512-ZnOPTA2KMqFVZ+0Je41JBUMtj3jbt8jbqpdyWrJ5YvpDH16aAb2bCZ3t9jjBqTDYK8hi3GKevkEouvbbFKzQyg==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.25";
-      hash = "sha512-GkqlIMmnibU5KHYtVcYLYc5eERO7Ql5G3xgQYG2dLdTOYBiSwNmWbg2VljJFF7XnoZ4+iWyVekZbkzv/0auQhg==";
-    })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
       version = "8.0.25";
@@ -52,24 +17,12 @@ let
   ];
 
   hostPackages = {
-    linux-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.25";
-        hash = "sha512-yfwiS/eIzv2WVcTwtFvJaucR1r5n4pmQ1ae0SWXAVS6KGVGUHjhRnTyOCivuXcRzjGGZgQH7CRw/2WfSIllFdQ==";
-      })
-    ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
         version = "8.0.25";
         hash = "sha512-0cmoZ6fj2gbWhC1LP5XIpEXwQzlsqWlDFpxjUgwv/pVLe9HPeJWt5Q8Rqui3RO1QNE2CLqrMoWxI85b/apKScQ==";
       })
-      (fetchNupkg {
-        pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.25";
-        hash = "sha512-2906shiCKrL5CSvLaUbFHLr3ZmtRZUfHiAo/EIivDZTJcfliWd27bvGsgVm0R5tSP54E9urxrLota6pOCr9uFg==";
-      })
     ];
     linux-x64 = [
       (fetchNupkg {
@@ -77,42 +30,6 @@ let
         version = "8.0.25";
         hash = "sha512-BkKYjJoeBKLKfYHhmqIDhJ3tHlQ9wwDAq7NskffCgkaJh4IlCBMCWUDXmr1nNOW8NxaONioD2O0tBZ6KhzQ/5Q==";
       })
-      (fetchNupkg {
-        pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.25";
-        hash = "sha512-nhohobVJGwv4RymT6JtleO1yxFgp0BoSJKqiOHCnybtE0uxIs71mVp13RGsgCvcWDV1EQ9GUD5KHbhW5a6CbdQ==";
-      })
-    ];
-    linux-musl-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.25";
-        hash = "sha512-soxRquFCYg4YJaZ8CL5LWWcjphJTCvj93vl9a9PMNmPjnN6X1ZxX+75LdY+ogrmb14Sw/qogV2HNMJNYZ/wbHw==";
-      })
-    ];
-    linux-musl-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.25";
-        hash = "sha512-q/jFyTR3QVUi9rBwcbzv7ocvdZnwBNolcv+7evQtI0MTRvfi6f5R4G9QC1roevAGJEreMMqs+IbPPwI+X5pzVw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.25";
-        hash = "sha512-fraXubuYMdH0lR5Qnj79BWnrgYSWUIdZsuR05Q1Gr7w7EHwDU1oTxk1R1cr15d4QECQfm1AY3ZLMSwKHE+GFSg==";
-      })
-    ];
-    linux-musl-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.25";
-        hash = "sha512-qNWyQUL5ibXxxewxNX/6XarFtvNIfnrodsAL7F+bRfa9jzoUTlvwclg8e1dyEA4zOeOAcivdFuROJ7bZfQ3kDw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.25";
-        hash = "sha512-d2PQ3UJyKeSwu8Oq931+tOKC7stEFsotdEnKbHacd+powcm9gFiNvu4mpUNk1Qha0v9YkEFrAqvjXS/nt3aRqQ==";
-      })
     ];
     osx-arm64 = [
       (fetchNupkg {
@@ -120,11 +37,6 @@ let
         version = "8.0.25";
         hash = "sha512-rr6lj09G6Mk3P8n93Aa7XGHJ/2XchaKgF8V7QtFgfLWeIUdjNVzq8him26sOQGKtaMXn/hLkFEyweu8carA8Aw==";
       })
-      (fetchNupkg {
-        pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.25";
-        hash = "sha512-DtzolCQpaL3tGzUm5tSEQ8+J7Q2r86zpS1CM6jABeOChIDsDSwfZ8oXvBflybSth7JEnwvnzQWOVov8Jhru6KQ==";
-      })
     ];
     osx-x64 = [
       (fetchNupkg {
@@ -132,129 +44,21 @@ let
         version = "8.0.25";
         hash = "sha512-k7mqLNAJItPKfPPOnoPI2p6cpjfslWkKk+8KkWSPhsJRMKnR7/8e3f8y5/ToZ0oEfylxyOoGu1SFE62eMzfYDw==";
       })
-      (fetchNupkg {
-        pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.25";
-        hash = "sha512-8FTqcOAKve2+v4d4G3LUK7yU8CmW98Wv2b7YPMD3WH5QthHcnecJiq/y/kiA8vNG09Ir+DauJK4Ai14zY4gDTQ==";
-      })
-    ];
-    win-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.25";
-        hash = "sha512-rqSJrkkr7OnfqGiqbuCTuBbMwJq4ITzT6dLR+Qz9wEA9dG5B4iI5C5IIPIp+7fO1BkKS+mCtR50sZ2K7sxhEXA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.25";
-        hash = "sha512-HfHw4m9FuU3+f5URxlMDi4T8vDKQkdCFR/BMtsfq+84JTAPINqkVFjwdtC6H+sXlX2hA9jGSUkjrwYm0GXdjGw==";
-      })
-    ];
-    win-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.25";
-        hash = "sha512-bpXPJxE+om30rajR1IA1TNqF4IJi+md70jLMItaQTChivdjJOVugHZDRUJCeIVp4rBglBCSutqH/FLa/xo1Lcg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.25";
-        hash = "sha512-yiU1skELDDaZcEzHiHBqq4E6pRzuoam3hBLicFx1yROyN++y203yiQDH9nEs0pOMYEZOZQEMqUF5r0lb70b6iQ==";
-      })
-    ];
-    win-x86 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.25";
-        hash = "sha512-eZ9rDYrduKOAzA0XvmJm24IDsI0sDUfgDI9JhM92cDztXaHenaZzlDFESUZJEHSbEiWx9a0wj0C8nS4BMUzCUA==";
-      })
     ];
   };
 
   targetPackages = {
-    linux-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.25";
-        hash = "sha512-30GieR4glcXhFNWNdJAb/JmKp5xTRk0rt88pEwa1XZjpM5Kzjo8s/V6VxMkePPD6k0qS29MrpWE4wqMe85htew==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.25";
-        hash = "sha512-XEuocp4I6d8A+8c6t1OyDl7qDs1zV6/R6AGV/lu0f69cXItdVxZtLvDjzYW5TBeQ9Tx0r5PH6Qid7Pq/OQZysQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.25";
-        hash = "sha512-UDSHypbfdYcq5mzR6hDGKmvyDX9Rxg/qKfWsbfqaJcqE7Pz7PbmBzPvLpRc5ctllsdH6Gy3YPcRuUPuHZFNPOQ==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-GIWmk/+AVDyoJgiFtf+FcpDSLWpTtE4beLpP22qwIyE4eFZzx1qDU1Yr5SRsDrSmgf5F8wrf7IylWJs4jwFaXA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-D96Tyfln5axyYUnR+HkaNcaQmHwU8BpSBDyX6XKjlN8Y8NpTdLrBjbocpe00PHdzX/8QuryY7lqpwtG0WMW5BA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-daYe+APwzRVJbJgI6hDok0JdiVpT3d3ct5wlA7reVTAbPt3Mp2P82FCzWF9TigAjfDjC8cXvFYTsXMJoJqsU9A==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-T3n/RBRo8gtkFpFtul9CDitghlBTjmRny4jb3a/rGiwpvzAo01b9hDBcnk+CcAoOb2CPvlbeleuf5QRAdPGKyQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.25";
-        hash = "sha512-OW0ECKvCxfK0SPLWgZ0BA7gXiZUUjIx9KzBklg78EGZfiP9EYPG+glViqmRkqc1gERQKTuaMUdEL7Rhe7z0lOA==";
-      })
-    ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
         version = "8.0.25";
         hash = "sha512-7Qa7XvKR9VSBFk1dllIs395MQ4Gxl0RJqk6cyBAlG1PpIq3kju+4u01ug7C4eJGcVcjmzRMZO8YIYRtpyN9pdw==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.25";
-        hash = "sha512-tYBwWufBKmR0yWGZ6VHEEFQA0z+7n2jpfdphH37KDd/qZy1lgyut5ArI3JjTtlQYQgfL3hcV2RN4APaULYl63g==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
         version = "8.0.25";
         hash = "sha512-nFnoLX+jwF4HXUC4Jry2mK6BBzbm2LTGw38LyhqFRzcEpe8sfNsihXlHx+d+XKnDy/axQangzRi4C2LZ0Kg+2w==";
       })
-      (fetchNupkg {
-        pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-t+smpWUJHdEv98JlFYD2E1C+BXyFczA9LULzy3ZDKg0XBVp/zPmfo4pX0kCCCTfpmosShttU2UqEbIH8sFCDSQ==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-y7d6pzVJsuGmNki/MXfvKcvZXMC2ycRZ+fG4xRQXEQu+8WvGqcx7NLEAfia772iQS4LNF1C9bPHZlVUDXsOHoQ==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-sTmuWB5gKE/5H7HPw4rKWlSOToqgwmbq32KvmPOUOaXG1DfPQJCqXwhIuCabL579diYq1v2eGw1e1dVWdKuXQg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-LdtcUpGlqOC0cBf1ahtmYdQf5TOl3oFuVDk6mTkuXNUhXyF7ZWtrYODU/TkSRjr5QiqQimHSOuK1y1xHer99zw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.25";
-        hash = "sha512-8CSPcnFMHKkpJjCUS7GgWLWmjfqH9AtuMzsnPNwe+lKIP2HxDwgd4Q/jlliZkv80DQ6YbCRSjSCTg4j+tVlpqg==";
-      })
     ];
     linux-x64 = [
       (fetchNupkg {
@@ -262,157 +66,11 @@ let
         version = "8.0.25";
         hash = "sha512-s6WnkKOwSSD1HDmQGrk/VOEy2JH0qUMp442bc0MAMLdzvZOLp3ETS7zObJ2kBmB9TqHEjzcybCjsNbApoLDLFQ==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.25";
-        hash = "sha512-vaunU9Pxox7xBrR8hJ2THyifEbu9d1tIG5eXqr8XTZIxxJiyshvYF5nn0uiTh1C/FoogvkllTe4cjsmcqBVqUw==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
         version = "8.0.25";
         hash = "sha512-XJTKpxcUhrLt7TaoBELOb1iQUFYICtakHa5pK2vTTgcsb6GpVxYFvzyJDPDEbMdK9s6/iyKysWi1o/MUAE3qKQ==";
       })
-      (fetchNupkg {
-        pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-hn4OAd2trVQi3EumT8EOKL9N7WperpZ2CR7YLeob8zxG21kLDKzbJi1+YkS4S/HTIt5o6PF2+ag6OyzBte3a+A==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-U3h/rme/6rxpB0yY6RV0NB18pfkEI/BNkYvRYayVOiUzUn8VCpoS57MXb7ybGuzelBnm/BTIkvOCPPUgbOTpPg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-V1Y/+La7P6tCf6IOI9qsk3YECGWbNHfkgiq2UImqw3VXRUolrsabSnH4Hfuct3UE20zINc1ht5YzJ2N/Dua5wQ==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-EMJtrTcualEAZfCJXlCjnQLxCApd9ChdauEeibxPqclYfEhTULXFKxPUHjmmFmCd/IwdDEVSNIXz+RtaorVC/w==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.25";
-        hash = "sha512-0WLXarvW7HeX67KVelSKgZ1gwaYxbFgJZRSVYPWzGMHOsC/CKlL3z2Nb9JKsEDuveg0RMa+VrzbNyuygXEL8ug==";
-      })
-    ];
-    linux-musl-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.25";
-        hash = "sha512-Ed/m7srCdqbWQKnCHN/S9LoeeAtenbW0q7sZ3t7bEkPZqQeoYl5x4AXrjTTFyK0+v7G7xFpdDU5tJhLCjMAZdw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.25";
-        hash = "sha512-mKFajoj3yKTWCflyBZui0mVyLyP78xOTdkyW2NPz/Gs2+qaEZlZVZ+0RJ5BWLjL82rqKnF9ATBSolMkq1pIbzA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.25";
-        hash = "sha512-462gL45vRTFbJIjlQmA6NkxnZbJZxXvtv53iya+SQQ4VM15gSgelR9m8y1MwDIciqThtD5x3nm+3BpamPbaryw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-kMo3dz/KtKjf1npo8s8niLjB6Zk+QSOaAQigo6Gm9kvmLAe8eVlyrqrUsXCGK/leNdiGDWzch0L+nxoATpKSHw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-0WzPkm4ykvpRtHAL73AzNOkU4oUB3SxFsCnPHV9WkWbpG8dGJri7Z3MweCucdnffA8WyIcaG8R6lwCmgjGgp7w==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-q0wy0rMPDDCRRSjL/D8tEovs+SveYQL6pBa7mME6u3JgMRN9XP/PQwGnxahS5/07/D2RR9nAK5qq9xhudv34FA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-4N2e6Bmw8d/eLIisGGvc5wkdQ61cphwfNGgQ/99Dsfr0/kl3PMovG8XscPNEmZHbKPWlb8pfCcE6MOiBSomwEg==";
-      })
-    ];
-    linux-musl-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.25";
-        hash = "sha512-DEaIWo8h+bRnPFsuO5F38+MCaSF1tnulteC+6d6LeDoC54W3K2qUFgH+LR+K+pSxu8BMSzGNSWPp2YJdcZ0GXA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.25";
-        hash = "sha512-oAI0pinclefbjLR55uxCU4lQzJKuSwdbgjs5fgGnECmXaUvgXhtGfw2ZZqs6xXNTTrciiLbtrj6xVtnQc+yAMw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.25";
-        hash = "sha512-R/MYKiITDkUwmgStgZj/pQIis6EYrhpha7pqtgh+BUPN2nOY9r55ZgniV+fnekra/79UF+7ckwvZhAi7qh8/Yg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-cJx+UGgTgS7eLtctXtY1asaZELK4MoAp45tiFtSv99uJPTYuTcPj5nql5c5qyV1O67+M88j1COg0df/b/ADdbg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-eawUKDA8m6mWR1nC5xz428CU9OpFDheRDAAiF5XR9BPOXwCGk/lnnYfybFQ2owchPP6rRfpy3QPo2Mfh4Uc19A==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-p+pERqwKzLrQuD5bLZ8Baph/wSBlVenjTols0os4A/UzgJFUFPV3Yd/bwIodS0Xu979kWdi/T7R7UJ1tIDprZA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-QVvfHc1zDq2q/BfEMVi2GZMI2Wh6KnNFRwhwTu5zvkM5UYJCOveuUD2vtR1Y0OYKJDumD0wdzvvGh+xNV27gpQ==";
-      })
-    ];
-    linux-musl-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.25";
-        hash = "sha512-Kwf6rU4HTiujXCinQoLoMwT6tNU1mlSI/1Sg3dVTmPimhVevMe4sBJ75dovoc953W2HBrpGKLwEQY/Rnp8J62g==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.25";
-        hash = "sha512-ZsUjIrLEGodtiP1D9niDnCehUjn3uY21cqVxfWW+qm8pePL955R5pdl7QEN4uY4xIAtuEFPfiXUWb53XjyYcTQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.25";
-        hash = "sha512-cUilAUpHG535Zs+rW0w0VkaS/MbjgjsLGssJKdyFCNehIdR+4+RU8NM8eQNIZaURqkdywu9mQHECfH4Yk/1NQw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-SJJ1dVtMi8OC3/BROSdUbuiCF4HcZiD/U4eH5OPjW3xkBsp23bONvjAKHGwogK3VC5ppolVLSHtSKxVEahqygA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-0H2OFbTbBPsf0P2V5DXfoZQ9aB/NTT7ptBVu12t+hn3p8rTztSOLKvgFkB7W4H/jFs/q7gx/+TdxrAMH5sTI+w==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-9nsf3lm+4E3FT6tB/FJcci0d6pLRfpvacHEFYyfQIAn0CpE6AxfNaS988+G1f4whvf9BH93Ksr/6zid2qYDZ9A==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-A/l9S4D7J8+b8aQRBGFLhFKvA/hursAM+he4b7H6sacsqLBX1jKdKUJoN1PbS+uhSg5mLSqUcmOJi2RuVgvf8A==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.25";
-        hash = "sha512-cYltFLxAUdDdZ2xkHGegVCRQLz0zD7jBsepmLKCau3G83jNvEk6ylI9uLlD731+LRT0Yq14oydbSxAQ/yaK6TA==";
-      })
     ];
     osx-arm64 = [
       (fetchNupkg {
@@ -420,41 +78,11 @@ let
         version = "8.0.25";
         hash = "sha512-9l5Gtkz1kOH+cLgUDnmYDoIXB75lIQ39vp/6DlyRxm7PqNLBP3PXuNNHnGJ/cyvy5nER6DExV45HCi5A1aKr/w==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.25";
-        hash = "sha512-d7Uv5YGawAHbFPkwIz2RuGDI9+74/zwUOdF2AOZ/tOIYmn01xXnVMeFrf1Z4FMgVLFdA6nZTAMy0WFANXojhtA==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
         version = "8.0.25";
         hash = "sha512-UcgDIJx4+Zh3yNrnwDJoXlA9IpugIUDp0niYFyw/U18c9jI4MT51YGLGlI7vy7IkOVA7O0mJcLABrABLKlcKbg==";
       })
-      (fetchNupkg {
-        pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-KLZPRcwFLqUil/QaPIE0CSXIXM5e1olDQOpWXjBWkPuEj/8zX5A3PFuiowG+8yoC8r5jP8RzjwdV0Y/qeAsfaQ==";
-      })
-      (fetchNupkg {
-        pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-b4iYO3mLGUU7reVLhyji8jm8ocWrA3YC+W2bUxQtbl1xCw9jEYtVdqTXx9HNmE/71mGDVPHSvgoo1tnVagVMzg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-rWtj0wYv4/WfBtHLiaUfNkHf1j+fDGqbJrwus8vPJ2SBdQhqdhJ0km34tZw6yRqjE8/QK8ZCnMW75fuXIvO4UA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-Dy1knVjNSOsXuo3WiUGeEfTFM4pZzc7RU6fClGJ6QY//B5wxmQ9O3UjTO563XgY3zdxqqAIiU2+PRajXKMn3Ug==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.25";
-        hash = "sha512-BlhX9ZFiZiLJjsnd+u3Es4SoF25Sseh13xVRuX9qSj+zbdDT0WrSc3AqKhX7T+iHYHmOvAhF6hVioCOXX3k25g==";
-      })
     ];
     osx-x64 = [
       (fetchNupkg {
@@ -462,162 +90,11 @@ let
         version = "8.0.25";
         hash = "sha512-c0jEySkvlVvHmH1Cst9CK/1heZt20GRwOfItWm4ng513VEfu0EbbJ1Z2UYxgBOvDruCdLv0z+lLbS1yxZdsyHA==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.25";
-        hash = "sha512-aAwELUtrEsgixKnFRYquT4DFu0DPevr32SfSI+hkjF+v+TA5bbw5vJehfgaa/g5ubWsmgsoLBNXfmdygI74e0g==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
         version = "8.0.25";
         hash = "sha512-iufUmvbhlMAtLdFwCU1LFA17fFbhE/eYg6dLVxmPxvwPDVEyOoJqdlWQAH4vvOh8A2gTbEG56qSSWDKmUuq37g==";
       })
-      (fetchNupkg {
-        pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-qILNnBa5HVaQK3Qnt13nUcpU5RxAjCxnmXjgBE6VgVGC5vInaj6piP5nOEMQgg7qKx8Ia7sO6b0zNfpLqpX2GA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-jojJqpPkKEfFpAR85UmaCA7CfF5Qg/QOUI1lYNLGb+uhci7QKLuljMNpkM8cLB3oYXR8rqtO8zW4VF/WWXKGtA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-GTM9x1fhwXHEb8C4SjoFSaFH8jJJQtjBngR1X8BsPmSzQw5ivbtzquShitymrmBZN0wubh8VfqBW1IoiNRVfyg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-awiQPtoO8oeDUfXublVnsv9NL2RnI+CrX3Gkffv/c6p6Mgu1bZvCUfsWZ1vigib7LMEHa8aksTtiw3rOSVxazQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.25";
-        hash = "sha512-FoIQgcIP/UQMIgPDglDd3CwTeeABeHbeZwo92tVikOHfwRoZfJ6tU5CsouGD5OCSQp1tAA9NUqDWUTZw8zChDA==";
-      })
-    ];
-    win-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.25";
-        hash = "sha512-EpzOSe9pa+WjHW/P8+3J45nJ93b/ip9M90jn0R+iB4Rc28B2Pyh0jAtTqkHZOp5oMtznipWY5zuRmXbgFpUzAA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.25";
-        hash = "sha512-Py/14ZpH+MnNYQ+IM98CdSGOAu10qI+KuQpVgPPUnPyxuTqEsI/CG2VeHa1l7Gvz/BCADkQo8FqgNJu8323MEQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.25";
-        hash = "sha512-gK/53iv85vbUPb8CnLh6PPWxS9EHwtIPPPcxHFKTgNPO0mcXB+e3P5svSuEvfe9Yp/dE4l2E9UfDugcNSa8JxA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-pB1agArWNDwpK1dctWYsoNfUkQ9qUH8J7l8X6ocVFfaa4cgHU/MYT8vQ1mfjIPEyXWC/ljvNJs74lqnh3jhybw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-LFwA+JpKwhlFLvZXnAUIbIdTQCRCOhBUHBIzonp+rXEvXx0I82z7QZ33ujNoXSa8VZwmhp33CILo9+u2gIg+Lg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-/iBO/75csujkLRenu3NrcuISyNpiY3NucZ62PXspChFZxI/2Hd9HPYSXrxyjcbiX/SXlFD/zIyhpQtfJzIxFuA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-hq84uCcxOWYHhG/BuezuMbjeuZZddL72p31TwE9K4WWWnhoiXBcDsZcc7j43ClxXtlnSZIVvWerDfZYfRiyJRg==";
-      })
-    ];
-    win-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.25";
-        hash = "sha512-gviCU2Sq/CUzGDp7kQauzbMk5cpoCgN+sh6FpLLGJ4IVchyeqq7UQUamnHtqIGFJdPEsqdZ95cl2Sdh++uBlQA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.25";
-        hash = "sha512-ausHdlWALgtBF+mvt3vWiSZq4KqTreVPmDtHMI2uarGb96M17QWu14uhhctTrGsPBcc7x4hTYBuK9V43ArUAFg==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.25";
-        hash = "sha512-UkxLgMmbfnG+xF0G8t1Pd92UII+9KqgmxKNzejjTW1Ox+DCwrC05MmplM76vLsDOdaO87is325RbtdNRSaiERw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-SKdopTlwBgWYqPT37+5Pbe6IKmznsrwA1zX7kua4PB+DdbmkS2b4nYa9DuZIgbCWWL3C+mjloxSmFzK6lOBAhA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-yBgoCW+BBdwC0syp/FQnIkvehxFuJhPPrIoXaaOfMaJdABNE2fV4QZ7t25um+GKAXhQSFYASXZTk94nrm42KVw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-A3bIR2BHvxFOoENcWP5TqJAuUBqDwOLgK3fa+XtFWu0Rtp9ZrYKyRoHVbqqHirWWvzN0HWOZI4x4OaFas8kfFg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-h5Ek4mjDjouQ4ZgoC9W0kh7WzwYtpSJrLHjiSUkMu2SE9/n5lY27kRtPe+A4r6rzLfEEd35SToq20nO3vK3kYA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.25";
-        hash = "sha512-WSkPeQpku8Ur2WKUsHMX7vxa9vmxSNw3XtO2LA/9HxaGXqgHo9LVCRffqBxIjz76vKqvbWjZjtTj8eQ8KaTtYw==";
-      })
-    ];
-    win-x86 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.25";
-        hash = "sha512-n8aPpFWVirne/jRH2/w9+q1+mUzyqodJWuSJBRi2LvvqR25LcneuBOk3fvL2QOn/HDsAOoZ50weP/bay+iar+g==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.25";
-        hash = "sha512-5dlpmlUU3S3Y7yB7XfS3TJZBthw9enB6Jv8I1QptRGtVr12wVljSmkUbUE5tujou5im1hhlxKA4LKO98tGynHw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.25";
-        hash = "sha512-pxV9H1TBTznSSjg6EJUwh6HzAHN13sPqSFcLznfoTeDiq+VFt+vbCbuGR/QZIW2fiT85sP89r98t0BZlH9JG8A==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.25";
-        hash = "sha512-IZgxYw2JOLsXiDW6/AEi8C7GfbPllOsHssqcG9PKHAVcwlfhfVI+ZWjwHJlT0Jgv6239+2NKKUxMje1g79/UJw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.25";
-        hash = "sha512-qX0vaUvmMLiyaQ2EUI+khMuZ6R1lR2HLZAUBTMvxlOPccfP0VoYxQKEZFKp4GuyHtwBdGZTtPB962wz5hhjveQ==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.25";
-        hash = "sha512-GNutinDHEuMwy1oDYCZ8huW/0sfCDHNwE8/dKXSpHdAymYcKqMZ6za9WQDyh4ZxW4LtaHKtL6/wDx2ksHgU+NA==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.25";
-        hash = "sha512-cJbqrcQRgzXO0GfH93xRApzWTlb/lXFngDc2W8ExcLMzEOcF3nZBLhe+w8uYKeqhcEM++HzzwY+vWOPllxqvaQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.25";
-        hash = "sha512-qVmF5yIDylqNTgRgpveqPK3+QYeLmKR8ADQLi/uUpOebXg5MrcxPdxM1UiYlXLPzilOxPfbkimrLmXGdHEuMeQ==";
-      })
     ];
   };
 
@@ -628,10 +105,6 @@ rec {
   aspnetcore_8_0 = buildAspNetCore {
     version = "8.0.25";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-arm.tar.gz";
-        hash = "sha512-2CL6ZEB474zJGgC5YSgdYr85JsUwwgmMSOKldg0FJjYz+E2UAYzPbJXJlVNhgLscn+Yfl0cRHqyzIVrAlIeAxQ==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-arm64.tar.gz";
         hash = "sha512-Zdixa775DETarJBqr5KBj0OoSCGR2/PyC93N0a1gd9F7YXg2S9CCSVAd3TAhpMj1+YocA2DhJocNsUzwbNEnJw==";
@@ -640,18 +113,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-x64.tar.gz";
         hash = "sha512-3bZqw2YlKrOCJxJBs+U6dSAdLISMnshwon+xeKbbGOTZSbmJaj2FMNA9JV9P1R1jU2e+3aPZ88Z3y1lnhNvLnA==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-musl-arm.tar.gz";
-        hash = "sha512-0vNZqg1Cs624UprqiWyXH9+f7tDmeWZZAQ37Uc8VO0njBifgWkjwlWKXNi+gWaaiNlXrkYXjmfFT5obp+C7N4g==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-musl-arm64.tar.gz";
-        hash = "sha512-EmsxuLof4zZN/Nk4jHJGX6ov23slHHgxCG7DF081YHXnIG0z9I/BrjfDNdyw9zm634JSE5Ha00xkCh+xlynWGw==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-musl-x64.tar.gz";
-        hash = "sha512-mUQw4j1G/GSOqWVzscqy8RWM/0rtf9PF3vUrTmOoT7FjWr/ugyjS+TZu99S0LdzZCaagKK8TeK4OtUlQSpxXyg==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-osx-arm64.tar.gz";
         hash = "sha512-J4g4l5Dea2BPrvUsV4WewpStGYzV3ZuMSu0VoVy4E3ywUgPBdFaCeSZXPc1mvGOqyM7gXSg9hoZ2BC1HNZMjIA==";
@@ -666,10 +127,6 @@ rec {
   runtime_8_0 = buildNetRuntime {
     version = "8.0.25";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-arm.tar.gz";
-        hash = "sha512-HRg683h9wTLbngLRh7nNAZzwOkAnU/pJIbNHEeOMX5FJSwa3nxB3wlvFu9ipj7fHjEOy5rBKedQdtTGFSrm+7w==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-arm64.tar.gz";
         hash = "sha512-7tI/mVisrdxuS4OO7XX9M9LFzWb8Z9CWoFxgvMiDWYKInSxVlHytxHybz8PaRl0wf3oD4NOrZoKxYiM6s7Xcpw==";
@@ -678,18 +135,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-x64.tar.gz";
         hash = "sha512-pd4hhX/lFp7HjHBMcWOp1kh6dVOWZRwkEtJC/8JhTHVxGGysTDtOTJnnvfcWZ20opZ1JmGLGpv17gYDR45lzgw==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-musl-arm.tar.gz";
-        hash = "sha512-LAt8fu27DwYLF/Ir3BGNfQuAtfeC1MOd6CZDYpMhQgJ9Sa/ONs29hyLgvYKLwWKl4eQH2MT6DTJoguQ9ZVazRg==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-musl-arm64.tar.gz";
-        hash = "sha512-Oql0IFsj1f2tF2E5H5LbAFbpjcffNPvNm08Jq8pHAczXVyaSuzonxIsffa0ncL5QniS8iauojCH9JFDcM7jFaA==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-musl-x64.tar.gz";
-        hash = "sha512-Kqlnc4rgRGHONUy0hlgte30u11IeJlusD88DiAM1ZIOo/CMuQ5a0R8tcVbGLNDcn57KSKsVmHaO9LbXeDHMWow==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-osx-arm64.tar.gz";
         hash = "sha512-0gNqLlM+aIoVFkNJPCVIg6lV1U5QnjDLuHuQl/eMpMNu4rgDoDEM1XGwjJqFxpRQTyZcD4iE+bDHmNx0n80cow==";
@@ -704,10 +149,6 @@ rec {
   sdk_8_0_1xx = buildNetSdk {
     version = "8.0.125";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-arm.tar.gz";
-        hash = "sha512-qOhXRciZHNWGzLnGwmLgBp/SjPjkpeRt/GgX8Gp1WaPFpHXSyVCrC+yeixxRaavXJrRN1K4Da8+vuhlcJ0WpTg==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-arm64.tar.gz";
         hash = "sha512-sbLwkjJUAcwxK0Enb1DhiLAin2+HQgxkjRqwXahtxAe8koqblTztFad5z8r+6eNPCACUE1aLA5nHJ/i/cbccvA==";
@@ -716,18 +157,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-x64.tar.gz";
         hash = "sha512-KXOFSrkK9U8sYmqAMvTftBv+3Vkh8dW5pLaDKJJ+eF5ciqaT0k9zkwTKRtmk9ahAgfqUuEUuH0+DBAqOWCorNw==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-musl-arm.tar.gz";
-        hash = "sha512-ld1t8kFRa2ZemOsirZBRVf+p9G1vYcKkNEkbc0Jq0Ii0DlfjkATmI1Y1dYDApgQGLMdKfCWz5LxHGwpbYiCDOA==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-musl-arm64.tar.gz";
-        hash = "sha512-+pcYdflda2H82w5lPI/YByTsDL0218Dy1i0od92g8MmU23zLSclJBzkDuoL1gJEDEpUWMUFTuGGtx5uJvjH75g==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-musl-x64.tar.gz";
-        hash = "sha512-0YcLJj7ieU4NcTkbnYhiptVdxcbVHn+yxuuzwBerwASmMuE4MQGPUkjhmhXTcXWTV4ycdRxNwg0SNR5ACycTHw==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-osx-arm64.tar.gz";
         hash = "sha512-9qxDRPN0NM4U/JiPT756O5LfScjQdXjHBLFBX0BBArCi6kSzmJV570Pi3njluMJSOtMFDya9PrHDGHwnyEAOmA==";
diff --git a/pkgs/development/compilers/dotnet/8.0/deps.json b/pkgs/development/compilers/dotnet/8.0/deps.json
index 77bfd48b0c9b..9336bd0b2b49 100644
--- a/pkgs/development/compilers/dotnet/8.0/deps.json
+++ b/pkgs/development/compilers/dotnet/8.0/deps.json
@@ -1,64 +1,10 @@
 [
-  {
-    "hash": "sha256-leB3BeFiEW80loMANJRgtUSCbHMamTXEcLlTAOgHTS8=",
-    "pname": "Microsoft.Build.Framework",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.8.43/microsoft.build.framework.17.8.43.nupkg",
-    "version": "17.8.43"
-  },
-  {
-    "hash": "sha256-dy4sbWvMOAtAeSKoIvWlVMAfLcqQLI1QExFIvdAgM1k=",
-    "pname": "Microsoft.Build.Tasks.Core",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.8.43/microsoft.build.tasks.core.17.8.43.nupkg",
-    "version": "17.8.43"
-  },
-  {
-    "hash": "sha256-/5X592Hw0E18e2SqOxsBLUGcvlRfSqXsHRPfv80MBkg=",
-    "pname": "Microsoft.Build.Utilities.Core",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.8.43/microsoft.build.utilities.core.17.8.43.nupkg",
-    "version": "17.8.43"
-  },
-  {
-    "hash": "sha256-ngvdiRCFgjbBLrc5Fk8fpBPwmsCW5ZJK4TAQ9pDRS94=",
-    "pname": "Microsoft.NET.StringTools",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.8.43/microsoft.net.stringtools.17.8.43.nupkg",
-    "version": "17.8.43"
-  },
-  {
-    "hash": "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ=",
-    "pname": "Microsoft.VisualStudio.Setup.Configuration.Interop",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg",
-    "version": "3.2.2146"
-  },
   {
     "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=",
     "pname": "Newtonsoft.Json",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg",
     "version": "13.0.1"
   },
-  {
-    "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=",
-    "pname": "System.Formats.Asn1",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/8.0.1/system.formats.asn1.8.0.1.nupkg",
-    "version": "8.0.1"
-  },
-  {
-    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=",
-    "pname": "System.Reflection.Metadata",
-    "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": "519351be7f7c75add08cc9b16a3cb86ed71acb3e06a8dfa2a6cd0e48a83281a5",
diff --git a/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix
index 02267a96f8ce..7fcab56747a0 100644
--- a/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix
@@ -9,26 +9,6 @@
 
 let
   commonPackages = [
-    (fetchNupkg {
-      pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.14";
-      hash = "sha512-qSgGFleE4ZvBb3DExY0wkNyZtDeGReZMtn+iM5TP40PnFq3246hVF7m7Fj+moMXeLswsC6+6iFh0rIPRJMAcag==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.14";
-      hash = "sha512-oY4TEsvQZC5DqjbkzxFU1n8+XKLcmAOEzGGAH4Xpq5iSDTT49Qcpl0FmHat9eUTa+Hkjqh6De9ewzvQIlucI2Q==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.14";
-      hash = "sha512-nBzLKh7NdmLgA3tUaNZmiFrG3g3FtHElfZi7VE5h1VJJlgPiLehVf6iDUDraWSB9sm23ibSV4z2lxxtxaxmX+w==";
-    })
-    (fetchNupkg {
-      pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.14";
-      hash = "sha512-1zyv3HlPHpU4St6gEOHzglfJsTWTdN48dtfLRZEw9ruPI9j1cZ5O/Cj4es635TSpz7VnAi10yFVr7Ye6+vH68Q==";
-    })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
       version = "9.0.14";
@@ -37,19 +17,22 @@ let
   ];
 
   hostPackages = {
-    linux-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.14";
-        hash = "sha512-oTVfDmsgrSyLh8NJlIe9tLkw4aCtPSwLUGMTbQTlxAEmeleZXmJuN81UfnkJAdKdG5sivLiQRWwCDG0faBnoMw==";
-      })
-    ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
         version = "9.0.14";
         hash = "sha512-KfRzkAToFV4pgZuiLVXlyw4RbuGYsSAiAvZZQOno6Bv//zX1zTyJJiVcxlJ9fh92cDS8uJz+PaJ/ejhOHs5oWw==";
       })
+      (fetchNupkg {
+        pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm";
+        version = "9.0.14";
+        hash = "sha512-HwEHZLrgvrqc9GIQjcgg82bXj/m/czjG83IXMvg4y8qRsazVzJRwXn4f6pvR8Go4PTHADHN2odZ1RA7oR+o6QA==";
+      })
+      (fetchNupkg {
+        pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm";
+        version = "9.0.14";
+        hash = "sha512-gOGZh9SXiPP30Hq3jNNy6XyRHGy+imGddd+vITJiP0OO4B43YgBIzcaPytEzM3YPNeB9DHHZxgKenouAybqogQ==";
+      })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
         version = "9.0.14";
@@ -62,49 +45,38 @@ let
         version = "9.0.14";
         hash = "sha512-hIhDoJ1Je7kTlBjVaQEa8Ea2v9YNzHFpjTgHTuuE+uXw85mMA30+FU04rHd6ItX7i5oEYR2qfBSe2IvLtvsrZw==";
       })
+      (fetchNupkg {
+        pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm";
+        version = "9.0.14";
+        hash = "sha512-gR+yvtmxVFmAlwoFJ4wCyg991R3yLBacoOyIH+XnZYJdXy/L7a413nVGoqNpre09YT9MDlj8AVhp06elEI4ifA==";
+      })
+      (fetchNupkg {
+        pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm";
+        version = "9.0.14";
+        hash = "sha512-llH6vLel6SlPJuM7ujDqY9ZsPfkXglVlF1EozKPTdzVarxzfy3xbFnFxoUH0Ubl4KYIC7F22+SFA0gIX4lT7Qg==";
+      })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
         version = "9.0.14";
         hash = "sha512-cgIB1paNuwG20tY2h30OJrWH3f2XMGUTf3PH5qUEbM8Pnx/trvofuRhzCcmdiIMCw7uG0Z8fGusOslH2a2u++g==";
       })
     ];
-    linux-musl-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.14";
-        hash = "sha512-k1438qjynTL1eptYrRrmrg1jA2fjz9r0Bk+ltiex9kyEh6+cBbKxn2LaCCsf//Q6WU1sgEBAgJfnrK0hVQ0RIw==";
-      })
-    ];
-    linux-musl-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.14";
-        hash = "sha512-jQy+3YpdZKdohZnPleV0sBUTagxF3R2JE4zxwbw0H9RjiRCIWJA73NliPGXtLZUp/wBRQ/uyb3f6exCgNbebdw==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.14";
-        hash = "sha512-dWm61FQAslco/9j9JsuwHVL73Id80BPdZbnj3eQCanrML6VfkpLN6qFUZjHVnY8sK32oPO5vXKXI5l6iyfc+Vw==";
-      })
-    ];
-    linux-musl-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.14";
-        hash = "sha512-NpmKObqpu0rbcsinVsQ/+ljJLdshU0itfaLwvOXd6T/Elv+YiaVQQJs9zauEqjXPQzJ4/fQsPje7WwDOUspR4w==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.14";
-        hash = "sha512-/uABIz7gXDWtRK1w8GLw6BOcMCb7nxjtxiFiTgnEQZuR/rSe9GIfZtYx02xEYPmd50C2IKdijxr3Xl9RU2h5fQ==";
-      })
-    ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
         version = "9.0.14";
         hash = "sha512-tl/iXIYlI4kpxftKdZkMzfS0iaXoFS3rZaLjf6n+nhOUPBR3iHfciHRCgClIFBIDkz03PMmSQYgJgfEmb1CIWw==";
       })
+      (fetchNupkg {
+        pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm";
+        version = "9.0.14";
+        hash = "sha512-l9EKeutIuK8ZYHfRLO4JNTgsCv9zwD7bNU27rkfkG00PJWzoIVutTGMLYf1OiYCKVJtawXQcfSgC74cYDDrPnQ==";
+      })
+      (fetchNupkg {
+        pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm";
+        version = "9.0.14";
+        hash = "sha512-lkKYv2JhU5a6Ywil9qz2JBBBj8Qt8svswGIe0NG7BVi86vInbJAJWJZHBiwvG+3YmonYhbkEIPQ+xFWdONh8GA==";
+      })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
         version = "9.0.14";
@@ -117,89 +89,36 @@ let
         version = "9.0.14";
         hash = "sha512-BS0EiLj7JtUJ7i9r63LNSqMIQwVbgvCbVgNDkA3vvhy97/BP1zS0R1hcF3AVZTEiF6TRpk/MRJmsNoYwS7bdZw==";
       })
+      (fetchNupkg {
+        pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm";
+        version = "9.0.14";
+        hash = "sha512-BXoutYs8qFdBSjtaRqrauyJZqS2CLI1NVuxtchwdg9aQxX9xG4Hc4POIqvFrZaRoVrcpxtGCSEbg6vvDWCJBrA==";
+      })
+      (fetchNupkg {
+        pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm";
+        version = "9.0.14";
+        hash = "sha512-KVeVExPnYZITgzP6Au2IaxTOES6vhIvhPOPPa7Z6DwsSu6Zd6t03HxM6JyU5/D2nKofjBnvcPjKW+zS6gA5zCg==";
+      })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
         version = "9.0.14";
         hash = "sha512-ltQrtUR4/z8hmlSSkV2dU0rBHmAIWNmKmpetNqTJY233SeVjbgieza3EAS8tYMhJHXAGaqjk84Em8qPaemefDA==";
       })
     ];
-    win-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.14";
-        hash = "sha512-glpxsqvwHefKH1cnUUshgCoFDS7xRFjm+O4V+16GncKB/ONcEZIGm8WwnEaRCdqu/Uggsd87x5CJYXI3wIZ4sg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.14";
-        hash = "sha512-GVBMo1f82CZW/XjV1zird6w02rfV8qlu/DZtu8IP0nJ+A7744K7Fi6RJNXKJE+C+tqMmlTkylF/mnaxn4UjpSQ==";
-      })
-    ];
-    win-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.14";
-        hash = "sha512-SePD8uQ7n7Q81G2Psvlo8hPbqkFVYhCvILO8mFSvpqOgY7OiiqQj1sBPZKkNhcVU4CZ7LUUOLH7Wv+4gcobK5A==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.14";
-        hash = "sha512-5jDtZ0QMVbLvdAvnQy3hrkyBC6SCt1Z2o14cesEiamxpeB/gpgPmAqpqcuWMQFyXoqfWENUm3dAPpTeW2pAQ5w==";
-      })
-    ];
-    win-x86 = [
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.14";
-        hash = "sha512-6VrIMox8q/tUnQHciEhvOj9l8NfWq8NnYfGle7IUYkZnM21fOqcrmF0jgLWXl48QI/xRVVDMlqg+TWT42jdigA==";
-      })
-    ];
   };
 
   targetPackages = {
-    linux-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.14";
-        hash = "sha512-hLN+9dSfcJyNarm8hCHI1R+hDYeufiIGRrr9DfsGN/qrPDyS7awpShEwIdsZ+ChMfdxoYDgnrCV/1PClwqOwWw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.14";
-        hash = "sha512-q8AJOVKXCvstKVv/Pdg37mPBf61bFO1u0RoMjksz18LnlQ4xbgzLG5kSILieUg0O95H/rUJ1+rb6dX17fDduaQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.14";
-        hash = "sha512-YJaprNxzr6eTrV+zcIZzi9f3wFrjF2KSwG3XvCm5+4vSZ1JFLW8XFQKY/DqIk0UAoEX92W8TJ7ygBXB5FQMh9w==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-/bdvIYq3+gSIILJ4R2wdqy4MXC/ZvgbHjQ7jq5fBjUGMiobjsxgab1WRo49Pjc4mGJPLwoggygxgAj5j442mkQ==";
-      })
-    ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
         version = "9.0.14";
         hash = "sha512-vKjaQVMP39vBz3CkOpJILVyz+ActsFe0yEvmDOa1EXdR6aCUkpfq89icnlSFWr/oicz9hxGK/cOQgSnRXM2T8Q==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.14";
-        hash = "sha512-GxHFKrzlQ57mYMPXJiZxboJ/rSEecvQgmfvdg7fAnD7c8/JE0AdohboYeCebQEPAOV2R0wEf3LoACUqS3/2y7Q==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
         version = "9.0.14";
         hash = "sha512-AmLrJ5tBEwPK1VMPdk4Vy3Z6++yGkaL5bpKwGpY9SUL8x6nwQjWfY87snOK99X8NEXltxJNovP0FkRLCi+Zr2g==";
       })
-      (fetchNupkg {
-        pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-jHaj6hgSuJ8d4jPFSWyrbyQROhTgMqCFKb+RcNpRf1EJ/0kHbu1vn73qxURYjiol+9jaEjKanJDqZwh76x/tFw==";
-      })
     ];
     linux-x64 = [
       (fetchNupkg {
@@ -207,87 +126,11 @@ let
         version = "9.0.14";
         hash = "sha512-jYd+5KNUzdo36ytc1Lz4TlAeHhRNMXQr3cdBzYAqCx9wfsOUnqPM24nx7XNvNryawyjPicbdP2wiNBgdQlts7A==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.14";
-        hash = "sha512-++Z4DoiGwsqVoGM3YvXsWoEzLVXSXQvTnIKUfCV/GIa7crEgG34Tb/yYzyJvdFScqrHbgf1gYyYeE67iBhlgDw==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
         version = "9.0.14";
         hash = "sha512-f7N/o6P9rxLrfKJyyy7pp/7ytpe+CNa9LdyWPjYBSTiVi9bIPq1yXK6MM4PewCkLsoS0jOOEWmfYHrYb5Fw7VA==";
       })
-      (fetchNupkg {
-        pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-14RbsWvcKBwytrmEpdFvKhFLif6UDfEjlFsZJ7BGREPDNGXg197CkcJHCvn8nVY5jnEju3zCmlSSgPufgd3U0Q==";
-      })
-    ];
-    linux-musl-arm = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.14";
-        hash = "sha512-RD/mlV6K5OupTnGDEP5KIFCsqsPaPJnxZh3SEowf/ShRL3djfZqz/a3WJVrpyjt7jpiOlRf+3HPl3pGmqZoOqw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.14";
-        hash = "sha512-SNuZTEbjDCUasMXqoRCOPR6zkIeaORIj2FZkvUY72M8D9U+hxOjDhf3DltesRmtOFuhDkgB5KNCL6zriAvbung==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.14";
-        hash = "sha512-7tlCJe1E7aFUXY53OFjLD+LAsblMfMDBDhLXLx3QdYA9IRKopXQrCtAvFQ+i+i56mKs9RVUmg2v+RjxXwP/MUg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-/UEQYhm/+Zo2ulnZiEzP18vqcPWgqnFmlobEvZc9TCVGx205H8XoDsZ5+MU156Vbu2G6K8El2UCJeE8X9qXRbA==";
-      })
-    ];
-    linux-musl-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.14";
-        hash = "sha512-YWI8RNne2riYIn7tn8+5ewJFIzeskhJ3MfiZEHh17lmixvwPczfW+uqRdHAZ0ERYWpYFO+rO3/4/66WuU4H96Q==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.14";
-        hash = "sha512-Ft8hxap4jV64vvOdcomyEJ2b1HFmXE2D1d8Ib0iNcbf/0qyYxosNQQa+Ttzq0AoODWmq6cHdWjPAfYgMQPOM8g==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.14";
-        hash = "sha512-oF4pLSWyrR96tyVignbQ12gR+6JcozCv1BO9mBy4j70EDsV7vpm3x3PGoA+SaXaDDm+SGddFElx+MOUzB8jEsg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-ReEgJh8mRp1wRzHjkbIZVcLZyBj7K9KZzYjHhzOCS6gFEF/V/4fesp8MVlzLdXSBV+ZunSUwL5hWWvUlx+nQ9w==";
-      })
-    ];
-    linux-musl-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.14";
-        hash = "sha512-jSo6p8k62QbPGfCFxRJEnjTJz2HKEV3YP9SXYyTRXnUrXypLzHqU0GUQmgzMGZBM+MTHUEsH6Bhy+r7j1QpICA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.14";
-        hash = "sha512-H3zVn1SRcQ/anQpfg44zFVsAtkdj8YAdrNVU+dxe/2fB/ZBjVDZaMoTT/d0fd7wyzDxufPE2IVXK7JyeExsrfw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.14";
-        hash = "sha512-nk3joXKiqVG0ryUg8FqCAlfl1hSqCL5gbTFaIe+vC1eVheitArOaxY4TU+tCsG/XNoskLaAG7ptU1eXMpesung==";
-      })
-      (fetchNupkg {
-        pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-UIwm0mfT7u9HLdfVi6uPBt9gplnCCbncc6XNOhYJfEB441j2kDRkKDSVhfXerA2lCut0U4fQQm+i9qGd6dFlKg==";
-      })
     ];
     osx-arm64 = [
       (fetchNupkg {
@@ -295,21 +138,11 @@ let
         version = "9.0.14";
         hash = "sha512-Nxre0GsAxbGLmlfymqMYsWps0rexVTEyKyCtv4SZs+OnRd16xd3YFoxuqwaqKOSGuDPRIX9yJF/POjWnanA0HQ==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.14";
-        hash = "sha512-S1jr/9rRWM2bUoz7AHALT5frHBnAiHWEb5WhrKuRzJogN1bCDOpGXnkZ0zEHbNIbhTeZbkmMLTkch/ZDBvm8qQ==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
         version = "9.0.14";
         hash = "sha512-1j/Sem8h5XELOfV/8mnVdXuYcltI0JXAyvzNeC7uBJlH/ic1HZ00TQlWsv0/WIgnHgSTAgNaa1HxnAYL35NITQ==";
       })
-      (fetchNupkg {
-        pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-8mOcQRKCm9QisJOZ8GJTV+Z0pStXlnvCAQnmfYFF408Vo9c08bnla0sHRHobFVRxtWqMojvHGHwnUlnp9XrPLw==";
-      })
     ];
     osx-x64 = [
       (fetchNupkg {
@@ -317,87 +150,11 @@ let
         version = "9.0.14";
         hash = "sha512-DPYynWbPeB1oLDtUxOQLu5SzJQlqQzG01mxGoD1qTjDK1V1a1eVWfKMRZ56tKkIS40zywn8ku7Rpmrf4F4v1CA==";
       })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.14";
-        hash = "sha512-3hDLHUaEXPG1j03/fk1vpJZMRQn1TFh3X5yGdFLM2d30R2jcKf0IQruN1x4r9QtOOA2d3WpQJ01pYCd/GK65OA==";
-      })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
         version = "9.0.14";
         hash = "sha512-2mjykmXgsvwZb6qItFVw5uTNlGE30SdjSbTaDzwElYIo0ZFJHKYMuQsBxJD1GUzets0n+g0Z/dZ+MjddeYI5Vg==";
       })
-      (fetchNupkg {
-        pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-fyAsLUnRPvTSnzOax4IQHoSdsrBbAYZ5OtMdulCA1prKJ82ZG80stokdB3vkvLyGqGCg6h7R4VhsZrZRuFKP7A==";
-      })
-    ];
-    win-arm64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.14";
-        hash = "sha512-fXXqGF24E+d6zQ4JoiTfnlb84ER/G2RsHJRiv5DbljthIGAv5qxnwT4B5C2EdpOvipovF6i8D2z9oDwNwThR4Q==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.14";
-        hash = "sha512-wXiDzelOZOfYgAgHaYNyXq9yFEH9H9JtMIBMAt1XLe7aB9t8ikOi6ki8vW1/xCVyTChQD+gRvFyZ5ndCl3h7Dw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.14";
-        hash = "sha512-X8m5Y7a4RUtBzFkijWHGkKf9RI8ryfPaVKG7U8L6EJQhhlcaPkrR40tsA3kLWu0BrrsSLwYA+QamwZjrubAB9w==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-HQXY+yGY+9+Rkmj3g2DwVKQDzhMWANYVsxUD1btokmnQPmznWt8NWwF6pFkCcgFocbzUYTTlmxfKb+LVI928Uw==";
-      })
-    ];
-    win-x64 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.14";
-        hash = "sha512-ACy6Ms3VSZ8yGl8sPOheIzmJf/T4HtkW1ZhYMiYgbA3dAIonrDPvk0SACANEwmLAHUoPSRkZ4xEqDrg0EptzMw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.14";
-        hash = "sha512-YLy95lsjZts5RPMNk+ahD5LKmKpKMNvtXOqHNdz9DfjG3YEBwzIffGVVs51NkWf93ivLPGcBcn/VAzuW47I3UA==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.14";
-        hash = "sha512-xuo9nZxqdcbn+Q4laeN3a3RXr6fPE49EzLU8uNj506udjEKL58J9IpbKMX3DU9zE7Wp1p7/AY68UkHqOlVtKOg==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-LmujYamAcv6GHlRs4xhnRWUKMfW4n9gI1t3w9mVapHfWZ9ErbgvjEJyXNTp4qmB6xIR00ggXLSQGfRuiZV/KqA==";
-      })
-    ];
-    win-x86 = [
-      (fetchNupkg {
-        pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.14";
-        hash = "sha512-cH6M0YAJOZOl/Nb1lllWqewvsgBZQ8x+ix7QImG5WFvx4nSuUDINRigq8zZeUL1Q05GTsC6U5CVWhY1HrhFdOw==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.14";
-        hash = "sha512-ZYOr/UXKLXLdhsVAvRKZu9mVGdFw7282EBgwvBIUZR8zzVxd4qseapdw9Fhoop1stOtVcgs1RGqnHJdRx5O1UQ==";
-      })
-      (fetchNupkg {
-        pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.14";
-        hash = "sha512-7Wdn3dL26+J/Gbl4hM4uHARyTcLCv8ugk/gQ18hP6JvUXHkqZZzsOr0bVqTXU8+2/Py+shyIkJM7nqANTCaI1Q==";
-      })
-      (fetchNupkg {
-        pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.14";
-        hash = "sha512-w4B7gwQCiSW+m8ioNz6oYEv8ZD65PuZfPN5nJPegjQeJQJcpPjl8LS5qS4zIIF99tDzL9HdbTd2/ctUwRrVJyg==";
-      })
     ];
   };
 
@@ -408,10 +165,6 @@ rec {
   aspnetcore_9_0 = buildAspNetCore {
     version = "9.0.14";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-arm.tar.gz";
-        hash = "sha512-TBC0tyYmkKui6pajHM8MzIRUxlR/BmNwqm7pJjPADoUFw8DOjdh8HFepegYDJ/NMf0QlqFZ+4gEjqbrESbFQYw==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-arm64.tar.gz";
         hash = "sha512-xc0FlxycugwhHOtV4ibL+2LxctuDRfpdTkdqTMs6T2HW5R3CstF461XzZzrS1hz3KuZJ+4TM8sPbu9Ss27eBMg==";
@@ -420,18 +173,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-x64.tar.gz";
         hash = "sha512-bQlHOQ+ewxYpfyGp7AIlKKJyBaRDKPlBf7hnV4PtxWAi5eFeplZQxec8tzkXwJxSMF0+heTBKs1eEQdIcbsGeQ==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-musl-arm.tar.gz";
-        hash = "sha512-zrzx18hUhb1dNIbwRjCB9BN1llCaDnhh4xp7XsNqkMex3nLPKJXojRdIZkC7dZPbK3EQhYo3cbbSM5hlyHwSjQ==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-musl-arm64.tar.gz";
-        hash = "sha512-2tBpSpdV081M9ea/4wjqqLkEYTkYTIVzhyKwNuiPF4+NY/mv7RLiZPLEHRPmsYoXr90d77l62IdaIrtILcFhMw==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-musl-x64.tar.gz";
-        hash = "sha512-gfkhRH1kcJoln+AIOLN7vUoor9ZZOMqgcYvr/GDrwKohsDHwSQ9KFqrI/6T9rvaBAbK/DX17mSKT1g+3NXqHfQ==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-osx-arm64.tar.gz";
         hash = "sha512-VhV7qrlOtSivrPkhaX1mPrID4RS+mOCKAxUwPQm4+F9y8dGT7tpx5Mg/Tl38hRffUoq4ZJ0XVIt7YTaruvfr/w==";
@@ -446,10 +187,6 @@ rec {
   runtime_9_0 = buildNetRuntime {
     version = "9.0.14";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-arm.tar.gz";
-        hash = "sha512-K3U+B6gtlvZGzWhpuejfpdmCEElRqEBTcu2RpBo1lqts7bHmnDUjhApXN+qRtuMVzTQSSF+B9wjdtLgul43aTw==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-arm64.tar.gz";
         hash = "sha512-D+DekyKzozyyMlbOZJ/lqUlNtUdsUO8lM4bXTp43Ipk87jh9aFAGETGti3fxRUj6E/dyyUhsMq6jzQjjE/dvcg==";
@@ -458,18 +195,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-x64.tar.gz";
         hash = "sha512-2w2wuecJ/+Rj3q2U+053ubDHCGu6p4p4qmtTZr73e6PDOJmoHDwa7zwRAnoebN6/SnrTBTK9wZPw3sxxly5d2g==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-musl-arm.tar.gz";
-        hash = "sha512-5l8d7bW/Se74Ky0rCE5BPPrNL6VK2QJdGVRo6TNpiDRfjJROxQ2oVTp3vG+fK4S4yPMEGy9pshpAVC9LOn8BsA==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-musl-arm64.tar.gz";
-        hash = "sha512-bm7BOWvjDk04/CYgOk7fWotjEHYm6/C+CkFK3hmwuKbJQm7QHPMZiXlogcr4ETjnmtLzR4+Hd1tomVpN120Whg==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-musl-x64.tar.gz";
-        hash = "sha512-1tW85BslqLqSgjEI0/k8UajaJffCL+ZcEh4Z7wky2Jc/iMhjvfItHs8ExJjcanI8ZT3jAHeZP2SGWbw5HzkA4g==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-osx-arm64.tar.gz";
         hash = "sha512-I+bbmZG+jlrTsGD0/oKGAXa/Qx+zSR2f1lZyWTvQBLqshg1JuoOozYRHZqcUGwcMj6jQyKXQ+mi5uNFTsKk72g==";
@@ -484,10 +209,6 @@ rec {
   sdk_9_0_1xx = buildNetSdk {
     version = "9.0.115";
     srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-arm.tar.gz";
-        hash = "sha512-cAanOGAWneLKPb7IlfGYYlxHLDxKEueHqUyGVFei4vLIWh3Mog7nwl/j1xa/tIdri7E7LN0nv/g8QH4dDsOZOA==";
-      };
       linux-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-arm64.tar.gz";
         hash = "sha512-zJhNLUXOnu0k3Xih2SG0GbgRMZJ66RC6UL0oCfZMxADGUlJAJwUyopA6VPWQjEWAmGTMNUZVqLpEUBcmN9z+cg==";
@@ -496,18 +217,6 @@ rec {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-x64.tar.gz";
         hash = "sha512-g38je4D8WM3Jf4AVTHz+UFpzKNyTxUFAZwdhBVq1bUHaEfhiDlAKpAVXhqfuCxOLW3Nga0vOThLIYBukJtOtgw==";
       };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-musl-arm.tar.gz";
-        hash = "sha512-OwDO/OCWK744lXcdNyem2R8gjm+IGfBeZxqkB9e0zslYUGSwHy3ujWJn2IaAhMZ5uIT5Jt19SqDBXwXX+bQt4w==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-musl-arm64.tar.gz";
-        hash = "sha512-A+DrkfpbPaqlCVp9RBbFGNwyPM5cQs8xaxsJT9s7gZfhjhr3XUzNUR3k66gEqjs5nUEEaAb8sep5BSPCj8BrGQ==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-musl-x64.tar.gz";
-        hash = "sha512-DtLBHH7hyOmtRPXSgF50jwCU2jGHNi0KDKNCqnWvz9W8Gf5yOSPtvdC09nKtxFXBj8jwgaVBWZ3xbbiFXj45Jg==";
-      };
       osx-arm64 = {
         url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-osx-arm64.tar.gz";
         hash = "sha512-eU+QDeVY8w8uI3WWXAjADdSZCq0p4xv9CTsIsdmlv1fHjMbz22jNhTB2+BaJKJjEPVCOeES0BguKkR3Om8x3Xg==";
diff --git a/pkgs/development/compilers/dotnet/9.0/deps.json b/pkgs/development/compilers/dotnet/9.0/deps.json
index 33c0ba6dc780..fe51488c7066 100644
--- a/pkgs/development/compilers/dotnet/9.0/deps.json
+++ b/pkgs/development/compilers/dotnet/9.0/deps.json
@@ -1,50 +1 @@
-[
-  {
-    "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "35e10f23c0b5b10901551c68d1abe981a0b48c8e4b86c61c3a1985458f5a81f6",
-    "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.14/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.14.nupkg",
-    "version": "9.0.14"
-  },
-  {
-    "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "9e721aed2a8597685c251c479bdf1838c9c014b4fa2ec26ef4e162747f97e12a",
-    "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.14/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.14.nupkg",
-    "version": "9.0.14"
-  },
-  {
-    "hash": "sha256-nfXhbwSIvFUxNs5+NV92pYj5xpge9N5ydUy8kZ5xZ6Y=",
-    "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.14/runtime.linux-x64.microsoft.netcore.ilasm.9.0.14.nupkg",
-    "version": "9.0.14"
-  },
-  {
-    "hash": "sha256-C/UpFPa+dNKLBn4YPCRQhyrIj4CXxL6mIjIR/vnTs3I=",
-    "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.14/runtime.linux-x64.microsoft.netcore.ildasm.9.0.14.nupkg",
-    "version": "9.0.14"
-  },
-  {
-    "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "5934e0320090375e08c8bf93eac462bd06bf779b179a336eb679bf4acd5b9f6a",
-    "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.14/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.14.nupkg",
-    "version": "9.0.14"
-  },
-  {
-    "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "06409aff89f46a10122437e87c8a7adc1be66ab83f9544e9b3f53736c015e48f",
-    "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.14/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.14.nupkg",
-    "version": "9.0.14"
-  },
-  {
-    "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "ba94d34897841a2fea3f64c6b6a5dc61c757c9ca08912fbd3d300e09b9a6c2f0",
-    "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.14/runtime.osx-x64.microsoft.netcore.ilasm.9.0.14.nupkg",
-    "version": "9.0.14"
-  },
-  {
-    "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "4564854526fa0e2ccb5a460c9e82beb6d4dad7ea003504cee4f4073bda350809",
-    "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.14/runtime.osx-x64.microsoft.netcore.ildasm.9.0.14.nupkg",
-    "version": "9.0.14"
-  }
-]
+[]
diff --git a/pkgs/development/compilers/dotnet/binary/update.sh b/pkgs/development/compilers/dotnet/binary/update.sh
index 63ad985e965f..b1320ac545e8 100755
--- a/pkgs/development/compilers/dotnet/binary/update.sh
+++ b/pkgs/development/compilers/dotnet/binary/update.sh
@@ -7,7 +7,7 @@ shopt -s inherit_errexit
 
 trap 'exit 1' ERR
 
-rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}})
+rids=()
 
 release () {
   local content="$1"
@@ -124,22 +124,25 @@ versionAtLeast () {
 # with every new major .NET release.
 aspnetcore_packages () {
   local version=$1
-  local pkgs=(
-    Microsoft.AspNetCore.App.Ref
-  )
+  local pkgs=()
 
-  if versionAtLeast "$version" 10; then
-    pkgs+=(
-      Microsoft.AspNetCore.App.Internal.Assets
-    )
+  if [[ -z "$vmr_bootstrap" ]]; then
+     pkgs+=(
+       Microsoft.AspNetCore.App.Ref
+     )
+
+    if versionAtLeast "$version" 10; then
+      pkgs+=(
+        Microsoft.AspNetCore.App.Internal.Assets
+      )
+    fi
   fi
 
   generate_package_list "$version" '    ' "${pkgs[@]}"
 }
 
 aspnetcore_target_packages () {
-  local version=$1
-  local rid=$2
+  local version=$1 rid=$2
   local pkgs=(
     "Microsoft.AspNetCore.App.Runtime.$rid"
   )
@@ -149,23 +152,27 @@ aspnetcore_target_packages () {
 
 netcore_packages () {
   local version=$1
-  local pkgs=(
-    Microsoft.NETCore.DotNetAppHost
-    Microsoft.NETCore.App.Ref
-  )
+  local pkgs=()
 
-  if ! versionAtLeast "$version" 9; then
+  if [[ -z "$vmr_bootstrap" ]]; then
     pkgs+=(
-      Microsoft.NETCore.DotNetHost
-      Microsoft.NETCore.DotNetHostPolicy
-      Microsoft.NETCore.DotNetHostResolver
+      Microsoft.NETCore.DotNetAppHost
+      Microsoft.NETCore.App.Ref
     )
-  fi
 
-  if versionAtLeast "$version" 7; then
-    pkgs+=(
-      Microsoft.DotNet.ILCompiler
-    )
+    if ! versionAtLeast "$version" 9; then
+      pkgs+=(
+        Microsoft.NETCore.DotNetHost
+        Microsoft.NETCore.DotNetHostPolicy
+        Microsoft.NETCore.DotNetHostResolver
+      )
+    fi
+
+    if versionAtLeast "$version" 7; then
+      pkgs+=(
+        Microsoft.DotNet.ILCompiler
+      )
+    fi
   fi
 
   if versionAtLeast "$version" 8; then
@@ -178,65 +185,81 @@ netcore_packages () {
 }
 
 netcore_host_packages () {
-  local version=$1
-  local rid=$2
+  local version=$1 rid=$2
   local pkgs=(
     "Microsoft.NETCore.App.Crossgen2.$rid"
   )
 
-  local min_ilcompiler=
-  case "$rid" in
-    linux-musl-arm) ;;
-    linux-arm) ;;
-    win-x86) ;;
-    osx-arm64) min_ilcompiler=8 ;;
-    *) min_ilcompiler=7 ;;
-  esac
+  if [[ -n "$vmr_bootstrap" ]]; then
+    if versionAtLeast "$version" 9; then
+      pkgs+=(
+        "runtime.$rid.Microsoft.NETCore.ILAsm"
+        "runtime.$rid.Microsoft.NETCore.ILDAsm"
+        "runtime.$rid.Microsoft.DotNet.ILCompiler"
+      )
+    fi
+  else
+    local min_ilcompiler=
+    case "$rid" in
+      linux-musl-arm) ;;
+      linux-arm) ;;
+      win-x86) ;;
+      osx-arm64) min_ilcompiler=8 ;;
+      *) min_ilcompiler=7 ;;
+    esac
 
-  if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then
-    pkgs+=(
-      "runtime.$rid.Microsoft.DotNet.ILCompiler"
-    )
+    if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then
+      pkgs+=(
+        "runtime.$rid.Microsoft.DotNet.ILCompiler"
+      )
+    fi
   fi
 
   generate_package_list "$version" '      ' "${pkgs[@]}"
 }
 
 netcore_target_packages () {
-  local version=$1
-  local rid=$2
-  local pkgs=(
-    "Microsoft.NETCore.App.Host.$rid"
-    "Microsoft.NETCore.App.Runtime.$rid"
-    "runtime.$rid.Microsoft.NETCore.DotNetAppHost"
-  )
+  local version=$1 rid=$2
+  local pkgs=()
 
-  if ! versionAtLeast "$version" 9; then
+  if [[ -n "$vmr_bootstrap" ]]; then
     pkgs+=(
-      "runtime.$rid.Microsoft.NETCore.DotNetHost"
-      "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy"
-      "runtime.$rid.Microsoft.NETCore.DotNetHostResolver"
+      "Microsoft.NETCore.App.Runtime.$rid"
+    )
+  else
+    pkgs+=(
+      "Microsoft.NETCore.App.Host.$rid"
+      "Microsoft.NETCore.App.Runtime.$rid"
+      "runtime.$rid.Microsoft.NETCore.DotNetAppHost"
     )
-    case "$rid" in
-      linux-musl-arm*) ;;
-      win-arm64) ;;
-      *) pkgs+=(
-           "Microsoft.NETCore.App.Runtime.Mono.$rid"
-         ) ;;
-    esac
-  fi
 
-  if versionAtLeast "$version" 10; then
-    pkgs+=(
-      "Microsoft.NETCore.App.Runtime.NativeAOT.$rid"
-    )
+    if ! versionAtLeast "$version" 9; then
+      pkgs+=(
+        "runtime.$rid.Microsoft.NETCore.DotNetHost"
+        "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy"
+        "runtime.$rid.Microsoft.NETCore.DotNetHostResolver"
+      )
+      case "$rid" in
+        linux-musl-arm*) ;;
+        win-arm64) ;;
+        *) pkgs+=(
+             "Microsoft.NETCore.App.Runtime.Mono.$rid"
+           ) ;;
+      esac
+    fi
+
+    if versionAtLeast "$version" 10; then
+      pkgs+=(
+        "Microsoft.NETCore.App.Runtime.NativeAOT.$rid"
+      )
+    fi
   fi
 
   generate_package_list "$version" '      ' "${pkgs[@]}"
 }
 
 usage () {
-  echo "Usage: $pname [[--sdk] [-o output] sem-version] ...
+  echo "Usage: $pname [[--vmr-bootstrap] [--sdk] [-o output] sem-version] ...
 Get updated dotnet src (platform - url & sha512) expressions for specified versions
 
 Exit codes:
@@ -251,8 +274,7 @@ Examples:
 }
 
 update() {
-  local -r sem_version=$1 sdk=$2
-  local output=$3
+  local -r sem_version=$1
 
   local patch_specified=false
   # Check if a patch was specified as an argument.
@@ -274,7 +296,7 @@ update() {
   local major_minor content major_minor_patch
   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
+  if [[ -n $sdk_only ]]; then
     trap '' ERR
     major_minor_patch=$(
       jq -er --arg version "$sem_version" '
@@ -294,7 +316,7 @@ update() {
   aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content")
   runtime_version=$(jq -er '.runtime.version' <<< "$release_content")
 
-  if [[ -n $sdk ]]; then
+  if [[ -n $sdk_only ]]; then
     sdk_versions=("$sem_version")
   else
     mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn)
@@ -320,6 +342,12 @@ update() {
     fi
   fi
 
+  if [[ -n "$vmr_bootstrap" ]]; then
+    rids=({linux-{arm64,x64},osx-{arm64,x64}})
+  else
+    rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}})
+  fi
+
   local aspnetcore_files runtime_files
   aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")"
   runtime_files="$(release_files "$release_content" .runtime)"
@@ -401,7 +429,7 @@ in rec {
   };"
     done
 
-    if [[ -n $sdk ]]; then
+    if [[ -n $sdk_only ]]; then
       echo "
   sdk = sdk_$major_minor_underscore;
 "
@@ -419,17 +447,22 @@ in rec {
 }
 
 main () {
-  local pname sdk output
+  local pname
   pname=$(basename "$0")
 
-  sdk=
+  vmr_bootstrap=
+  sdk_only=
   output=
 
   while [ $# -gt 0 ]; do
     case $1 in
+      --vmr-bootstrap)
+        shift
+        vmr_bootstrap=1
+        ;;
       --sdk)
         shift
-        sdk=1
+        sdk_only=1
         ;;
       -o)
         shift
@@ -437,7 +470,8 @@ main () {
         shift
         ;;
       *)
-        update "$1" "$sdk" "$output"
+        update "$1"
+        output=
         shift
         ;;
     esac
diff --git a/pkgs/development/compilers/dotnet/source/stage0.nix b/pkgs/development/compilers/dotnet/source/stage0.nix
index ef08f24a024b..58af9501a8b7 100644
--- a/pkgs/development/compilers/dotnet/source/stage0.nix
+++ b/pkgs/development/compilers/dotnet/source/stage0.nix
@@ -66,9 +66,12 @@ let
         '';
 
         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/
+          (
+            shopt -s nullglob
+            [[ ! -v prebuiltPackages ]] || \
+              ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/
+            ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/
+          )
         '';
 
         buildFlags =
diff --git a/pkgs/development/compilers/dotnet/source/update.sh b/pkgs/development/compilers/dotnet/source/update.sh
index 585f45e71f19..ea4095221f09 100755
--- a/pkgs/development/compilers/dotnet/source/update.sh
+++ b/pkgs/development/compilers/dotnet/source/update.sh
@@ -95,12 +95,17 @@ EOF
       )
     fi
 
-    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)
+    getProperty() {
+      xq -er ".Project.PropertyGroup | add | .$1" "$2"
+    }
 
-    if [[ "$artifactsVersion" != "" ]]; then
+    tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh
+    set +e
+    artifactsVersion=$(getProperty PrivateSourceBuiltArtifactsVersion eng/Versions.props)
+    rc=$?
+    set -e
+
+    if [[ $rc == 0 ]]; then
       artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh)
       eval "$artifactVar"
 
@@ -120,11 +125,11 @@ EOF
         [[ $? == 22 ]]
         artifactsUrl=https://ci.dot.net/public/source-build/$artifactsFile
       }
-    else
-      artifactsUrl=$(xq -r '.Project.PropertyGroup |
-                map(select(.PrivateSourceBuiltArtifactsUrl))
-                | .[] | .PrivateSourceBuiltArtifactsUrl' eng/Versions.props)
+    elif [[ $rc == 1 ]]; then
+      artifactsUrl=$(getProperty PrivateSourceBuiltArtifactsUrl eng/Versions.props)
       artifactsUrl="${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}"
+    else
+      exit $rc
     fi
 
     artifactsHash=$(nix-prefetch-url "$artifactsUrl")
@@ -150,7 +155,7 @@ EOF
     if [[ $band == 1xx ]]; then
       getBootstrap() {
         pkgs/development/compilers/dotnet/binary/update.sh \
-          -o "$output"/bootstrap-sdk.nix --sdk "$1" >&2
+          -o "$output"/bootstrap-sdk.nix --vmr-bootstrap --sdk "$1" >&2
       }
 
       getBootstrap "$sdkVersion" || if [[ $? == 2 ]]; then

From b03c6ea7c0645184ba8dc5b3ee80752a27e029f7 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 8 May 2026 15:14:18 -0300
Subject: [PATCH 045/221] dotnet: build only source-build-reference-packages in
 fetch-deps

This is all that's needed in practice to populate deps.json, and it's
much faster.
---
 .../compilers/dotnet/source/stage0.nix        | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dotnet/source/stage0.nix b/pkgs/development/compilers/dotnet/source/stage0.nix
index 58af9501a8b7..76cc50f977e9 100644
--- a/pkgs/development/compilers/dotnet/source/stage0.nix
+++ b/pkgs/development/compilers/dotnet/source/stage0.nix
@@ -135,8 +135,35 @@ let
                       -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1901' \
                       src/$proj/Directory.Build.props
                   done
+
+                  # disable all the after-build targets
+                  substituteInPlace build.proj \
+                    --replace-fail 'AfterTargets="Build"' "" \
+                    --replace-quiet '$(RepoProjectsDir)dotnet.proj' '$(RepoProjectsDir)$(RootRepo).proj'
+
+                  [[ ! -e eng/finish-source-only.proj ]] ||
+                    substituteInPlace eng/finish-source-only.proj \
+                      --replace-quiet 'AfterTargets="Build"' "" \
+                      --replace-quiet 'BeforeTargets="Build"' ""
+
+                  [[ ! -e eng/extract-sdk-archive.proj ]] ||
+                    substituteInPlace eng/extract-sdk-archive.proj \
+                      --replace-quiet 'BeforeTargets="AfterBuild"' "" \
+                      --replace-quiet 'BeforeTargets="Build"' ""
+
+                  [[ ! -e eng/PublishSourceBuild.props ]] ||
+                    substituteInPlace eng/PublishSourceBuild.props \
+                      --replace-fail 'AfterTargets="Publish"' "" \
+                      --replace-fail 'AfterTargets="DiscoverArtifacts"' ""
                 '';
-                buildFlags = [ "--online" ] ++ old.buildFlags;
+                buildFlags = [
+                  "--online"
+                ]
+                ++ old.buildFlags
+                ++ [
+                  "-p:RootRepo=source-build-reference-packages"
+                  "-p:SkipPrepareSdkArchive=true"
+                ];
                 prebuiltPackages = null;
               });
 

From 495ba1ae1e875070eec81479fd8bb65acee49ee3 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 10 May 2026 17:41:01 +0700
Subject: [PATCH 046/221] python3Packages.pycyphal: fix doctests on python 3.14

---
 pkgs/development/python-modules/pycyphal/default.nix   |  4 ++++
 .../pycyphal/python-3.14-asyncio-loop.patch            | 10 ++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/python-modules/pycyphal/python-3.14-asyncio-loop.patch

diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix
index 787f04c413c9..8fed197d2e4d 100644
--- a/pkgs/development/python-modules/pycyphal/default.nix
+++ b/pkgs/development/python-modules/pycyphal/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
 
   # build system
   setuptools,
@@ -34,6 +35,9 @@ buildPythonPackage rec {
     fetchSubmodules = true;
   };
 
+  # Set an event loop in the doctest helper; policy.get_event_loop no longer auto-creates one on 3.14.
+  patches = lib.optional (pythonAtLeast "3.14") ./python-3.14-asyncio-loop.patch;
+
   build-system = [ setuptools ];
 
   pythonRelaxDeps = [ "numpy" ];
diff --git a/pkgs/development/python-modules/pycyphal/python-3.14-asyncio-loop.patch b/pkgs/development/python-modules/pycyphal/python-3.14-asyncio-loop.patch
new file mode 100644
index 000000000000..9bd4cb5b47e0
--- /dev/null
+++ b/pkgs/development/python-modules/pycyphal/python-3.14-asyncio-loop.patch
@@ -0,0 +1,10 @@
+--- a/tests/__init__.py
++++ b/tests/__init__.py
+@@ -37,6 +37,7 @@
+     This function shall be invoked per test, because the test suite undoes its effect before starting the next test.
+     """
+     _logger.info("asyncio_allow_event_loop_access_from_top_level()")
++    asyncio.set_event_loop(asyncio.new_event_loop())
+
+     def swap(mod: Any, name: str, new: Any) -> None:
+         restore = _PATCH_RESTORE_PREFIX + name

From e102ddf32933bcc4ec8f644d0670a6e77e2cd6aa Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 10 May 2026 13:49:41 +0300
Subject: [PATCH 047/221] screentest: fix changelog

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

diff --git a/pkgs/by-name/sc/screentest/package.nix b/pkgs/by-name/sc/screentest/package.nix
index 65c02d3e569a..9ce8f7afa841 100644
--- a/pkgs/by-name/sc/screentest/package.nix
+++ b/pkgs/by-name/sc/screentest/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simple screen testing tool";
     mainProgram = "screentest";
     homepage = "https://github.com/TobiX/screentest";
-    changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.version}/NEWS";
+    changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.gpl2Only;
     maintainers = [ ];
     platforms = lib.platforms.unix;

From 602cb6356c4a869a260126da4466c8a78b8d52b2 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 10 May 2026 13:52:06 +0300
Subject: [PATCH 048/221] syncstorage-rs: fix changelog

---
 pkgs/by-name/sy/syncstorage-rs/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix
index d177af7c8a82..ae0684f2a674 100644
--- a/pkgs/by-name/sy/syncstorage-rs/package.nix
+++ b/pkgs/by-name/sy/syncstorage-rs/package.nix
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Mozilla Sync Storage built with Rust";
     homepage = "https://github.com/mozilla-services/syncstorage-rs";
-    changelog = "https://github.com/mozilla-services/syncstorage-rs/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/mozilla-services/syncstorage-rs/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = [ ];
     platforms = lib.platforms.linux;

From 0bcea65e13ad06eddc7d21fae2d7d7337a1014af Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 10 May 2026 13:55:13 +0300
Subject: [PATCH 049/221] vscode-extensions.tekumara.typos-vscode: fix
 changelog

---
 .../vscode/extensions/tekumara.typos-vscode/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
index 38a30b4e57e9..6d5b83c7e2d6 100644
--- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
@@ -31,7 +31,7 @@ let
     }
     .${system} or (throw "Unsupported system: ${system}");
 in
-vscode-utils.buildVscodeMarketplaceExtension {
+vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
   mktplcRef = {
     name = "typos-vscode";
     publisher = "tekumara";
@@ -57,7 +57,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   passthru.updateScript = vscode-extension-update-script { };
 
   meta = {
-    changelog = "https://marketplace.visualstudio.com/items/tekumara.typos-vscode/changelog";
+    changelog = "https://github.com/tekumara/typos-lsp/blob/v${finalAttrs.version}/CHANGELOG.md";
     description = "VSCode extension for providing a low false-positive source code spell checker";
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=tekumara.typos-vscode";
     homepage = "https://github.com/tekumara/typos-lsp";
@@ -70,4 +70,4 @@ vscode-utils.buildVscodeMarketplaceExtension {
     ];
     maintainers = [ ];
   };
-}
+})

From be79ab6c782504ebab6c6a286e8a4ca9ff21eb71 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 5 May 2026 23:53:38 +0800
Subject: [PATCH 050/221] mate-utils: 1.28.0 -> 1.28.1

https://github.com/mate-desktop/mate-utils/compare/v1.28.0...v1.28.1
---
 pkgs/by-name/ma/mate-utils/package.nix | 31 ++++++++++++++++++++------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ma/mate-utils/package.nix b/pkgs/by-name/ma/mate-utils/package.nix
index 1dd76a649967..53a4f62c9cdc 100644
--- a/pkgs/by-name/ma/mate-utils/package.nix
+++ b/pkgs/by-name/ma/mate-utils/package.nix
@@ -1,9 +1,12 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   pkg-config,
+  autoconf-archive,
+  autoreconfHook,
   gettext,
+  gtk-doc,
   itstool,
   glib,
   gtk-layer-shell,
@@ -13,33 +16,43 @@
   libcanberra-gtk3,
   inkscape,
   udisks,
+  mate-common,
   mate-desktop,
   mate-panel,
   hicolor-icon-theme,
   wayland,
   wrapGAppsHook3,
+  yelp-tools,
   gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mate-utils";
-  version = "1.28.0";
+  version = "1.28.1";
   outputs = [
     "out"
     "man"
   ];
 
-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-utils-${finalAttrs.version}.tar.xz";
-    sha256 = "WESdeg0dkA/wO3jKn36Ywh6X9H/Ca+5/8cYYNPIviNM=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "mate-utils";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-0G25g4vpfufbvUYjCRJVBv9r5t/gnkDzWGKTf8N5MFQ=";
   };
 
   nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
     pkg-config
     gettext
+    gtk-doc
     itstool
     inkscape
+    mate-common # mate-common.m4 macros
     wrapGAppsHook3
+    yelp-tools
   ];
 
   buildInputs = [
@@ -58,9 +71,14 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     # Workaround undefined version requirements
     # https://github.com/mate-desktop/mate-utils/issues/361
-    substituteInPlace configure \
+    substituteInPlace configure.ac \
       --replace-fail '>= $GTK_LAYER_SHELL_REQUIRED_VERSION' "" \
       --replace-fail '>= $GDK_WAYLAND_REQUIRED_VERSION' ""
+
+    # Do not build gsearchtool help translations
+    # https://github.com/mate-desktop/mate-utils/issues/210
+    substituteInPlace gsearchtool/help/Makefile.am \
+      --replace 'if USE_NLS' 'if FALSE'
   '';
 
   configureFlags = [ "--enable-wayland" ];
@@ -70,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   passthru.updateScript = gitUpdater {
-    url = "https://git.mate-desktop.org/mate-utils";
     odd-unstable = true;
     rev-prefix = "v";
   };

From 510fcb16c800f25a1b303363ca78d9130474ad4b Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 10 May 2026 14:34:36 +0300
Subject: [PATCH 051/221] uppy-companion: fix changelog

---
 pkgs/by-name/up/uppy-companion/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/up/uppy-companion/package.nix b/pkgs/by-name/up/uppy-companion/package.nix
index c31a93e57995..30dea050c6e0 100644
--- a/pkgs/by-name/up/uppy-companion/package.nix
+++ b/pkgs/by-name/up/uppy-companion/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     broken = stdenv.hostPlatform.isDarwin;
-    changelog = "https://github.com/transloadit/uppy/releases/tag/%2540uppy%252Fcompanion%2540${finalAttrs.version}";
+    changelog = "https://github.com/transloadit/uppy/releases/tag/%40uppy%2Fcompanion%40${finalAttrs.version}";
     description = "Server integration for Uppy file uploader";
     homepage = "https://uppy.io/";
     license = lib.licenses.mit;

From d5276b19bbbe5e9ff03f73bf8d184c0c39e91971 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 10 May 2026 14:35:37 +0300
Subject: [PATCH 052/221] webpack-cli: fix changelog

---
 pkgs/by-name/we/webpack-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/we/webpack-cli/package.nix b/pkgs/by-name/we/webpack-cli/package.nix
index 0f309ffbe9c8..b4b565a6f583 100644
--- a/pkgs/by-name/we/webpack-cli/package.nix
+++ b/pkgs/by-name/we/webpack-cli/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    changelog = "https://github.com/webpack/webpack-cli/blob/webpack-cli%2540${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/webpack/webpack-cli/blob/webpack-cli%40${finalAttrs.version}/CHANGELOG.md";
     description = "Webpack's Command Line Interface";
     homepage = "https://webpack.js.org/api/cli/";
     license = lib.licenses.mit;

From 238609999d3cc9927fc8dcc8b4a2ed77a698627d Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 10 May 2026 14:37:17 +0300
Subject: [PATCH 053/221] wgnord: remove changelog

no changelog or release notes present
---
 pkgs/by-name/wg/wgnord/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/wg/wgnord/package.nix b/pkgs/by-name/wg/wgnord/package.nix
index 8cfada43b3e5..2fb2857fa04e 100644
--- a/pkgs/by-name/wg/wgnord/package.nix
+++ b/pkgs/by-name/wg/wgnord/package.nix
@@ -59,7 +59,6 @@ resholve.mkDerivation rec {
   meta = {
     description = "NordVPN Wireguard (NordLynx) client in POSIX shell";
     homepage = "https://github.com/phirecc/wgnord";
-    changelog = "https://github.com/phirecc/wgnord/releases/tag/v${version}";
     maintainers = [ ];
     license = lib.licenses.mit;
     mainProgram = "wgnord";

From f48c4348207b9d1922590326ad4b745f213e62e7 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 10 May 2026 14:44:20 +0300
Subject: [PATCH 054/221] zsh-powerlevel10k: remove changelog

versions after 1.20 are not tagged and not logged anywhere
---
 pkgs/by-name/zs/zsh-powerlevel10k/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
index cbc33168774e..d1b7c03b4623 100644
--- a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
+++ b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    changelog = "https://github.com/romkatv/powerlevel10k/releases/tag/v${finalAttrs.version}";
     description = "Fast reimplementation of Powerlevel9k ZSH theme";
     longDescription = ''
       To make use of this derivation, use

From b232930fbbb8d5087b10946f478bace099bf6d79 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 10 May 2026 20:14:16 +0700
Subject: [PATCH 055/221] python3Packages.migen: fix build with python 3.14

---
 pkgs/development/python-modules/migen/default.nix      |  5 +++++
 .../development/python-modules/migen/tracer-3.14.patch | 10 ++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/python-modules/migen/tracer-3.14.patch

diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix
index 2df88bddfa45..6b797342da91 100644
--- a/pkgs/development/python-modules/migen/default.nix
+++ b/pkgs/development/python-modules/migen/default.nix
@@ -20,6 +20,11 @@ buildPythonPackage {
     hash = "sha256-gRAvl5cUvrjq4t7htXsDBt4F8MEbHXFZoS0jbhrEs1I=";
   };
 
+  patches = [
+    # Add LOAD_FAST_BORROW to opcode tracer for python 3.14.
+    ./tracer-3.14.patch
+  ];
+
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [ colorama ];
diff --git a/pkgs/development/python-modules/migen/tracer-3.14.patch b/pkgs/development/python-modules/migen/tracer-3.14.patch
new file mode 100644
index 000000000000..6b6f25184bbd
--- /dev/null
+++ b/pkgs/development/python-modules/migen/tracer-3.14.patch
@@ -0,0 +1,10 @@
+--- a/migen/fhdl/tracer.py
++++ b/migen/fhdl/tracer.py
+@@ -38,6 +38,7 @@ _load_build_opcodes = {
+     "BUILD_LIST" : _bytecode_length_version_guard(3),
+     "CACHE" : _bytecode_length_version_guard(3),
+     "COPY" : _bytecode_length_version_guard(3),
++    "LOAD_FAST_BORROW" : _bytecode_length_version_guard(3),
+ }
+
+

From 722ad843a4ca5a3bdb8ec86d0a172c150acc9655 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 10 May 2026 20:26:00 +0700
Subject: [PATCH 056/221] python3Packages.mdtraj: disable more network tests

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

diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix
index d4632b852af6..16cbb0e1fb2c 100644
--- a/pkgs/development/python-modules/mdtraj/default.nix
+++ b/pkgs/development/python-modules/mdtraj/default.nix
@@ -84,8 +84,10 @@ buildPythonPackage rec {
 
   disabledTests = [
     # require network access
-    "test_pdb_from_url"
+    "test_load_pdb_from_url"
+    "test_load_from_url"
     "test_1vii_url_and_gz"
+    "test_1vii_load_from_mixture"
     "test_3"
 
     # fail due to data race

From eaa2fd12c04b43b1c0e5255c1c033f4ca25b09a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 10 May 2026 20:52:43 +0000
Subject: [PATCH 057/221] microsoft-edge: 147.0.3912.98 -> 148.0.3967.54

---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 pkgs/by-name/ms/msedgedriver/package.nix   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 25532cf8274a..f396929480ef 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -170,11 +170,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "147.0.3912.98";
+  version = "148.0.3967.54";
 
   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-GD5bXeEWVQHr+u+B3SUjoNCJIp9hwyCW6sYMDbGUBls=";
+    hash = "sha256-ccMYxwaQ70p+za3LoM0vT+lXiRIlYmoldVDqsHT7I9o=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly
diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix
index 6616d4d9c29a..8b23b859cc72 100644
--- a/pkgs/by-name/ms/msedgedriver/package.nix
+++ b/pkgs/by-name/ms/msedgedriver/package.nix
@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "msedgedriver";
-  version = "147.0.3912.98";
+  version = "148.0.3967.54";
 
   src = fetchzip {
     url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip";
-    hash = "sha256-w9ekySBlqy0ev3OE/G05UJ6tz8EGC2Pc3fMNpmvmKMU=";
+    hash = "sha256-woGkky1i9so+1D61irtJYjDQ0xoHUeGQsJi/eQ4VGhU=";
     stripRoot = false;
   };
 

From 44aea721b5a3b40acd8a6e47ca273b41237dc1eb Mon Sep 17 00:00:00 2001
From: James Hollowell <jamesthollowell@gmail.com>
Date: Sun, 10 May 2026 22:38:29 -0400
Subject: [PATCH 058/221] ersatztv: 26.3.0 -> 26.5.1, update repo to "legacy"

---
 pkgs/by-name/er/ersatztv/nuget-deps.json | 382 +++++++++++------------
 pkgs/by-name/er/ersatztv/package.nix     |   6 +-
 pkgs/by-name/er/ersatztv/update.sh       |   2 +-
 3 files changed, 190 insertions(+), 200 deletions(-)

diff --git a/pkgs/by-name/er/ersatztv/nuget-deps.json b/pkgs/by-name/er/ersatztv/nuget-deps.json
index 7cdcbf90ba7f..6a383e15d49b 100644
--- a/pkgs/by-name/er/ersatztv/nuget-deps.json
+++ b/pkgs/by-name/er/ersatztv/nuget-deps.json
@@ -1,13 +1,13 @@
 [
   {
     "pname": "Acornima",
-    "version": "1.2.0",
-    "hash": "sha256-eDApwoJgsWOmCTGPn+o2xpfZEXupAw1+41nCBtAzTas="
+    "version": "1.4.0",
+    "hash": "sha256-7SCe3Bgcyzlv6nXQfTOy3UZLc7ilZ3YXxgl6mcTF82s="
   },
   {
     "pname": "AdvancedStringBuilder",
-    "version": "0.1.1",
-    "hash": "sha256-pLixGUct2lQnSeckSHVnIEoGfsvz3gkA914QSHdaheE="
+    "version": "0.2.0",
+    "hash": "sha256-66bPgNGU/wLpGs9mydkBBlTEJRpvfHDwWEysUsufZJY="
   },
   {
     "pname": "AngleSharp",
@@ -46,8 +46,8 @@
   },
   {
     "pname": "BlazorSortable",
-    "version": "5.2.1",
-    "hash": "sha256-T+0zzQOq81NJUtER+9Ag5DQvn1v3+rbA5AOu/zqWFVg="
+    "version": "6.0.1",
+    "hash": "sha256-VrK9dW5ULwfTOwxKvZU+OiXLuFEldmOx2kju5OBxSu0="
   },
   {
     "pname": "Blurhash.Core",
@@ -59,16 +59,6 @@
     "version": "2.0.0",
     "hash": "sha256-I22mdiA6Ltr0D2pyryUyS0z5YboBr5UY9LZFcer3FPs="
   },
-  {
-    "pname": "Bugsnag",
-    "version": "4.1.0",
-    "hash": "sha256-o30fm7J9tZouVRf0oZNR2hTukc2V8HpdRK30Uu5dZcc="
-  },
-  {
-    "pname": "Bugsnag.AspNet.Core",
-    "version": "4.1.0",
-    "hash": "sha256-L/aMCcmE7xLEtap5/H56VwCsDI4N/m8jgoj6SkxM7x8="
-  },
   {
     "pname": "Chronic.Core",
     "version": "0.4.0",
@@ -76,18 +66,18 @@
   },
   {
     "pname": "CliWrap",
-    "version": "3.10.0",
-    "hash": "sha256-XMGTr0gkZxSOC72hrCjpIChpN0c0A19X3TqOAdBtgb4="
+    "version": "3.10.1",
+    "hash": "sha256-uH4SXiMkUIPw5RRyKtDTTCSkkr3BhBAPrxnC4O4ES4c="
   },
   {
     "pname": "Dapper",
-    "version": "2.1.66",
-    "hash": "sha256-e5n/wnAFGPDSe30oQQ0fanXrvFZYYa+qCDSTHtfQmPw="
+    "version": "2.1.72",
+    "hash": "sha256-9CKyz72/Vp5/GIoxJzl7RAXTj4MvKTgFi/7fGyhRqf4="
   },
   {
     "pname": "Destructurama.Attributed",
-    "version": "5.2.0",
-    "hash": "sha256-0WBuqkLizviaHA5xrbSbs8Z90MLy+fal+NPe4LyLP2k="
+    "version": "5.3.0",
+    "hash": "sha256-1hj6Y0MSgjNRCSP90fFoaC3md58pOO9VsZzTpXRWFy0="
   },
   {
     "pname": "EFCore.BulkExtensions",
@@ -126,13 +116,18 @@
   },
   {
     "pname": "Elastic.Clients.Elasticsearch",
-    "version": "9.3.0",
-    "hash": "sha256-h2ExrklcO6tVFV2ecxnGXA4uY9D1tiQ3sqmmN7wrRoM="
+    "version": "9.3.6",
+    "hash": "sha256-vRFjnDERVzH3uk9i2j0M8ygs9qzq9fL8jWxhnUX0ins="
+  },
+  {
+    "pname": "Elastic.Esql",
+    "version": "0.11.0",
+    "hash": "sha256-o4OYz2vJq5jOjuOzs6YVIwO5nIQYV5pDyVYwFzU2oDM="
   },
   {
     "pname": "Elastic.Transport",
-    "version": "0.10.3",
-    "hash": "sha256-9AcJAN3uP3wywsm52caPg6Qgt4iZS0nhjIl2bb0hlx8="
+    "version": "0.17.0",
+    "hash": "sha256-XRz9obr31ShKHAmNM9vkh9UZ7+u8GfGFvtX/wOduINw="
   },
   {
     "pname": "ExtendedNumerics.BigDecimal",
@@ -191,8 +186,8 @@
   },
   {
     "pname": "Heron.MudCalendar",
-    "version": "3.4.0",
-    "hash": "sha256-QVrlIlO35o2LElr+Ac3F6UZHlI9fosIjheucWBF+QZU="
+    "version": "4.0.0",
+    "hash": "sha256-B0XLRt7/V3pHxOwNNwDpua/R53wS8hN6TrA+iHw03Nk="
   },
   {
     "pname": "HtmlSanitizer",
@@ -206,8 +201,8 @@
   },
   {
     "pname": "Humanizer.Core",
-    "version": "3.0.1",
-    "hash": "sha256-Wxqf1FRXtsQulLFtbfsfYu4oZmrCuOZAikMcY2i6Dww="
+    "version": "3.0.10",
+    "hash": "sha256-mflSENjDof1Av9M9RLGEQcl4V4keVfH3qIxy/uxJ6FE="
   },
   {
     "pname": "J2N",
@@ -216,23 +211,23 @@
   },
   {
     "pname": "Jint",
-    "version": "4.5.0",
-    "hash": "sha256-1+cTMz+HMVl+AVYRdpd77wblEF+aVRL+tTMoI46H52c="
+    "version": "4.8.0",
+    "hash": "sha256-+K8NGiJ1SChiyMrjn4dJOiBdnWXP6UOfXSsNsJ5//tI="
   },
   {
     "pname": "Json.More.Net",
-    "version": "3.0.0",
-    "hash": "sha256-zlJb9Wi9ErFqN8FYphzog9paPxI3DBVnoTL0c12Bfks="
+    "version": "3.0.1",
+    "hash": "sha256-U4Ers0TkbNsrC8TBJsuQcm9IHirf2BRCOf+9uaOhQSs="
   },
   {
     "pname": "JsonPointer.Net",
-    "version": "7.0.0",
-    "hash": "sha256-/1GemlLhmYnz/HDQTpEEaGxaofoFkFUMNNPInKhAvM4="
+    "version": "7.0.1",
+    "hash": "sha256-KCU4NBKrNAJysKlew0IHN5TD+Euo83wfG9Pi1koAWEk="
   },
   {
     "pname": "JsonSchema.Net",
-    "version": "9.0.0",
-    "hash": "sha256-N5bp2OswdoQI5fe/ZaKmk7LwL9woJ5cV4D43IUeFJ3E="
+    "version": "9.2.0",
+    "hash": "sha256-vz2JWvZ7HM87NXgGc+MS2Nff2q4u+w1gns8GK41LOmw="
   },
   {
     "pname": "LanguageExt.Core",
@@ -279,11 +274,6 @@
     "version": "4.8.0-beta00017",
     "hash": "sha256-hHL4liVC3k8+PZVIE8N8SdT8UQkEj55IocsY5QEX52s="
   },
-  {
-    "pname": "Markdig",
-    "version": "0.44.0",
-    "hash": "sha256-EVuUTv5l68t7bP2vJ2njypxuRzH52AztXyBF9LUJrrI="
-  },
   {
     "pname": "MedallionTopologicalSort",
     "version": "1.0.0",
@@ -316,33 +306,33 @@
   },
   {
     "pname": "Microsoft.AspNetCore.Authentication.JwtBearer",
-    "version": "10.0.2",
-    "hash": "sha256-3M89gVZd6YdEKk+/VnNJoWgAkqPkFj8PC32ai3vwm+E="
+    "version": "10.0.7",
+    "hash": "sha256-Y1DM6+4ji/xoAxv9NLsJOj7YUkQA5ItrlTR3NL2XcrE="
   },
   {
     "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect",
-    "version": "10.0.2",
-    "hash": "sha256-Lkp2a7n4MSsk33irb5ByVQ/zFZS5WcoG6Q+rwV8B27Y="
+    "version": "10.0.7",
+    "hash": "sha256-hr1QgB9miQO2rXj5heibTX/fa3Tj/Nci8G/pDcrq11c="
   },
   {
     "pname": "Microsoft.AspNetCore.JsonPatch",
-    "version": "10.0.2",
-    "hash": "sha256-b1IIM+6HOht8cQsi82KM2epHJ/CvRn16UK57tyWRiU0="
+    "version": "10.0.7",
+    "hash": "sha256-sbF5N0U+OXZKRUXXPppPrvJXevmUGnvDl6LqPtpEsBY="
   },
   {
     "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
-    "version": "10.0.2",
-    "hash": "sha256-KSRRa8gmn84qphEFNaLl0PwVmG/gQpgzMHc4FIct8E0="
+    "version": "10.0.7",
+    "hash": "sha256-nVAGFNglXbdJtuk099NVyC+qN/lgL3T0UdZ0GtJ1d1M="
   },
   {
     "pname": "Microsoft.AspNetCore.OpenApi",
-    "version": "10.0.2",
-    "hash": "sha256-FU57fPXL4NUDRqi+rLresi4yKttv1KcAnLuEdPCyTos="
+    "version": "10.0.7",
+    "hash": "sha256-WlAW49otxYzgrmuqHewUoBsjDcAZwhNz5WVbCT4EiIA="
   },
   {
     "pname": "Microsoft.AspNetCore.SpaServices.Extensions",
-    "version": "10.0.2",
-    "hash": "sha256-ZY0Aj8amA9XLD/SWu7+kc/2ROq8lwHa5cK7k0ec4j9k="
+    "version": "10.0.7",
+    "hash": "sha256-xDbi4sbKmyrNYw+L1EIQx3RrVrezxPWICuz250dsEjA="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
@@ -421,8 +411,8 @@
   },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
-    "version": "9.0.12",
-    "hash": "sha256-rV9MvBeKDh3DBf9IqHTzCogLKHsAJ0TEfcfSboCI/o0="
+    "version": "9.0.15",
+    "hash": "sha256-4KjfN468fFj8sapfSv4FzYpuhTie89UJ5jg18Nm06zc="
   },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
@@ -436,23 +426,23 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore",
-    "version": "9.0.12",
-    "hash": "sha256-TCGyEqqYfJ5nXiAi0xVZe8Bwx8TZ0xefLE7h87b40+Y="
+    "version": "9.0.15",
+    "hash": "sha256-Ou8paIss4D6SL2T4mUB3URVD9gkpK6YQ+mmvTuwmxzg="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Abstractions",
-    "version": "9.0.12",
-    "hash": "sha256-52OUOGyGUXiwdjWHm7bXbdTmJ1hyphBrrXfFQebptOU="
+    "version": "9.0.15",
+    "hash": "sha256-JISfrDTChiNqsXiwIh9hMOjLTUJcdkakFPjUqC3IXb4="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Analyzers",
-    "version": "9.0.12",
-    "hash": "sha256-RNwUiYCSp/DxNEw+cNO51jFbN1H6jRtTs4XQAcc629E="
+    "version": "9.0.15",
+    "hash": "sha256-8/WBMCzYsfpJXLzH70Z1Yz4RUjHWf6vWBBMVb3VwEjM="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Design",
-    "version": "9.0.12",
-    "hash": "sha256-ulEXCCNkXc3tLSHKqd6tXhj5txfuRL1MTxZNS1tQHnc="
+    "version": "9.0.15",
+    "hash": "sha256-4SPaldOH+RASmKSfLGViFf9gzZ3OsAvpBrm5TReqcn4="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -466,8 +456,8 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
-    "version": "9.0.12",
-    "hash": "sha256-PNNKkfu7qB1oZDTI3QvT9TUk5EyR1YRriEznha4Q6+M="
+    "version": "9.0.15",
+    "hash": "sha256-Z/HgAgCHY2nWaOOWh5AYDTn1CpEZyNQJDOFv1GNlvp4="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -476,13 +466,13 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite",
-    "version": "9.0.12",
-    "hash": "sha256-CMrv+8yvKwUj3dHBkdARBfRAbk+lpngXaLeRKsT3Nck="
+    "version": "9.0.15",
+    "hash": "sha256-Ydym7NoDB8wADqoG5k5fTT81Dlcqe5yyfSCfknQxz1M="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core",
-    "version": "9.0.12",
-    "hash": "sha256-XyBi4Sf3r9xzgbWWhSaxXMq9L9l7jhl0Uouql/yLnAQ="
+    "version": "9.0.15",
+    "hash": "sha256-j8y6Iy2M+56wWXdLBo6ZDWk6UlA128kdrsAh9VBDnRg="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core",
@@ -506,28 +496,28 @@
   },
   {
     "pname": "Microsoft.Extensions.ApiDescription.Server",
-    "version": "10.0.2",
-    "hash": "sha256-3xz0RLS2+2wI6MI58VLRC5/gnEI+WpTAvPA56AZlE4E="
+    "version": "10.0.7",
+    "hash": "sha256-tqh27mFfF2GzXLCSSeX0uEQ9yXVuhlOZDHo3rJVLwKw="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-nKmQuZTt1g5/8gBajo7wdCV64kdCucdiQR8JTt7ZZb0="
+    "version": "10.0.7",
+    "hash": "sha256-u3pHlFaDPeY2v89jNYLiHUQ2aGMKpe5wpXZUt8hkgdE="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "9.0.12",
-    "hash": "sha256-5InZVZkpQztuUmMWSFtzanp9zPKfN1gb8Id0kNuaops="
+    "version": "9.0.15",
+    "hash": "sha256-x10lmXDYMA3mUS71ujHYKvDJSToDGVp5ajvxV0QaHuE="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "10.0.2",
-    "hash": "sha256-sRUF7DM0s1yzZnfjM/hF9A/IysE6Er23gZ6jST+RWh0="
+    "version": "10.0.7",
+    "hash": "sha256-8qXL1F5gE9OZUEp/9pNVT33hjRMVAPt4eovT1NesKoQ="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "9.0.12",
-    "hash": "sha256-jRs6ObQ4MmhCt0JoCSqlMLLjmPPu1uKnUGUncTjfFvg="
+    "version": "9.0.15",
+    "hash": "sha256-nlXdfEfziMtU3cEyadBlwU2ev3d+KtKSt9Sskgejteg="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
@@ -541,13 +531,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "10.0.1",
-    "hash": "sha256-7xdHie4uHwoGZz5yUT4vWg2EWvkLvsSzItWCoqm4dTM="
+    "version": "10.0.2",
+    "hash": "sha256-dBJAKDyp/sm+ZSMQfH0+4OH8Jnv1s20aHlWS6HNnH+c="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "10.0.2",
-    "hash": "sha256-dBJAKDyp/sm+ZSMQfH0+4OH8Jnv1s20aHlWS6HNnH+c="
+    "version": "10.0.7",
+    "hash": "sha256-2RqDs7+dXtGY78E5jSd1qyKu+dMQkbzv+oMY09SEJm0="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
@@ -556,13 +546,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "10.0.1",
-    "hash": "sha256-s4PDp+vtzdxKIxnOT3+dDRoTDopyl8kqmmw4KDnkOtQ="
+    "version": "10.0.2",
+    "hash": "sha256-P+0kaDGO+xB9KxF9eWHDJ4hzi05sUGM/uMNEX5NdBTE="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-P+0kaDGO+xB9KxF9eWHDJ4hzi05sUGM/uMNEX5NdBTE="
+    "version": "10.0.7",
+    "hash": "sha256-MnUJzZYnl089xuVi6kpt9kymBIvYun9U+Itd12dM5Co="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
@@ -571,8 +561,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.12",
-    "hash": "sha256-FYIGDiv0aVApHCpoVQs4o9sWeFZhXb3XfK/zWXYlH1g="
+    "version": "9.0.15",
+    "hash": "sha256-oiFKtv9fTTQrlk4C/fMY0Jp0ZcxlbvN2WEsMVfPw9J8="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
@@ -586,13 +576,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "10.0.1",
-    "hash": "sha256-fiqTHE6EfaUXICaVrWzQEU/K6GjQNac6yRNErig6wRk="
+    "version": "10.0.2",
+    "hash": "sha256-resI9gIxHh2cc+258/i+TjW8xxzKf4ZBTLIcWAMEYz0="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "10.0.2",
-    "hash": "sha256-resI9gIxHh2cc+258/i+TjW8xxzKf4ZBTLIcWAMEYz0="
+    "version": "10.0.7",
+    "hash": "sha256-lU4G801+Cy3ua+S2slY5UVHOPXdF0I7r3lYX38mQSPw="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
@@ -601,24 +591,24 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "10.0.2",
-    "hash": "sha256-/9UWQRAI2eoocnJWWf1ktnAx/1Gt65c16fc0Xqr9+CQ="
+    "version": "10.0.7",
+    "hash": "sha256-dICogdaqa5mHqyvFA0lTomFa39Dqm4nn7Pit6qi6eQY="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "9.0.12",
-    "hash": "sha256-pNKpg5UELjrn4Tm9s0aJigCX7qJ/JeqboU7TY3k+jUo="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.1",
-    "hash": "sha256-zNUpau51ds7iQTaSUTFtyTHIUoinYc129W50CnufMdQ="
+    "version": "9.0.15",
+    "hash": "sha256-9GklcF6RO6QPZTSLzCe/Vy7mPLJIq4lbHhQ9xg+Nvlo="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "10.0.2",
     "hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg="
   },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "10.0.7",
+    "hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk="
+  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "8.0.0",
@@ -631,8 +621,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "9.0.12",
-    "hash": "sha256-EZt7Vjl0dll6GZOVCTfC2cYxAG5IWtJHeOGlDJ7rHTg="
+    "version": "9.0.15",
+    "hash": "sha256-hszOr6dqOMuiuWPlIbBvqtay42oZfeWtwqX92rvM2MI="
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
@@ -641,23 +631,18 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "9.0.12",
-    "hash": "sha256-CMh5AhCkjIzS0BP+GKael2eIoDSpyXsipWo/M7pcT8g="
+    "version": "9.0.15",
+    "hash": "sha256-g8Fe7eV3NX5av6rRA9nlvuf8Pc+0ht7eiVQ8YLG+T2o="
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
     "version": "9.0.9",
     "hash": "sha256-0ygY8JLOIKuYFwwdVCtDl8/8fV5IC9JgivfzXsjXXsI="
   },
-  {
-    "pname": "Microsoft.Extensions.DiagnosticAdapter",
-    "version": "3.1.32",
-    "hash": "sha256-moN7Vt47IZ0ZHRMjW+Y1Vbn/7ekvkj9GSm4yjIeAGnI="
-  },
   {
     "pname": "Microsoft.Extensions.Diagnostics",
-    "version": "10.0.2",
-    "hash": "sha256-Zb/qJA0cZYiPQO7I3AegZCcNT0aJlKTycUP11Mqbm6o="
+    "version": "10.0.7",
+    "hash": "sha256-Sd0ZsXgO7w/35vOKN1B0CZdcIcMJnf/Z/8POSikTyRk="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
@@ -666,8 +651,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-Aob6wq51LdquE7SkkxtCzcuHBKWrJcb3Ebi/dU3aqA4="
+    "version": "10.0.7",
+    "hash": "sha256-ocntk68Qa3ccHGEnzmZuKdBWdQEnp4PgwJk63bSRjDA="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
@@ -676,8 +661,8 @@
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-tibCkkT9WliU2E/i0ufx7/Va6H6QZX4hR/1oUp8ecgQ="
+    "version": "10.0.7",
+    "hash": "sha256-ibxSdxibq1UKOo4Mz+zthbZd0UUFipnJNb0hPwvEXCA="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
@@ -686,24 +671,19 @@
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-mkeKUXepn4bfEdZFXdURmNEFdGiHQdpcxnm6joG+pUA="
+    "version": "10.0.7",
+    "hash": "sha256-S1WAgBHPi7H71uQUGyl2aG/IITgYfVNznyXsFrRe/kE="
   },
   {
     "pname": "Microsoft.Extensions.Http",
-    "version": "10.0.2",
-    "hash": "sha256-0q9E0HO4YIqUs9ceZpY+nMKtdqdtncTbOjyEOlYdWHs="
+    "version": "10.0.7",
+    "hash": "sha256-cbTDyODUPitTBOn88A5R5/QGPzOTCT7qeyP2gG6WOS0="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
     "version": "10.0.0",
     "hash": "sha256-P+zPAadLL63k/GqK34/qChqQjY9aIRxZfxlB9lqsSrs="
   },
-  {
-    "pname": "Microsoft.Extensions.Logging",
-    "version": "10.0.1",
-    "hash": "sha256-zuLP3SIpCToMOlIPOEv3Kq8y/minecd8k8GSkxFo13E="
-  },
   {
     "pname": "Microsoft.Extensions.Logging",
     "version": "10.0.2",
@@ -711,8 +691,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "9.0.12",
-    "hash": "sha256-9QhfuxEeAiRoP6rYPs2TZY3N/BAd3AgHGwc1wEIcy6o="
+    "version": "10.0.7",
+    "hash": "sha256-AUOet0nWZHB132XCPuyUp5xTFNnWjHhoOtzooFcXHk4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "9.0.15",
+    "hash": "sha256-V4ylLCMDJnQzmbR+20+NUlXXw6a3SpGn5VIZ1eCrjuU="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
@@ -726,13 +711,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "10.0.1",
-    "hash": "sha256-NRk0feNE1fgi/hyO0AVDbSGJQRT+9yte6Lpm4Hz/2Bs="
+    "version": "10.0.2",
+    "hash": "sha256-ndKGzq8+2J/hvaIULwBui0L/jDyMQTAY24j+ohX5VX8="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "10.0.2",
-    "hash": "sha256-ndKGzq8+2J/hvaIULwBui0L/jDyMQTAY24j+ohX5VX8="
+    "version": "10.0.7",
+    "hash": "sha256-/ITLUXgcs5tRDdeileNlmNB92V25CRd1FGBocChJj0g="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -746,34 +731,29 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.12",
-    "hash": "sha256-pl+0ezSkx+GND5pH2gtvhdMiCPodD1YvNP7wl4gDQt4="
+    "version": "9.0.15",
+    "hash": "sha256-n8lNcXF+LGLOfYGn6eQ8iFO6eV+XyP2PjVknG73sQbM="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
-    "version": "10.0.1",
-    "hash": "sha256-/7ywcFsEmmQzWEcIvxoGAYHF0oDSXV/LTDAiW/MNQtg="
+    "version": "10.0.2",
+    "hash": "sha256-eSfmagvrcdRVmTXEdzfvWEDNBewB/YClOGSDq4gThk0="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Console",
-    "version": "10.0.1",
-    "hash": "sha256-m/E02c5NSCYyH4THNKxpnsi3Kp8gqOi2aPrfXx7sQ9s="
+    "version": "10.0.2",
+    "hash": "sha256-mfaypUwMZxEIKBfnmzhnCScC/uPpZBRYN+/2SNcxcu4="
   },
   {
     "pname": "Microsoft.Extensions.Logging.TraceSource",
-    "version": "10.0.1",
-    "hash": "sha256-NS7P5jo7dtiH7DmyyipTIfaRf4ZwEJLU2UVG+4hlFSE="
+    "version": "10.0.2",
+    "hash": "sha256-iD2epXLjKr41et5vJJTzLTxm+GzVxbAUMrwRm9jmH1c="
   },
   {
     "pname": "Microsoft.Extensions.Options",
     "version": "10.0.0",
     "hash": "sha256-j5MOqZSKeUtxxzmZjzZMGy0vELHdvPraqwTQQQNVsYA="
   },
-  {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "10.0.1",
-    "hash": "sha256-vBiSS1vqAC7eDrpJNT4H3A9qLikCSAepnNRbry0mKnk="
-  },
   {
     "pname": "Microsoft.Extensions.Options",
     "version": "10.0.2",
@@ -781,19 +761,24 @@
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "9.0.12",
-    "hash": "sha256-WuEpn1zvPWdS+TTu30s1Z3KMUt+4GpdwRpzqrhtfd60="
+    "version": "10.0.7",
+    "hash": "sha256-XtyfdZ26kjnuCF/YHbdGdsIeR/nxSW7yyQZ04sOa9RU="
   },
   {
-    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "10.0.1",
-    "hash": "sha256-1CNSVXZ3RAH4vzbYDqcQHl9c/YBhuSfrFUXCLIx5/rY="
+    "pname": "Microsoft.Extensions.Options",
+    "version": "9.0.15",
+    "hash": "sha256-p1ilUJEqSUSAx3mlTmMm6Jh3A9QvjL+L5D34wugbWIc="
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
     "version": "10.0.2",
     "hash": "sha256-WJahsWyT5wYdLPEJufHKpb3l/dl7D2iw2SnMK0Jr53U="
   },
+  {
+    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
+    "version": "10.0.7",
+    "hash": "sha256-6UBnB1ouWwRkVEGt5xLfXZvpYsCQQJijKvBlBCJOmmM="
+  },
   {
     "pname": "Microsoft.Extensions.Primitives",
     "version": "10.0.0",
@@ -801,8 +786,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "10.0.2",
-    "hash": "sha256-8Ccrjjv9cFVf9RyCc7GS/Byt8+DXdSNea0UX3A5BEdA="
+    "version": "10.0.7",
+    "hash": "sha256-cQBhL1IkRl1lxaZImAZBVS39CfWkB+J6+hJVEVBE35I="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
@@ -811,8 +796,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "9.0.12",
-    "hash": "sha256-aJBpI8kad6jm0Pno4WQWJZnbM2E3zayjfa8gvoMXI7I="
+    "version": "9.0.15",
+    "hash": "sha256-t5zLMH4Vkmuufk53RX0K/sHo7Yy16TuUd8fUd6de0N8="
   },
   {
     "pname": "Microsoft.Identity.Client",
@@ -921,8 +906,8 @@
   },
   {
     "pname": "MudBlazor",
-    "version": "8.15.0",
-    "hash": "sha256-I6kJEvND0i3I/amZBhDF8LjYeGGWuMwoSLiev6BS3UM="
+    "version": "9.4.0",
+    "hash": "sha256-PsWZYhD35e+W0iBvRN0rv6PspDr615MNBrYGHNIfcNY="
   },
   {
     "pname": "MySqlConnector",
@@ -936,13 +921,13 @@
   },
   {
     "pname": "NCalc.Core",
-    "version": "5.11.0",
-    "hash": "sha256-THgAix81mZxztHNMf5JlTPUGbcs1ZuRS3EVM7eFHseg="
+    "version": "5.12.0",
+    "hash": "sha256-TxeBjIq33bNgHGWgJRjdKmhnxr3lscEFmL59bBNG0UU="
   },
   {
     "pname": "NCalcSync",
-    "version": "5.11.0",
-    "hash": "sha256-Kui0K2WuLS0filTnpdcA3/H/XqqDOjtKms97WqbulEw="
+    "version": "5.12.0",
+    "hash": "sha256-Hraol6T5U8B8Z1DrincdjJZREjkt9ZbBPAH7wtZN4a4="
   },
   {
     "pname": "NETStandard.Library",
@@ -1016,8 +1001,8 @@
   },
   {
     "pname": "Parlot",
-    "version": "1.5.6",
-    "hash": "sha256-Ffbs7IpgN0aOKScBe64PGySnzWxapVSuM73fQmt+2nU="
+    "version": "1.5.7",
+    "hash": "sha256-mvAu74ty4uRP3f+Yy4R/HuhJKApOx/6ASl8nJ1mzvqM="
   },
   {
     "pname": "Pomelo.EntityFrameworkCore.MySql",
@@ -1026,23 +1011,23 @@
   },
   {
     "pname": "Refit",
-    "version": "9.0.2",
-    "hash": "sha256-FTq+jJLV9ow3hTrzTBEYwuAibxY6m0XgExNeIGoAAK4="
+    "version": "10.1.6",
+    "hash": "sha256-KC0PVsbqx5RHZxItYgJaBeUQBlPLQbTx643BzEhXIc0="
   },
   {
     "pname": "Refit.HttpClientFactory",
-    "version": "9.0.2",
-    "hash": "sha256-qxUm0NlJqoOPFRTu7ArdcSR696t5zCB+BniJv1+Xdkc="
+    "version": "10.1.6",
+    "hash": "sha256-/fkHB7cFXIRVUDnznQVJBgpwLS8KdhtiASF78xp4C8Q="
   },
   {
     "pname": "Refit.Newtonsoft.Json",
-    "version": "9.0.2",
-    "hash": "sha256-cxZtCv7gecMVIVzDrgjMBg81dEAq6DT9ccR10SKuFV4="
+    "version": "10.1.6",
+    "hash": "sha256-SJq065kLgo9cJn5sg64hK+7dMxezJbdQJdlp4U1M/1M="
   },
   {
     "pname": "Refit.Xml",
-    "version": "9.0.2",
-    "hash": "sha256-FNP7WAnsjncwdSvj4j7mxP2I+O3TNiYzlaTYVBlMWEo="
+    "version": "10.1.6",
+    "hash": "sha256-VgPvKHxAB+X5hkD+eapzDcgB8Z+0ZIeX/D14vGRhrCU="
   },
   {
     "pname": "RichTextKit.Stbear",
@@ -1051,13 +1036,13 @@
   },
   {
     "pname": "Scalar.AspNetCore",
-    "version": "2.12.32",
-    "hash": "sha256-0EZAD43NpMpX3P8quuctTLSGBxwjxxbyfQodo0e+nII="
+    "version": "2.14.10",
+    "hash": "sha256-NojV2iMXKFbZTypeqLhgNdebb9hGLsFyDjkHrjSOryM="
   },
   {
     "pname": "Scriban.Signed",
-    "version": "6.5.2",
-    "hash": "sha256-rnhmugQoX+lI0sO+V3KIAsQ9kWs0ow7EpEriQLCYAQw="
+    "version": "7.1.0",
+    "hash": "sha256-bUADaUvCUz4uOx/zpiG5IaQKHlWRLiUmCg+90CTuJgI="
   },
   {
     "pname": "Serilog",
@@ -1069,6 +1054,11 @@
     "version": "4.3.0",
     "hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw="
   },
+  {
+    "pname": "Serilog",
+    "version": "4.3.1",
+    "hash": "sha256-TY+GaQYnyDfOGl0gi67xDyUMOuV/mjz8BU66/UsmStI="
+  },
   {
     "pname": "Serilog.AspNetCore",
     "version": "10.0.0",
@@ -1131,8 +1121,8 @@
   },
   {
     "pname": "SkiaSharp",
-    "version": "3.119.1",
-    "hash": "sha256-TIVr52NpQ9cab5eJCcH/OYHjNOTKhwCqpClK2c8S4TM="
+    "version": "3.119.2",
+    "hash": "sha256-A9F397K5FfLeOsNZacKmUh4IU/WMK60B4Z6TEtS/oqo="
   },
   {
     "pname": "SkiaSharp.HarfBuzz",
@@ -1146,18 +1136,18 @@
   },
   {
     "pname": "SkiaSharp.NativeAssets.Linux.NoDependencies",
-    "version": "3.119.1",
-    "hash": "sha256-SprThyApThbDoeTn/JaaS7TKdm9SkMoVO8V8HuCyppI="
+    "version": "3.119.2",
+    "hash": "sha256-79BCLZAYjfHP1DZKgB+hsyyBlhnyZQPi+Swvs0RYnng="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "3.119.1",
-    "hash": "sha256-0QJGcO91MWLSeQpE4ZNn/KUVoHRcrPeDbKklxCVB00o="
+    "version": "3.119.2",
+    "hash": "sha256-KEeGqSiyAiMbzLgH/0JkwUz/pWcL49gYB1T1YLkMPaI="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "3.119.1",
-    "hash": "sha256-ySPkn8SrShOqhihC33EJ4HJt9desDISC4gAI4FQBi2U="
+    "version": "3.119.2",
+    "hash": "sha256-CI6dg+MlxX8t+vbnkxtd5QE3xalMKkA8LUSudxg7TNU="
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
@@ -1196,8 +1186,8 @@
   },
   {
     "pname": "System.CommandLine",
-    "version": "2.0.2",
-    "hash": "sha256-PK3wKHjY8FHkPV75Z4ouxKU67WcuVSiMFjAkBs+iSAo="
+    "version": "2.0.7",
+    "hash": "sha256-CGm46Hk7eZFvIySEynE+A0Hs5EXDs2FNKKhk/rU77jM="
   },
   {
     "pname": "System.Composition",
@@ -1311,18 +1301,18 @@
   },
   {
     "pname": "Testably.Abstractions",
-    "version": "10.0.0",
-    "hash": "sha256-2rixQaYGhCM+NjmkxgOBNjJMFcNHr+3TPP+vsRUMj4w="
+    "version": "10.2.0",
+    "hash": "sha256-5qGJPTlon9GBIpXa8vmZOjjPGMTnbXIDzORY10FEl1w="
   },
   {
     "pname": "Testably.Abstractions.FileSystem.Interface",
-    "version": "10.0.0-pre.1",
-    "hash": "sha256-UO/Ly7Qd7AqYOIP52pS1YYoaQgOzzZ5745naHMqULZs="
+    "version": "10.2.0",
+    "hash": "sha256-4gUlDhO39+eBA/5xbraFpMztu4fcr0SzB+N4amLemQ4="
   },
   {
     "pname": "Testably.Abstractions.Interface",
-    "version": "10.0.0-pre.1",
-    "hash": "sha256-Te2+jj1jSleYGEJHlrmj9GYTht62mY14E5WCKDHx4pQ="
+    "version": "10.2.0",
+    "hash": "sha256-dNazu3BDDWJp/4O7+Rx2MTPDGypQa8p7LJ3fTAWaP7M="
   },
   {
     "pname": "TimeSpanParserUtil",
@@ -1341,8 +1331,8 @@
   },
   {
     "pname": "WebMarkupMin.Core",
-    "version": "2.20.1",
-    "hash": "sha256-6ze4MOSfIKdvMJsroQRtESB8KG5XogO3xk4qOSkHpXQ="
+    "version": "2.21.0",
+    "hash": "sha256-k51tTFcdL9Bwsg3gA51ZswGxDtdBFb22BAj9wbyZu1E="
   },
   {
     "pname": "Winista.MimeDetect",
@@ -1351,7 +1341,7 @@
   },
   {
     "pname": "YamlDotNet",
-    "version": "16.3.0",
-    "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q="
+    "version": "17.1.0",
+    "hash": "sha256-Zdlw62rVud2U94BQKqrp5OFQiDcQ9rRrKeaVnNxREjY="
   }
 ]
diff --git a/pkgs/by-name/er/ersatztv/package.nix b/pkgs/by-name/er/ersatztv/package.nix
index 8022bb8c3932..fa16d4a270ef 100644
--- a/pkgs/by-name/er/ersatztv/package.nix
+++ b/pkgs/by-name/er/ersatztv/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule rec {
   pname = "ersatztv";
-  version = "26.3.0";
+  version = "26.5.1";
 
   src = fetchFromGitHub {
     owner = "ErsatzTV";
-    repo = "ErsatzTV";
+    repo = "legacy";
     rev = "v${version}";
-    sha256 = "sha256-yFGMkTI+IQs3WTOQzxhqj3ownENsIzLqrDr3nWurzfA=";
+    sha256 = "sha256-2w+4xppj3E8H6WXea/iuNfloUmBsFQKDBpTnUn3RWvE=";
   };
   postPatch = ''
     # Remove config of development tools that don't end up in
diff --git a/pkgs/by-name/er/ersatztv/update.sh b/pkgs/by-name/er/ersatztv/update.sh
index bfacbdfea836..54fe65f4ac21 100755
--- a/pkgs/by-name/er/ersatztv/update.sh
+++ b/pkgs/by-name/er/ersatztv/update.sh
@@ -3,7 +3,7 @@
 
 set -euo pipefail
 
-latestVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/ersatztv/ersatztv/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')"
+latestVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/ersatztv/legacy/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')"
 currentVersion=$(nix-instantiate --eval -E "with import ./. {}; ersatztv.version or (lib.getVersion ersatztv)" | tr -d '"')
 
 if [[ "$currentVersion" == "$latestVersion" ]]; then

From 6bc8ce5861d5f6d9e6df24bc44da24076f82573f Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 10 May 2026 23:05:41 -0600
Subject: [PATCH 059/221] balatro-mod-manager: fix build on aarch64-linux

---
 pkgs/by-name/ba/balatro-mod-manager/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ba/balatro-mod-manager/package.nix b/pkgs/by-name/ba/balatro-mod-manager/package.nix
index 835a888d20e0..b23eb1e72286 100644
--- a/pkgs/by-name/ba/balatro-mod-manager/package.nix
+++ b/pkgs/by-name/ba/balatro-mod-manager/package.nix
@@ -50,7 +50,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-97O4DrnjZO2mhSrCQz9xbcRCSaxMNNa4NaLNPlmecJg=";
+    outputHash =
+      {
+        x86_64-linux = "sha256-97O4DrnjZO2mhSrCQz9xbcRCSaxMNNa4NaLNPlmecJg=";
+        aarch64-linux = "sha256-0H14Be8jhBwOBG2Ui8gYrnAcTtatLVsBxFVfTyzmutw=";
+      }
+      .${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}");
   };
 
   cargoHash = "sha256-TPZf4jtv/3mIpe6ASzPkIusQC/iPFpYN51XiiH6pkZc=";
@@ -92,12 +97,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   meta = {
-    # Rollup for ARM64 is broken with Node modules
-    broken = stdenv.hostPlatform.isAarch64;
     description = "A mod manager for the game Balatro";
     homepage = "https://balatro-mod-manager.dasguney.com/";
     license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.aarch64);
     maintainers = with lib.maintainers; [ mhdask ];
     mainProgram = "BMM";
   };

From 7b7892e1b1cc56f94fb8beb88fbbe6184f63f590 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 10 May 2026 23:07:00 -0600
Subject: [PATCH 060/221] balatro-mod-manager: add ryand56 as maintainer

---
 pkgs/by-name/ba/balatro-mod-manager/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/balatro-mod-manager/package.nix b/pkgs/by-name/ba/balatro-mod-manager/package.nix
index b23eb1e72286..6f9a59f26eb5 100644
--- a/pkgs/by-name/ba/balatro-mod-manager/package.nix
+++ b/pkgs/by-name/ba/balatro-mod-manager/package.nix
@@ -101,7 +101,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://balatro-mod-manager.dasguney.com/";
     license = lib.licenses.gpl3Plus;
     platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.aarch64);
-    maintainers = with lib.maintainers; [ mhdask ];
+    maintainers = with lib.maintainers; [
+      mhdask
+      ryand56
+    ];
     mainProgram = "BMM";
   };
 })

From bf9a705ae2c74e67a0a9cbd2963821e3b822ced5 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian@arianvp.me>
Date: Mon, 11 May 2026 13:06:21 +0200
Subject: [PATCH 061/221] spire-tpm-plugin: 1.11.1 -> 1.11.3

---
 pkgs/by-name/sp/spire-tpm-plugin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spire-tpm-plugin/package.nix b/pkgs/by-name/sp/spire-tpm-plugin/package.nix
index 299bae4d1d00..90a95f0e5ba7 100644
--- a/pkgs/by-name/sp/spire-tpm-plugin/package.nix
+++ b/pkgs/by-name/sp/spire-tpm-plugin/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "spire-tpm-plugin";
-  version = "1.11.1";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "spiffe";
     repo = "spire-tpm-plugin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6hy1aQg0tS2wxOZRbZLv82HQEufVmW/a5L6Da+bNeHU=";
+    hash = "sha256-QHFLFotfMyUxKQHN1CcmNMvLvMEatltZPHiUA3G5QWo=";
   };
 
   proxyVendor = true;

From 7e152853fb14470e6df38f8d8d94990aa5ba60c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 May 2026 12:37:00 +0000
Subject: [PATCH 062/221] k6: 1.7.1 -> 2.0.0

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

diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix
index 7edd07e1606b..a9b1883a35cd 100644
--- a/pkgs/by-name/k6/k6/package.nix
+++ b/pkgs/by-name/k6/k6/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "k6";
-  version = "1.7.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "k6";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-vULff8EVWns2N7QRK/dt90Jq10W3UFGXcIe3IXqJ+yA=";
+    hash = "sha256-dtP2G0rk8f3TEPTf5fu/1BEH4nLzboTyE/vveVhlcqo=";
   };
 
   subPackages = [ "./" ];

From 15e89db54b58eb20b980990aabd1ad315b42fb20 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian@arianvp.me>
Date: Mon, 11 May 2026 13:23:21 +0200
Subject: [PATCH 063/221] nixos/tests/spire: add tpm selectors support to test

---
 nixos/tests/spire.nix | 148 ++++++++++++++++++++++--------------------
 1 file changed, 78 insertions(+), 70 deletions(-)

diff --git a/nixos/tests/spire.nix b/nixos/tests/spire.nix
index dec1d0748df1..f7f915c18fd5 100644
--- a/nixos/tests/spire.nix
+++ b/nixos/tests/spire.nix
@@ -54,6 +54,66 @@ let
       };
       users.groups.workload = { };
     };
+
+  tpmAgent =
+    { pkgs, lib, ... }:
+    {
+      imports = [ agent ];
+      virtualisation = {
+        useEFIBoot = true;
+        tpm = {
+          enable = true;
+          # Provision the swtpm with an EK certificate signed by testCA so that
+          # the SPIRE server can verify the agent's identity.
+          provisioning = ''
+            export PATH=${
+              lib.makeBinPath [
+                pkgs.openssl
+                pkgs.tpm2-tools
+              ]
+            }:$PATH
+
+            tpm2_createek -G rsa -u ek.pub -c ek.ctx -f pem
+
+            openssl x509 \
+              -extfile ${ekSignConf} \
+              -new -days 365 \
+              -subj "/CN=swtpm-ekcert" \
+              -extensions tpm_policy \
+              -CA ${./tpm-ek/ca.crt} -CAkey ${./tpm-ek/ca.priv} \
+              -out ekcert.der -outform der \
+              -force_pubkey ek.pub
+
+            tpm2_nvdefine 0x01c00002 \
+              -C o \
+              -a "ownerread|policyread|policywrite|ownerwrite|authread|authwrite" \
+              -s "$(wc -c < ekcert.der)"
+
+            tpm2_nvwrite 0x01c00002 -C o -i ekcert.der
+          '';
+        };
+      };
+
+      environment.systemPackages = [ pkgs.spire-tpm-plugin ];
+
+      services.spire.agent = {
+        enable = true;
+        settings = {
+          agent = {
+            trust_domain = trustDomain;
+            server_address = "server.${trustDomain}";
+            trust_bundle_format = "pem";
+            trust_bundle_path = "$CREDENTIALS_DIRECTORY/spire.trust_bundle";
+          };
+          plugins = {
+            KeyManager.memory.plugin_data = { };
+            NodeAttestor.tpm.plugin_data = { };
+            WorkloadAttestor.systemd.plugin_data = { };
+            WorkloadAttestor.unix.plugin_data = { };
+          };
+        };
+      };
+    };
 in
 {
   name = "spire";
@@ -108,65 +168,8 @@ in
       };
     };
 
-    tpmAgent =
-      { pkgs, lib, ... }:
-      {
-        imports = [ agent ];
-        virtualisation = {
-          useEFIBoot = true;
-          tpm = {
-            enable = true;
-            # Provision the swtpm with an EK certificate signed by testCA so that
-            # the SPIRE server can verify the agent's identity.
-            provisioning = ''
-              export PATH=${
-                lib.makeBinPath [
-                  pkgs.openssl
-                  pkgs.tpm2-tools
-                ]
-              }:$PATH
-
-              tpm2_createek -G rsa -u ek.pub -c ek.ctx -f pem
-
-              openssl x509 \
-                -extfile ${ekSignConf} \
-                -new -days 365 \
-                -subj "/CN=swtpm-ekcert" \
-                -extensions tpm_policy \
-                -CA ${./tpm-ek/ca.crt} -CAkey ${./tpm-ek/ca.priv} \
-                -out ekcert.der -outform der \
-                -force_pubkey ek.pub
-
-              tpm2_nvdefine 0x01c00002 \
-                -C o \
-                -a "ownerread|policyread|policywrite|ownerwrite|authread|authwrite" \
-                -s "$(wc -c < ekcert.der)"
-
-              tpm2_nvwrite 0x01c00002 -C o -i ekcert.der
-            '';
-          };
-        };
-
-        environment.systemPackages = [ pkgs.spire-tpm-plugin ];
-
-        services.spire.agent = {
-          enable = true;
-          settings = {
-            agent = {
-              trust_domain = trustDomain;
-              server_address = "server.${trustDomain}";
-              trust_bundle_format = "pem";
-              trust_bundle_path = "$CREDENTIALS_DIRECTORY/spire.trust_bundle";
-            };
-            plugins = {
-              KeyManager.memory.plugin_data = { };
-              NodeAttestor.tpm.plugin_data = { };
-              WorkloadAttestor.systemd.plugin_data = { };
-              WorkloadAttestor.unix.plugin_data = { };
-            };
-          };
-        };
-      };
+    tpmAgent = tpmAgent;
+    tpmSelectorAgent = tpmAgent;
   };
 
   testScript =
@@ -175,8 +178,6 @@ in
       adminSocket = nodes.server.services.spire.server.settings.server.socket_path;
     in
     ''
-      spiffe_id = "spiffe://${trustDomain}/service/backdoor"
-
       def provision_trust_bundle(agent):
         # TODO: instead of trust bundle to talk to the spire-server, use an upstream CA?
         bundle = server.succeed("spire-server bundle show -socketPath ${adminSocket}")
@@ -197,28 +198,34 @@ in
         return f"spiffe://${trustDomain}/spire/agent/tpm/{ek_hash}"
 
 
+      def provision_tpm_selector(agent):
+        agent.wait_for_unit("tpm2.target")
+        alias_id = "spiffe://${trustDomain}/aliased-agent/tpm-model"
+        register_entry("spiffe://${trustDomain}/spire/server", "tpm:model:ST33HTPHAHD4", alias_id)
+        return alias_id
+
+
       def register_entry(parent_id, selector, spiffe_id):
         server.succeed(f"spire-server entry create -socketPath ${adminSocket} -selector '{selector}' -parentID '{parent_id}' -spiffeID '{spiffe_id}'")
 
 
       def test_agent(name, agent_node, provision_fn):
+        workload_spiffe_id = f"spiffe://${trustDomain}/{name}/workload"
         with subtest(f"Setup SPIRE agent with {name} attestation"):
           provision_trust_bundle(agent_node)
           parent_id = provision_fn(agent_node)
-          register_entry(parent_id, "systemd:id:backdoor.service", spiffe_id)
-          register_entry(parent_id, "unix:user:workload", "spiffe://${trustDomain}/workload")
+          register_entry(parent_id, "unix:user:workload", workload_spiffe_id)
           agent_node.wait_for_unit("spire-agent.service")
           agent_node.wait_until_succeeds("spire-agent healthcheck -socketPath $SPIFFE_ENDPOINT_SOCKET", timeout=90)
-        with subtest(f"Test certificate authentication from {name} agent"):
-          agent_node.wait_until_succeeds("spire-agent api fetch x509 -socketPath $SPIFFE_ENDPOINT_SOCKET -write .")
-        with subtest(f"Workload running as non-root, non-spire-agent user can reach Workload API ({name})"):
-          # SPIRE's security model relies on workload attestation, not unix
-          # permissions on the socket. Verify an unrelated user can connect.
-          agent_node.wait_until_succeeds(
+        with subtest(f"Workload user receives the {name} workload SVID"):
+          # Each agent node is fresh, so fetch returns "no identity issued"
+          # (non-zero) until exactly this entry's SVID is cached — content-aware
+          # retry isn't needed.
+          output = agent_node.wait_until_succeeds(
             "su -s /bin/sh workload -c "
             "'spire-agent api fetch x509 -socketPath \"$SPIFFE_ENDPOINT_SOCKET\"'"
           )
-        # TODO: Add something to communicate with
+          t.assertIn(workload_spiffe_id, output)
 
 
       with subtest("SPIRE server startup and health checks"):
@@ -228,6 +235,7 @@ in
 
       test_agent("join_token", agent, provision_join_token)
       test_agent("tpm", tpmAgent, provision_tpm)
+      test_agent("tpm-selector", tpmSelectorAgent, provision_tpm_selector)
 
     '';
 }

From f124d8254fed06b9c2e4cbc962fd478ef2a1c60d Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 11 May 2026 21:09:28 +0800
Subject: [PATCH 064/221] ayugram-desktop: fix build on darwin

---
 pkgs/by-name/ay/ayugram-desktop/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix
index 509577e12c94..75c9951003aa 100644
--- a/pkgs/by-name/ay/ayugram-desktop/package.nix
+++ b/pkgs/by-name/ay/ayugram-desktop/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch2,
   nix-update-script,
+  stdenvNoCC,
   telegram-desktop,
   withWebkit ? true,
 }:
@@ -22,6 +24,13 @@ telegram-desktop.override {
         fetchSubmodules = true;
       };
 
+      patches =
+        (previousAttrs.patches or [ ])
+        ++ (lib.optional stdenvNoCC.hostPlatform.isDarwin (fetchpatch2 {
+          url = "https://github.com/telegramdesktop/tdesktop/commit/923efd9e7ef8ff72d9b83973502e587682119e54.patch?full_index=1";
+          hash = "sha256-XcmH9SSI3K2SsFjHDEMnKA6YOyWF1kRVJJAWP2/vdf8=";
+        }));
+
       passthru.updateScript = nix-update-script { };
 
       meta = previousAttrs.meta // {

From 8dd105c44b18aa25594d5488b163267ccf84e736 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 May 2026 13:57:28 +0000
Subject: [PATCH 065/221] telemt: 3.4.5 -> 3.4.11

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

diff --git a/pkgs/by-name/te/telemt/package.nix b/pkgs/by-name/te/telemt/package.nix
index aa34b47931bc..df7f5210a381 100644
--- a/pkgs/by-name/te/telemt/package.nix
+++ b/pkgs/by-name/te/telemt/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "telemt";
-  version = "3.4.5";
+  version = "3.4.11";
 
   src = fetchFromGitHub {
     owner = "telemt";
     repo = "telemt";
     tag = version;
-    hash = "sha256-zOdVnW7RTPAbR6fpzDqPpwhOWjxknmg8TzGXmBCbWjg=";
+    hash = "sha256-jBspeSj8aRbHngK8bviVt/i1UiYUPRHSd8+7dnmJOQY=";
   };
 
-  cargoHash = "sha256-/7Xd/6NEu6QqFdVUz4M+iz9+7K5lEDguyaprAKh86wo=";
+  cargoHash = "sha256-x5/SLSlYeGx40oXj/I/5zvyTNgSBwKsA33OwVIq9LGw=";
 
   meta = {
     mainProgram = "telemt";

From 61fa68485aa4668770cf7c702865a46ed573404b Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Mon, 11 May 2026 17:05:30 +0200
Subject: [PATCH 066/221] victoriametrics: 1.142.0 -> 1.143.0

Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.143.0
Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.142.0...v1.143.0
---
 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 ed8eb68050e2..0e65b7c55092 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.142.0";
+  version = "1.143.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PI4P0CGMcYbkrT8Rrgl5P56yTC+r3tnZudvFySzNJeY=";
+    hash = "sha256-K5NsQQ+r1XoOCfeYzZP3+2wdDpGNqWZLpe1hGqx11jA=";
   };
 
   vendorHash = null;

From c18d40d4e59ff85fce53371e3fb697c0616e2551 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 9 Sep 2025 16:22:51 +0100
Subject: [PATCH 067/221] gcc: drop obsolete Musl Go patches

These are present in GCC 13, GCC 12 was removed, and `pkgsMusl.gccgo`
fails to evaluate right now anyway.
---
 .../compilers/gcc/patches/default.nix         | 58 -------------------
 1 file changed, 58 deletions(-)

diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 2e412802742e..471e43bb3b8e 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -108,64 +108,6 @@ optionals noSysDirs (
 
 ## 2. Patches relevant on specific platforms ####################################
 
-### Musl+Go+gcc12
-
-# backport fixes to build gccgo with musl libc
-++ optionals (stdenv.hostPlatform.isMusl && langGo) [
-  # libgo: handle stat st_atim32 field and SYS_SECCOMP
-  # syscall: gofmt
-  # Add blank lines after //sys comments where needed, and then run gofmt
-  # 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=";
-  })
-]
-
 ## Darwin
 
 # Fixes detection of Darwin on x86_64-darwin and aarch64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64.

From 6feb747491b1680ab5137b9f87511eb6d3eb8736 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 May 2026 13:07:29 -0700
Subject: [PATCH 068/221] python3Packages.ha-garmin: init at 0.1.19

---
 .../python-modules/ha-garmin/default.nix      | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/ha-garmin/default.nix

diff --git a/pkgs/development/python-modules/ha-garmin/default.nix b/pkgs/development/python-modules/ha-garmin/default.nix
new file mode 100644
index 000000000000..a445591e5dc3
--- /dev/null
+++ b/pkgs/development/python-modules/ha-garmin/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  curl-cffi,
+  pydantic,
+  pytest-asyncio,
+  pytestCheckHook,
+  requests,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "ha-garmin";
+  version = "0.1.19";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cyberjunky";
+    repo = "ha-garmin";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vzr32vuAVafdx64Fmv257gS2a+ZbfwZNwwuF5NPQbS0=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    curl-cffi
+    pydantic
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Upstream test relies on a field not present in the test fixture
+    "test_fetch_core_data_sleep_fields"
+  ];
+
+  pythonImportsCheck = [ "ha_garmin" ];
+
+  meta = {
+    description = "Python client for Garmin Connect API, designed for Home Assistant integration";
+    homepage = "https://github.com/cyberjunky/ha-garmin";
+    changelog = "https://github.com/cyberjunky/ha-garmin/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dcd84157257b..e1cd81997033 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6897,6 +6897,8 @@ self: super: with self; {
 
   ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };
 
+  ha-garmin = callPackage ../development/python-modules/ha-garmin { };
+
   ha-iotawattpy = callPackage ../development/python-modules/ha-iotawattpy { };
 
   ha-mqtt-discoverable = callPackage ../development/python-modules/ha-mqtt-discoverable { };

From 1277cf4572b957e796376c62f3c77d5c2dffa423 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 10 May 2026 13:07:34 -0700
Subject: [PATCH 069/221] home-assistant-custom-components.garmin_connect:
 0.2.38 -> 3.0.5

---
 .../custom-components/garmin_connect/package.nix       | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
index cb06ea0f4ff4..76aede544d9f 100644
--- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
@@ -2,25 +2,23 @@
   lib,
   buildHomeAssistantComponent,
   fetchFromGitHub,
-  garminconnect,
-  tzlocal,
+  ha-garmin,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "cyberjunky";
   domain = "garmin_connect";
-  version = "0.2.38";
+  version = "3.0.5";
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "home-assistant-garmin_connect";
     tag = version;
-    hash = "sha256-Df/ecgePR10LIeaGy0kmIWqiP9G7j+KscL/YA3VsARE=";
+    hash = "sha256-omHgfkrje5xR9gLnQpAz33+LtXm5eGJ8nERYBX4F2sY=";
   };
 
   dependencies = [
-    garminconnect
-    tzlocal
+    ha-garmin
   ];
 
   meta = {

From dfa7f5b994c72763cb533f24fc85a3d1cb2141bc Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 12 Apr 2026 12:18:12 +0200
Subject: [PATCH 070/221] pnpm: refactor derivation

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/development/tools/pnpm/generic.nix | 28 ++++++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix
index 1dbdec7c5c8b..82253bf52d46 100644
--- a/pkgs/development/tools/pnpm/generic.nix
+++ b/pkgs/development/tools/pnpm/generic.nix
@@ -8,10 +8,12 @@
   installShellFiles,
   nodejs,
   testers,
+  buildPackages,
+  bashNonInteractive,
+
   withNode ? true,
   version,
   hash,
-  buildPackages,
 }:
 let
   majorVersion = lib.versions.major version;
@@ -24,19 +26,23 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     url = "https://registry.npmjs.org/pnpm/-/pnpm-${finalAttrs.version}.tgz";
     inherit hash;
   };
-  # Remove binary files from src, we don't need them, and this way we make sure
-  # our distribution is free of binaryNativeCode
-  preConfigure = ''
-    rm -r dist/reflink.*node dist/vendor
-  '';
-
-  buildInputs = lib.optionals withNode [ nodejs ];
 
   nativeBuildInputs = [
     installShellFiles
     nodejs
   ];
 
+  buildInputs = [
+    bashNonInteractive # needed for node-gyp wrapper script
+  ]
+  ++ lib.optionals withNode [ nodejs ];
+
+  # Remove binary files from src, we don't need them, and this way we make sure
+  # our distribution is free of binaryNativeCode
+  postUnpack = ''
+    rm -r package/dist/reflink.*node package/dist/vendor
+  '';
+
   installPhase = ''
     runHook preInstall
 
@@ -129,6 +135,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       '';
     };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  dontBuild = true;
+  dontConfigure = true;
+
   meta = {
     description = "Fast, disk space efficient package manager for JavaScript";
     homepage = "https://pnpm.io/";

From 8d092bb4671e68fb965b4471abb9409272ac6a36 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 30 Mar 2026 22:55:18 +0200
Subject: [PATCH 071/221] treewide: pin pnpm args to pnpm_10

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../vscode/extensions/eamodio.gitlens/default.nix   |  5 ++++-
 .../rooveterinaryinc.roo-cline/default.nix          |  5 ++++-
 pkgs/by-name/ag/agent-browser/package.nix           |  6 ++++--
 pkgs/by-name/ap/apache-airflow/python-package.nix   | 11 +++++++++--
 pkgs/by-name/ap/apache-answer/package.nix           |  7 +++++--
 pkgs/by-name/au/authelia/package.nix                |  6 ++++--
 pkgs/by-name/au/authelia/web.nix                    |  4 +++-
 pkgs/by-name/bu/bumpp/package.nix                   |  6 +++++-
 pkgs/by-name/ch/changelogen/package.nix             |  6 +++++-
 pkgs/by-name/cl/claude-code-router/package.nix      |  6 ++++--
 pkgs/by-name/co/context7-mcp/package.nix            |  5 ++++-
 .../co/conventional-changelog-cli/package.nix       |  7 +++++--
 pkgs/by-name/ct/ctx7/package.nix                    |  6 +++++-
 pkgs/by-name/el/element-desktop/package.nix         |  4 +++-
 pkgs/by-name/el/element-web-unwrapped/package.nix   |  5 ++++-
 pkgs/by-name/fr/froide/package.nix                  | 10 ++++++++--
 pkgs/by-name/gi/gitbutler/package.nix               |  7 +++++--
 pkgs/by-name/gi/gitea/package.nix                   |  5 ++++-
 pkgs/by-name/go/goaway/package.nix                  |  5 ++++-
 pkgs/by-name/he/headplane/package.nix               |  1 +
 pkgs/by-name/ki/kilocode-cli/package.nix            |  6 +++++-
 pkgs/by-name/mc/mcporter/package.nix                |  7 +++++--
 pkgs/by-name/me/memos/package.nix                   |  5 ++++-
 pkgs/by-name/mg/mgrep/package.nix                   |  6 +++++-
 pkgs/by-name/mo/moonlight/package.nix               |  6 +++++-
 pkgs/by-name/ni/ni/package.nix                      |  6 +++++-
 pkgs/by-name/nr/nrm/package.nix                     |  7 +++++--
 pkgs/by-name/pa/paperless-ngx/package.nix           |  4 +++-
 pkgs/by-name/pi/picgo/package.nix                   |  7 +++++--
 pkgs/by-name/po/postcss/package.nix                 |  7 +++++--
 pkgs/by-name/sa/satisfactorymodmanager/package.nix  |  7 +++++--
 pkgs/by-name/se/session-desktop/package.nix         |  4 +++-
 pkgs/by-name/sf/sftool-gui/package.nix              |  6 +++++-
 pkgs/by-name/sh/shiru/package.nix                   |  4 +++-
 pkgs/by-name/sh/shoko-webui/package.nix             |  6 +++++-
 pkgs/by-name/sh/shopify-cli/package.nix             |  5 ++++-
 pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix |  2 +-
 pkgs/by-name/sk/skills/package.nix                  |  6 +++++-
 pkgs/by-name/sl/slidev-cli/package.nix              |  6 +++++-
 pkgs/by-name/sp/sparkle/package.nix                 |  4 ++--
 pkgs/by-name/su/sub-store-frontend/package.nix      |  5 +++--
 pkgs/by-name/su/sub-store/package.nix               |  5 +++--
 pkgs/by-name/sv/svelte-check/package.nix            |  6 +++++-
 pkgs/by-name/sv/svelte-language-server/package.nix  |  6 +++++-
 pkgs/by-name/ta/tabularis/package.nix               |  6 +++++-
 pkgs/by-name/ty/typespec/package.nix                |  5 ++++-
 pkgs/by-name/um/umami/package.nix                   |  5 ++++-
 pkgs/by-name/ve/vencord/package.nix                 |  7 +++++--
 pkgs/by-name/vu/vue-language-server/package.nix     |  6 +++++-
 pkgs/by-name/za/zashboard/package.nix               |  5 +++--
 .../python-modules/django-filingcabinet/default.nix | 13 ++++++++++---
 .../python-modules/yt-dlp-ejs/default.nix           |  7 +++++--
 .../continuous-integration/woodpecker/webui.nix     |  5 ++++-
 .../custom-sidebar/package.nix                      |  7 +++++--
 .../custom-lovelace-modules/kiosk-mode/package.nix  |  7 +++++--
 pkgs/servers/web-apps/discourse/default.nix         |  7 ++++---
 56 files changed, 250 insertions(+), 80 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
index ad57d3e15f26..8a6ae2e09101 100644
--- a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
@@ -3,7 +3,7 @@
   pkgs,
   stdenv,
   fetchFromGitHub,
-  pnpm,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   nodejs,
@@ -12,6 +12,8 @@
 }:
 
 let
+  pnpm = pnpm_10;
+
   vsix = stdenv.mkDerivation (finalAttrs: {
     name = "gitlens-${finalAttrs.version}.vsix";
     pname = "gitlens-vsix";
@@ -26,6 +28,7 @@ let
 
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname version src;
+      inherit pnpm;
       fetcherVersion = 3;
       hash = "sha256-Yuxuqr1BiviSw+dGNHLs2jAy8ADlBvRks6Kmy7FmCMw=";
     };
diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
index 627b30007bdb..ce082884d3d2 100644
--- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  pnpm,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   nodejs,
@@ -11,6 +11,8 @@
 }:
 
 let
+  pnpm = pnpm_10;
+
   vsix = stdenvNoCC.mkDerivation (finalAttrs: {
     name = "roo-code-${finalAttrs.version}.vsix";
     pname = "roo-code-vsix";
@@ -25,6 +27,7 @@ let
 
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname version src;
+      inherit pnpm;
       fetcherVersion = 3;
       hash = "sha256-t2sPuhn8xdk6hGfmViPGG+5TAhtBBOMYNoOb6DlPzws=";
     };
diff --git a/pkgs/by-name/ag/agent-browser/package.nix b/pkgs/by-name/ag/agent-browser/package.nix
index 327271bcb537..443788e686b5 100644
--- a/pkgs/by-name/ag/agent-browser/package.nix
+++ b/pkgs/by-name/ag/agent-browser/package.nix
@@ -5,7 +5,7 @@
   fetchPnpmDeps,
   rustPlatform,
   nodejs,
-  pnpm,
+  pnpm_10,
   pnpmConfigHook,
   geist-font,
   nix-update-script,
@@ -14,6 +14,8 @@
 }:
 
 let
+  pnpm = pnpm_10;
+
   version = "0.27.0";
 
   src = fetchFromGitHub {
@@ -39,7 +41,7 @@ let
 
     pnpmDeps = fetchPnpmDeps {
       pname = "agent-browser-dashboard";
-      inherit version src;
+      inherit version src pnpm;
       pnpmWorkspaces = [ "dashboard" ];
       fetcherVersion = 3;
       hash = "sha256-ldxmXpejqVN/xuWcdLYMwNPc1VZ1rdNwRrumy8Is3N4=";
diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix
index e7b0674f5b57..730dc2d4a2f2 100644
--- a/pkgs/by-name/ap/apache-airflow/python-package.nix
+++ b/pkgs/by-name/ap/apache-airflow/python-package.nix
@@ -7,7 +7,7 @@
   # javascript
   fetchPnpmDeps,
   nodejs,
-  pnpm,
+  pnpm_10,
   pnpmConfigHook,
 
   # python
@@ -97,6 +97,8 @@ let
     hash = "sha256-qFgI65wAttERPCHn7ezSdNGB0sclEV7zYIBqaC0Gs4A=";
   };
 
+  pnpm = pnpm_10;
+
   airflowUi = stdenv.mkDerivation rec {
     pname = "airflow-ui-assets";
     inherit src version;
@@ -110,7 +112,12 @@ let
 
     pnpmDeps = fetchPnpmDeps {
       pname = "airflow-ui";
-      inherit sourceRoot src version;
+      inherit
+        sourceRoot
+        src
+        version
+        pnpm
+        ;
       fetcherVersion = 3;
       hash = "sha256-zPIql9rP4EkE0Y3ihP4MkWTTYCIDr8d1LpE6vePiNdU=";
     };
diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix
index ae23d134d633..b83f69f92c2f 100644
--- a/pkgs/by-name/ap/apache-answer/package.nix
+++ b/pkgs/by-name/ap/apache-answer/package.nix
@@ -4,11 +4,13 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   nodejs,
   stdenv,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 buildGoModule (finalAttrs: {
   pname = "apache-answer";
   version = "1.7.1";
@@ -28,6 +30,7 @@ buildGoModule (finalAttrs: {
 
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) src version pname;
+      inherit pnpm;
       sourceRoot = "${finalAttrs.src.name}/ui";
       fetcherVersion = 3;
       hash = "sha256-0Jqe0wig28Vb9y0/tZHDfE49MehNR7kJTpChz616tzU=";
diff --git a/pkgs/by-name/au/authelia/package.nix b/pkgs/by-name/au/authelia/package.nix
index 1db561604cfa..280b70dffc73 100644
--- a/pkgs/by-name/au/authelia/package.nix
+++ b/pkgs/by-name/au/authelia/package.nix
@@ -4,7 +4,7 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   fetchFromGitHub,
   buildGo125Module,
   installShellFiles,
@@ -15,13 +15,15 @@
       nodejs
       fetchPnpmDeps
       pnpmConfigHook
-      pnpm
+      pnpm_10
       fetchFromGitHub
       ;
   },
 }:
 
 let
+  pnpm = pnpm_10;
+
   buildGoModule = buildGo125Module;
 
   inherit (import ./sources.nix { inherit fetchFromGitHub; })
diff --git a/pkgs/by-name/au/authelia/web.nix b/pkgs/by-name/au/authelia/web.nix
index dd4f8851f0c8..3f5336adfca7 100644
--- a/pkgs/by-name/au/authelia/web.nix
+++ b/pkgs/by-name/au/authelia/web.nix
@@ -3,11 +3,13 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   fetchFromGitHub,
 }:
 
 let
+  pnpm = pnpm_10;
+
   inherit (import ./sources.nix { inherit fetchFromGitHub; })
     pname
     version
diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix
index 8d0d34035e6b..d80ee5affbab 100644
--- a/pkgs/by-name/bu/bumpp/package.nix
+++ b/pkgs/by-name/bu/bumpp/package.nix
@@ -5,11 +5,14 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   npmHooks,
   versionCheckHook,
   nix-update-script,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "bumpp";
   version = "11.0.1";
@@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-nIj4S5BWTaw3RVNIxbla8Q31wvK67Of6psx5wX9ID+E=";
   };
diff --git a/pkgs/by-name/ch/changelogen/package.nix b/pkgs/by-name/ch/changelogen/package.nix
index e4452f35f38f..4b55fa64c3ed 100644
--- a/pkgs/by-name/ch/changelogen/package.nix
+++ b/pkgs/by-name/ch/changelogen/package.nix
@@ -5,10 +5,13 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   npmHooks,
   nix-update-script,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "changelogen";
   version = "0.6.2";
@@ -22,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-S+GxeljcPj/MzBkleVNgaRa8D4kmHrKwwVqakmB5sAw=";
   };
diff --git a/pkgs/by-name/cl/claude-code-router/package.nix b/pkgs/by-name/cl/claude-code-router/package.nix
index 1fd4c1903c31..fd21043b3c6f 100644
--- a/pkgs/by-name/cl/claude-code-router/package.nix
+++ b/pkgs/by-name/cl/claude-code-router/package.nix
@@ -4,12 +4,14 @@
   lib,
   makeBinaryWrapper,
   nodejs,
-  pnpm,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   versionCheckHook,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 buildNpmPackage (finalAttrs: {
   pname = "claude-code-router";
   version = "2.0.0";
diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix
index 20492fbabd6c..7544d9edaa64 100644
--- a/pkgs/by-name/co/context7-mcp/package.nix
+++ b/pkgs/by-name/co/context7-mcp/package.nix
@@ -7,12 +7,14 @@
   versionCheckHook,
 
   nodejs,
-  pnpm,
+  pnpm_10,
   pnpmConfigHook,
   fetchPnpmDeps,
 }:
 let
   tag-prefix = "@upstash/context7-mcp";
+
+  pnpm = pnpm_10;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "context7-mcp";
@@ -34,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-f3PXpCdmKh2LPD5VyFsRdLR7CEvh+GozkQFSeeNuj2c=";
   };
diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix
index f48c185548db..6c2ee732f9fe 100644
--- a/pkgs/by-name/co/conventional-changelog-cli/package.nix
+++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix
@@ -5,12 +5,14 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   makeBinaryWrapper,
   versionCheckHook,
   nix-update-script,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "conventional-changelog-cli";
   version = "7.2.0";
@@ -24,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-O91ypnycBwkfLSruezx9E5CrytguBdtmvgVhKFjUzvM=";
   };
diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix
index 9df02ddda524..132a6b753e4a 100644
--- a/pkgs/by-name/ct/ctx7/package.nix
+++ b/pkgs/by-name/ct/ctx7/package.nix
@@ -7,10 +7,13 @@
   versionCheckHook,
 
   nodejs,
-  pnpm,
+  pnpm_10,
   pnpmConfigHook,
   fetchPnpmDeps,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ctx7";
   version = "0.3.9";
@@ -31,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-8RRHfCTZVC91T1Qx+ACCo2oG4ZwMNy5WYakCjmBhe3Q=";
   };
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index c4cba7c6d64b..fe6791b038ba 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -15,7 +15,7 @@
   commandLineArgs ? "",
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   asar,
   copyDesktopItems,
   darwin,
@@ -23,6 +23,7 @@
 }:
 
 let
+  pnpm = pnpm_10;
   electron = electron_41;
   seshat = callPackage ./seshat { };
 in
@@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
       version
       src
       ;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk=";
   };
diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix
index bd13a9fc861b..a0d22d6c73c9 100644
--- a/pkgs/by-name/el/element-web-unwrapped/package.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/package.nix
@@ -6,12 +6,14 @@
   nodejs,
   jitsi-meet,
   fetchPnpmDeps,
-  pnpm,
+  pnpm_10,
   pnpmConfigHook,
   faketty,
 }:
 
 let
+  pnpm = pnpm_10;
+
   noPhoningHome = {
     disable_guests = true; # disable automatic guest account registration at matrix.org
   };
@@ -36,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     pname = "element";
     inherit (finalAttrs) version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk=";
   };
diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix
index cc7bde39533a..29ac289460c0 100644
--- a/pkgs/by-name/fr/froide/package.nix
+++ b/pkgs/by-name/fr/froide/package.nix
@@ -8,13 +8,14 @@
   geos,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   nodejs,
   postgresql,
   postgresqlTestHook,
   playwright-driver,
 }:
 let
+  pnpm = pnpm_10;
 
   python = python3Packages.python.override {
     packageOverrides = self: super: {
@@ -120,7 +121,12 @@ python.pkgs.buildPythonApplication rec {
   ];
 
   pnpmDeps = fetchPnpmDeps {
-    inherit pname version src;
+    inherit
+      pname
+      version
+      src
+      pnpm
+      ;
     fetcherVersion = 3;
     hash = "sha256-NbfCVD+gmtoxuYUCumTKj9P72utK787VdlnuU4lMMGc=";
   };
diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index 8acddb6fb185..07c6d25cb601 100644
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@@ -19,7 +19,7 @@
   pkg-config,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   rust,
   rustPlatform,
   turbo,
@@ -27,7 +27,9 @@
   wrapGAppsHook4,
   dart-sass,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitbutler";
   version = "0.19.7";
@@ -58,6 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-eRiFA5lXpPHQwlyFmKMx1zmHH2zLCHB+3s708g6srg4=";
   };
diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index dde80c010b73..bd18a6031ecf 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -13,19 +13,22 @@
   openssh,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   stdenv,
   sqliteSupport ? true,
   nixosTests,
 }:
 
 let
+  pnpm = pnpm_10;
+
   frontend = stdenv.mkDerivation (finalAttrs: {
     pname = "gitea-frontend";
     inherit (gitea) src version;
 
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname version src;
+      inherit pnpm;
       fetcherVersion = 3;
       hash = "sha256-dewYYPO2wmNyYiQadoEKWJ10cghm6Lv7UE1iVlyNiEY=";
     };
diff --git a/pkgs/by-name/go/goaway/package.nix b/pkgs/by-name/go/goaway/package.nix
index 3f9131cfaf61..a0e9cb7965eb 100644
--- a/pkgs/by-name/go/goaway/package.nix
+++ b/pkgs/by-name/go/goaway/package.nix
@@ -6,12 +6,14 @@
   makeWrapper,
   net-tools,
   nodejs,
-  pnpm,
+  pnpm_10,
   pnpmConfigHook,
   stdenvNoCC,
 }:
 
 let
+  pnpm = pnpm_10;
+
   version = "0.63.15";
 
   src = fetchFromGitHub {
@@ -27,6 +29,7 @@ let
 
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname version src;
+      inherit pnpm;
       sourceRoot = "${finalAttrs.src.name}/client";
       fetcherVersion = 3;
       hash = "sha256-GM86Os1OQaagD61BEIIsqhWJNVPFA9Z5RiYWyHlQlwY=";
diff --git a/pkgs/by-name/he/headplane/package.nix b/pkgs/by-name/he/headplane/package.nix
index a596e5918356..2d71367644ea 100644
--- a/pkgs/by-name/he/headplane/package.nix
+++ b/pkgs/by-name/he/headplane/package.nix
@@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    pnpm = pnpm_10;
     hash = pnpmDepsHash;
     fetcherVersion = 3;
   };
diff --git a/pkgs/by-name/ki/kilocode-cli/package.nix b/pkgs/by-name/ki/kilocode-cli/package.nix
index e86cbcf5bb0b..e12c8b0c31b9 100644
--- a/pkgs/by-name/ki/kilocode-cli/package.nix
+++ b/pkgs/by-name/ki/kilocode-cli/package.nix
@@ -8,7 +8,7 @@
   nodejs,
   writableTmpDirAsHomeHook,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   unzip,
   patchelf,
   autoPatchelfHook,
@@ -16,6 +16,9 @@
   versionCheckHook,
   nix-update-script,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "kilocode-cli";
   version = "0.25.1";
@@ -29,6 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-Q/LamZwVaIQVILtXRi1RQrYtpxYJWEKPAt3knwm47S0=";
   };
diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix
index 5eb9e42d0dd8..cffa8b07821f 100644
--- a/pkgs/by-name/mc/mcporter/package.nix
+++ b/pkgs/by-name/mc/mcporter/package.nix
@@ -5,12 +5,14 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   npmHooks,
   versionCheckHook,
   nix-update-script,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mcporter";
   version = "0.10.2";
@@ -24,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-TZfEoUSjba8cRz6L9uY2PGskYsR7S/xAahiKLd8dhFM=";
   };
diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix
index 805ca74c1352..bd2ee2ad634d 100644
--- a/pkgs/by-name/me/memos/package.nix
+++ b/pkgs/by-name/me/memos/package.nix
@@ -7,9 +7,11 @@
   lib,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
 }:
 let
+  pnpm = pnpm_10;
+
   version = "0.25.3";
   src = fetchFromGitHub {
     owner = "usememos";
@@ -23,6 +25,7 @@ let
     inherit version src;
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname version src;
+      inherit pnpm;
       sourceRoot = "${finalAttrs.src.name}/web";
       fetcherVersion = 3;
       hash = "sha256-xEOnxCgBD4uLypcZzCO+31S4r0sSfz8PpgEmZASeRZ4=";
diff --git a/pkgs/by-name/mg/mgrep/package.nix b/pkgs/by-name/mg/mgrep/package.nix
index 6d6673521f7f..0ac21b3c56d3 100644
--- a/pkgs/by-name/mg/mgrep/package.nix
+++ b/pkgs/by-name/mg/mgrep/package.nix
@@ -1,15 +1,18 @@
 {
   lib,
+  pnpm_10,
   stdenv,
   fetchFromGitHub,
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
   npmHooks,
   nix-update-script,
 }:
 
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mgrep";
   version = "0.1.10";
@@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-T1mbRDBLU4SjZSgqyKgusZe5UV9hI+/bAmBYoAWcWtQ=";
   };
diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index d5fc3de191b8..b4f00cfed13a 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  pnpm,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   nodejs,
@@ -12,6 +12,9 @@
   discord-canary,
   discord-development,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
   version = "2026.5.0";
@@ -31,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-veZx/b+cvpcRh1xXO8Y34dJtY2cgncqVSYYywb85Geo=";
   };
diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix
index 619549072a3c..e885f5a3703b 100644
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -5,11 +5,14 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   npmHooks,
   versionCheckHook,
   nix-update-script,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ni";
   version = "30.1.0";
@@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-I/jf6nlsKQFrYLO15f+CWdPPdEpVDDMBQodLsbG4sqw=";
   };
diff --git a/pkgs/by-name/nr/nrm/package.nix b/pkgs/by-name/nr/nrm/package.nix
index 7e814d867a14..f01121f472de 100644
--- a/pkgs/by-name/nr/nrm/package.nix
+++ b/pkgs/by-name/nr/nrm/package.nix
@@ -5,11 +5,13 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   makeBinaryWrapper,
   nix-update-script,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nrm";
   version = "2.1.0";
@@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-DvhUXkh9Ijuik9uWzPOtM1idSNSaJxDiRHWpUMepf3U=";
   };
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 1991beab067c..084331ade53a 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -18,7 +18,7 @@
   tesseract5,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   poppler-utils,
   liberation_ttf,
   xcbuild,
@@ -29,6 +29,8 @@
   lndir,
 }:
 let
+  pnpm = pnpm_10;
+
   version = "2.20.15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/pi/picgo/package.nix b/pkgs/by-name/pi/picgo/package.nix
index 773264d13e62..6692f1434b70 100644
--- a/pkgs/by-name/pi/picgo/package.nix
+++ b/pkgs/by-name/pi/picgo/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   nodejs_22,
-  pnpm,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   electron_40,
@@ -13,7 +13,9 @@
   writableTmpDirAsHomeHook,
   nix-update-script,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "picgo";
   version = "2.5.3";
@@ -27,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) version src;
+    inherit pnpm;
     pname = "picgo";
     hash = "sha256-tILvWDoHAN5XT1F/cJYgfeMzowuO/fhiughI+0FvHzc=";
     fetcherVersion = 3; # lockfileVersion 9.0 corresponds to fetcherVersion 3
diff --git a/pkgs/by-name/po/postcss/package.nix b/pkgs/by-name/po/postcss/package.nix
index 3fc2a6198896..7ba6581adad9 100644
--- a/pkgs/by-name/po/postcss/package.nix
+++ b/pkgs/by-name/po/postcss/package.nix
@@ -4,11 +4,13 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   nodejs,
-  pnpm,
+  pnpm_10,
   pnpmConfigHook,
   nix-update-script,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "postcss";
   version = "8.5.10";
@@ -28,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-7SwgvsbSbRj1SZAEhjWp3B4D3VtAvg7UN35/5x3f5Wk=";
   };
diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix
index b190ffa04be3..8453d212767d 100644
--- a/pkgs/by-name/sa/satisfactorymodmanager/package.nix
+++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildGoModule,
   fetchFromGitHub,
-  pnpm,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   wails,
@@ -12,7 +12,9 @@
   makeDesktopItem,
   copyDesktopItems,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 buildGoModule rec {
   pname = "satisfactorymodmanager";
   version = "3.0.5";
@@ -58,6 +60,7 @@ buildGoModule rec {
         pname
         version
         src
+        pnpm
         ;
       sourceRoot = "${src.name}/frontend";
       fetcherVersion = 3;
diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix
index 2d7d87a48ba1..c25c9ed69c06 100644
--- a/pkgs/by-name/se/session-desktop/package.nix
+++ b/pkgs/by-name/se/session-desktop/package.nix
@@ -8,7 +8,7 @@
   makeWrapper,
   fetchpatch,
   replaceVars,
-  pnpm,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   rustPlatform,
@@ -27,6 +27,8 @@
 }:
 
 let
+  pnpm = pnpm_10;
+
   fake-git = writeShellScriptBin "git" (lib.readFile ./fake-git.sh);
 
   libsession-util-nodejs = stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/sf/sftool-gui/package.nix b/pkgs/by-name/sf/sftool-gui/package.nix
index f3093c92e031..1f5e876ad3ba 100644
--- a/pkgs/by-name/sf/sftool-gui/package.nix
+++ b/pkgs/by-name/sf/sftool-gui/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  pnpm_10,
   stdenv,
   rustPlatform,
   cargo-tauri,
@@ -9,7 +10,6 @@
   systemdLibs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
   openssl,
   nix-update-script,
   pkg-config,
@@ -18,6 +18,9 @@
   autoPatchelfHook,
   fetchFromGitHub,
 }:
+let
+  pnpm = pnpm_10;
+in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sftool-gui";
   version = "1.1.4-unstable-2026-04-16";
@@ -41,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     fetcherVersion = 3;
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     hash = "sha256-DwDXfbwgt/OSNOQbzCBlathX9QDnbEsXZLsgB67LOEk=";
   };
 
diff --git a/pkgs/by-name/sh/shiru/package.nix b/pkgs/by-name/sh/shiru/package.nix
index 71f050bff3e9..6a1edc181684 100644
--- a/pkgs/by-name/sh/shiru/package.nix
+++ b/pkgs/by-name/sh/shiru/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  pnpm,
+  pnpm_10,
   nodejs,
   fetchFromGitHub,
   python3,
@@ -14,6 +14,7 @@
   nix-update-script,
 }:
 let
+  pnpm = pnpm_10;
   electron = electron_39;
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     prePnpmInstall = ''
       cd electron
     '';
diff --git a/pkgs/by-name/sh/shoko-webui/package.nix b/pkgs/by-name/sh/shoko-webui/package.nix
index b537f3d6e6d3..5e25f5c5bf22 100644
--- a/pkgs/by-name/sh/shoko-webui/package.nix
+++ b/pkgs/by-name/sh/shoko-webui/package.nix
@@ -3,12 +3,15 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   nodejs,
-  pnpm,
+  pnpm_10,
   pnpmConfigHook,
   lib,
   shoko,
   nix-update-script,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "shoko-webui";
   version = "2.4.1";
@@ -27,6 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-rTlem83dFptgvKUKUaHK8vi5B0FBehPFtkCUhOnUKd0=";
   };
diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix
index 52bed4866986..3bbfbfad441c 100644
--- a/pkgs/by-name/sh/shopify-cli/package.nix
+++ b/pkgs/by-name/sh/shopify-cli/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   faketty,
   nodejs_22,
   versionCheckHook,
@@ -12,6 +12,8 @@
   nix-update-script,
 }:
 let
+  pnpm = pnpm_10;
+
   nodejs = nodejs_22;
   pnpm' = pnpm.override { inherit nodejs; };
 in
@@ -28,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-gwEVlvr8hxgyCsGjxjz1UkbDZYYq1iukKTPJ7JHdo2U=";
   };
diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
index 19de85ad5277..a55faadb62c7 100644
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@@ -1,8 +1,8 @@
 {
   stdenv,
+  pnpm,
   lib,
   fetchFromGitHub,
-  pnpm,
   fetchPnpmDeps,
   pnpmConfigHook,
   nodejs,
diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix
index 7fbaff73ff6e..9a8cabd2aa40 100644
--- a/pkgs/by-name/sk/skills/package.nix
+++ b/pkgs/by-name/sk/skills/package.nix
@@ -3,12 +3,15 @@
   stdenv,
   fetchFromGitHub,
   fetchPnpmDeps,
-  pnpm,
+  pnpm_10,
   nodejs,
   pnpmConfigHook,
   nix-update-script,
   testers,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "skills";
   version = "1.5.1";
@@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     fetcherVersion = 3;
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     hash = "sha256-0CS6BTjTj/TAnMNahTk4Vt/0/2eMxmCGUV9PwI8l4Ao=";
   };
 
diff --git a/pkgs/by-name/sl/slidev-cli/package.nix b/pkgs/by-name/sl/slidev-cli/package.nix
index 1cf9d00585b2..a73a7378e8a5 100644
--- a/pkgs/by-name/sl/slidev-cli/package.nix
+++ b/pkgs/by-name/sl/slidev-cli/package.nix
@@ -3,11 +3,14 @@
   stdenv,
   fetchFromGitHub,
   fetchPnpmDeps,
-  pnpm,
+  pnpm_10,
   nodejs,
   pnpmConfigHook,
   nix-update-script,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "slidev-cli";
   version = "52.15.1";
@@ -28,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       pnpmWorkspaces
       ;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-DGDzNvau1XjPjkGZqcFZGkjYd3cneXO/gCdnwjjkQDY=";
   };
diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix
index 17bb24a7275d..bd10387d4e03 100644
--- a/pkgs/by-name/sp/sparkle/package.nix
+++ b/pkgs/by-name/sp/sparkle/package.nix
@@ -22,6 +22,8 @@
 }:
 
 let
+  pnpm = pnpm_10_29_2;
+
   sparkle-service = buildGoModule {
     pname = "sparkle-service";
     version = "0-unstable-2025-10-24";
@@ -37,8 +39,6 @@ let
 
     meta.mainProgram = "sparkle-service";
   };
-
-  pnpm = pnpm_10_29_2;
 in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix
index 3de1b23a1b9e..0bb281c721b5 100644
--- a/pkgs/by-name/su/sub-store-frontend/package.nix
+++ b/pkgs/by-name/su/sub-store-frontend/package.nix
@@ -4,13 +4,14 @@
   fetchFromGitHub,
 
   pnpm_10,
-  pnpm ? pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   nix-update-script,
   nodejs,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 buildNpmPackage (finalAttrs: {
   pname = "sub-store-frontend";
   version = "2.16.79";
diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix
index 8b7b2580f12a..b1f1587bcd10 100644
--- a/pkgs/by-name/su/sub-store/package.nix
+++ b/pkgs/by-name/su/sub-store/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
 
   pnpm_10,
-  pnpm ? pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   makeBinaryWrapper,
@@ -12,7 +11,9 @@
 
   nodejs,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 buildNpmPackage (finalAttrs: {
   pname = "sub-store";
   version = "2.22.15";
diff --git a/pkgs/by-name/sv/svelte-check/package.nix b/pkgs/by-name/sv/svelte-check/package.nix
index 98a09588b8f1..c2db29dcf953 100644
--- a/pkgs/by-name/sv/svelte-check/package.nix
+++ b/pkgs/by-name/sv/svelte-check/package.nix
@@ -4,11 +4,14 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   nodejs,
   makeBinaryWrapper,
   nix-update-script,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "svelte-check";
   version = "4.3.1";
@@ -29,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       pnpmWorkspaces
       ;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-43AIkVzpcq/Y+QO2k7pkr6CN340idXJEpie0gVdxra8=";
   };
diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix
index 533851c95ed9..4b35a31e042d 100644
--- a/pkgs/by-name/sv/svelte-language-server/package.nix
+++ b/pkgs/by-name/sv/svelte-language-server/package.nix
@@ -4,11 +4,14 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   nodejs,
   makeBinaryWrapper,
   nix-update-script,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "svelte-language-server";
   version = "0.17.31";
@@ -29,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       pnpmWorkspaces
       ;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-x0yIANla1KURJ4fgxAe9WUJl/sPAsUcARubTJQ5uEpQ=";
   };
diff --git a/pkgs/by-name/ta/tabularis/package.nix b/pkgs/by-name/ta/tabularis/package.nix
index 3668c683d48c..513d5fad50f6 100644
--- a/pkgs/by-name/ta/tabularis/package.nix
+++ b/pkgs/by-name/ta/tabularis/package.nix
@@ -6,7 +6,7 @@
   fetchPnpmDeps,
   cargo-tauri,
   nodejs,
-  pnpm,
+  pnpm_10,
   pnpmConfigHook,
   wrapGAppsHook4,
   webkitgtk_4_1,
@@ -14,6 +14,9 @@
   openssl,
   nix-update-script,
 }:
+let
+  pnpm = pnpm_10;
+in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tabularis";
   version = "0.9.12";
@@ -38,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-S/XCypKyYlJtuISNiG8NtJzisAejiUwqPVltXEmVlZw=";
   };
diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix
index 8ebb5226dd57..45ba2f5853f3 100644
--- a/pkgs/by-name/ty/typespec/package.nix
+++ b/pkgs/by-name/ty/typespec/package.nix
@@ -7,12 +7,14 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   versionCheckHook,
 }:
 
 let
   workspace = "@typespec/compiler...";
+
+  pnpm = pnpm_10;
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "typespec";
@@ -41,6 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       postPatch
       ;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-wZvnRSALrupyhpSN8zNL3b6SZnVPXX3BdHrbzHUNtUg=";
   };
diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix
index 058505f9846e..d5a95c25f349 100644
--- a/pkgs/by-name/um/umami/package.nix
+++ b/pkgs/by-name/um/umami/package.nix
@@ -9,7 +9,7 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   prisma_7,
   prisma-engines_7,
   openssl,
@@ -20,6 +20,8 @@
   basePath ? "",
 }:
 let
+  pnpm = pnpm_10;
+
   sources = lib.importJSON ./sources.json;
 
   geocities = stdenvNoCC.mkDerivation {
@@ -107,6 +109,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       version
       src
       ;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-QNWmCsVFh8xpsO4ZPTaKGszwuRaxTrWLMVh/6VV5oIw=";
   };
diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index c0618fd6c98a..866e5c01d1b3 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -17,6 +17,9 @@
   discord-development,
   buildWebExtension ? false,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
   version = "1.14.13";
@@ -42,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       postPatch
       ;
-    pnpm = pnpm_10;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-hk1rnNog5xvuIVI0M1ZJ5xrEuk0zcBiYsbROUycdi+A=";
   };
@@ -51,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     git
     nodejs
     pnpmConfigHook
-    pnpm_10
+    pnpm
   ];
 
   env = {
diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index 06c129532f6c..0a09412135f4 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -4,11 +4,14 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   nodejs,
   nix-update-script,
   makeBinaryWrapper,
 }:
+let
+  pnpm = pnpm_10;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vue-language-server";
   version = "3.2.6";
@@ -22,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-koRJkT/JloptmtQKLprqms53TL/Q4XHaktIl/6PIasw=";
   };
diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index e51531e8ab94..a312f87604df 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -3,12 +3,13 @@
   buildNpmPackage,
   fetchFromGitHub,
   pnpm_10,
-  pnpm ? pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   nix-update-script,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 buildNpmPackage (finalAttrs: {
   pname = "zashboard";
   version = "3.5.1";
diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix
index 9dd305b3ad37..c98095bd08a1 100644
--- a/pkgs/development/python-modules/django-filingcabinet/default.nix
+++ b/pkgs/development/python-modules/django-filingcabinet/default.nix
@@ -31,12 +31,14 @@
   playwright-driver,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   nodejs,
   markdown,
   nh3,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 buildPythonPackage rec {
   pname = "django-filingcabinet";
   version = "0.17-unstable-2025-08-14";
@@ -96,7 +98,12 @@ buildPythonPackage rec {
   };
 
   pnpmDeps = fetchPnpmDeps {
-    inherit pname version src;
+    inherit
+      pname
+      version
+      src
+      pnpm
+      ;
     fetcherVersion = 3;
     hash = "sha256-p+RpEDVbdYmeSD4bB0oUMrTpsVDGYkqME13awnoTNd0=";
   };
diff --git a/pkgs/development/python-modules/yt-dlp-ejs/default.nix b/pkgs/development/python-modules/yt-dlp-ejs/default.nix
index 4157f6d99236..d53cade836be 100644
--- a/pkgs/development/python-modules/yt-dlp-ejs/default.nix
+++ b/pkgs/development/python-modules/yt-dlp-ejs/default.nix
@@ -7,9 +7,11 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 buildPythonPackage rec {
   pname = "yt-dlp-ejs";
   version = "0.8.0";
@@ -27,6 +29,7 @@ buildPythonPackage rec {
       pname
       version
       src
+      pnpm
       ;
     fetcherVersion = 3;
     hash = "sha256-4qMOAl9Dbe1oYSRIeP7oPcV/+P8NLdIYvSNxaz0h+Z0=";
diff --git a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix
index 31197106a149..a4b8f9312f3e 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix
@@ -5,10 +5,12 @@
   nodejs,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
 }:
 let
   common = callPackage ./common.nix { };
+
+  pnpm = pnpm_10;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "woodpecker-webui";
@@ -18,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     sourceRoot = "${common.src.name}/web";
     fetcherVersion = 3;
     hash = common.nodeModulesHash;
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
index 1d3bf1706612..935a7bdba7d4 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
@@ -4,10 +4,12 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   nodejs,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "custom-sidebar";
   version = "14.0.0";
@@ -21,6 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-gYNCjCeAt6LP4tZE4ufiQu7OG2ujWydm4etcGQxMxcU=";
   };
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix
index 7b29dd502564..f85502db309a 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix
@@ -4,10 +4,12 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm,
+  pnpm_10,
   nodejs,
 }:
-
+let
+  pnpm = pnpm_10;
+in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "kiosk-mode";
   version = "13.1.0";
@@ -21,6 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "sha256-k7kXZ4yFe3As1IGijrmJfgqrMoO2Yi+PrNapuq8Ow3Y=";
   };
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 5c572d71511d..96aba467b7be 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -39,7 +39,7 @@
   buildRubyGem,
   rustc,
   cargo,
-  pnpm,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   svgo,
@@ -62,6 +62,8 @@ let
     sha256 = "sha256-0jbO1rJQ0AISo7h+SZfovubReCjR2zT6KWX9LxBeFtE=";
   };
 
+  pnpm = pnpm_10;
+
   ruby = ruby_3_3;
 
   runtimeDeps = [
@@ -303,8 +305,7 @@ let
 
     pnpmDeps = fetchPnpmDeps {
       pname = "discourse-assets";
-      inherit version src;
-      pnpm = pnpm;
+      inherit version src pnpm;
       fetcherVersion = 3;
       hash = "sha256-xft/2x0iti0yJ53uI9q2+FSvKgWWfKQzlMlPFz3RZsE=";
     };

From 921251820708a876752a4aa1f1f3e7b808e61ac2 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 31 Mar 2026 16:38:02 +0200
Subject: [PATCH 072/221] pnpm-fixup-state-db: init at 1.0.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../node/fetch-pnpm-deps/default.nix          |  14 ++
 .../pn/pnpm-fixup-state-db/package.nix        |  34 +++
 .../pn/pnpm-fixup-state-db/src/.gitignore     |   2 +
 .../pn/pnpm-fixup-state-db/src/index.ts       |  61 ++++++
 .../pnpm-fixup-state-db/src/package-lock.json | 200 ++++++++++++++++++
 .../pn/pnpm-fixup-state-db/src/package.json   |  19 ++
 .../pn/pnpm-fixup-state-db/src/tsconfig.json  |  10 +
 pkgs/development/tools/pnpm/generic.nix       |   2 +-
 pkgs/test/pnpm/default.nix                    |   1 +
 .../test/pnpm/pnpm-fixup-state-db/default.nix |  23 ++
 pkgs/test/pnpm/pnpm-fixup-state-db/index.db   | Bin 0 -> 65536 bytes
 11 files changed, 365 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/package.nix
 create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore
 create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts
 create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json
 create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json
 create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json
 create mode 100644 pkgs/test/pnpm/pnpm-fixup-state-db/default.nix
 create mode 100644 pkgs/test/pnpm/pnpm-fixup-state-db/index.db

diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
index 6b33c263b895..80b637b57ddf 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
@@ -7,6 +7,7 @@
   cacert,
   makeSetupHook,
   pnpm,
+  pnpm-fixup-state-db,
   writableTmpDirAsHomeHook,
   yq,
   zstd,
@@ -47,6 +48,14 @@ in
           };
 
       filterFlags = lib.map (package: "--filter=${package}") pnpmWorkspaces;
+
+      pnpm-fixup-state-db' =
+        if pnpm.nodejs or null != null then
+          pnpm-fixup-state-db.override {
+            inherit (pnpm) nodejs;
+          }
+        else
+          pnpm-fixup-state-db;
     in
     # pnpmWorkspace was deprecated, so throw if it's used.
     assert (lib.throwIf (args ? pnpmWorkspace)
@@ -77,6 +86,7 @@ in
               jq
               moreutils
               pnpm # from args
+              pnpm-fixup-state-db'
               yq
               zstd
             ]
@@ -146,6 +156,10 @@ in
                 jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f
               done
 
+              if [ -f "$storePath/v11/index.db" ]; then
+                pnpm-fixup-state-db "$storePath/v11";
+              fi
+
               # This folder contains symlinks to /build/source which we don't need
               # since https://github.com/pnpm/pnpm/releases/tag/v10.27.0
               rm -rf $storePath/{v3,v10}/projects
diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix b/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix
new file mode 100644
index 000000000000..66c5da928e16
--- /dev/null
+++ b/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix
@@ -0,0 +1,34 @@
+{
+  buildNpmPackage,
+  lib,
+  nodejs,
+  pnpm,
+  tests,
+}:
+buildNpmPackage {
+  pname = "pnpm-fixup-state-db";
+  version = "1.0.0";
+
+  src = ./src;
+
+  inherit nodejs;
+
+  npmDepsHash = "sha256-um6a4pEtPtdxHBRq9g5ZW20wIQAMjWJ3qF96XuxJg8o=";
+
+  postInstall = ''
+    makeWrapper ${lib.getExe nodejs} $out/bin/pnpm-fixup-state-db \
+      --add-flags "$out/lib/node_modules/pnpm-fixup-state-db"
+  '';
+
+  passthru.tests = {
+    inherit (tests) pnpm;
+  };
+
+  __structuredAttrs = true;
+
+  meta = {
+    license = lib.licenses.mit;
+    mainProgram = "pnpm-fixup-state-db";
+    inherit (pnpm.meta) maintainers;
+  };
+}
diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore b/pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore
new file mode 100644
index 000000000000..23a608b6addd
--- /dev/null
+++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+*.js
diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts b/pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts
new file mode 100644
index 000000000000..648af50f3545
--- /dev/null
+++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts
@@ -0,0 +1,61 @@
+#!/usr/bin/env node
+import { packForStorage, StoreIndex } from '@pnpm/store.index';
+
+interface FileMetadata {
+    checkedAt: number;
+}
+
+interface Metadata {
+    files: Map<string, FileMetadata>;
+}
+
+function validateMetadata(data: unknown): data is Metadata {
+    return (data as Metadata).files instanceof Map;
+}
+
+// from https://github.com/pnpm/pnpm/blob/52ee08aad4fcc0dfb92bc35cc5aaf3d07f8f3246/worker/src/start.ts#L235
+function packToShared (data: unknown): Uint8Array {
+  const packed = packForStorage(data)
+  const shared = new SharedArrayBuffer(packed.byteLength)
+  const view = new Uint8Array(shared)
+  view.set(packed)
+  return view
+}
+
+const main = () => {
+  const storePath = process.argv[2];
+  const index = new StoreIndex(storePath);
+
+  const newEntries = [] as Parameters<StoreIndex["setRawMany"]>[0]
+
+  for (const [key, data] of index.entries()) {
+    console.debug(`Mapping ${key}...`);
+    if (!validateMetadata(data)) {
+        console.debug(`Data of ${key}:`, data);
+        throw new Error(`Failed to read data for ${key}`);
+    }
+    const newFiles = new Map<string, FileMetadata>();
+    for (const [path, metadata] of data.files.entries()) {
+        newFiles.set(path, {
+            ...metadata,
+            checkedAt: 0,
+        });
+    }
+    newEntries.push({
+        key,
+        buffer: packToShared({
+            ...data,
+            files: newFiles,
+        } as Metadata)
+    });
+  }
+
+  // As pnpm is highly parallelized, the order of the data in the database is random. Therefore, we need to sort our changed data and replace all data in the database
+  const sortedEntries = newEntries.sort((a, b) => a.key > b.key ? 1 : -1);
+
+  // Delete all entries and add them in a deterministic order
+  index.deleteMany(sortedEntries.map(m => m.key));
+  index.setRawMany(sortedEntries);
+};
+
+main();
diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json
new file mode 100644
index 000000000000..0e0a14c8b47c
--- /dev/null
+++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json
@@ -0,0 +1,200 @@
+{
+  "name": "pnpm-fixup-state-db",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "pnpm-fixup-state-db",
+      "version": "0.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@pnpm/store.index": "^1100.0.0"
+      },
+      "devDependencies": {
+        "@types/node": "^25.6.0",
+        "typescript": "^6.0.3"
+      }
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
+      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
+      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
+      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
+      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
+      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@pnpm/store.index": {
+      "version": "1100.0.0",
+      "resolved": "https://registry.npmjs.org/@pnpm/store.index/-/store.index-1100.0.0.tgz",
+      "integrity": "sha512-eVd5DHiD6hyr2hrkIlh3z07SOiVqoGvFnPAb+rL6piXd9889trSyUjDXBlkJj7gyipAQoo8xMHHixoPp/sHnFA==",
+      "license": "MIT",
+      "dependencies": {
+        "msgpackr": "1.11.8"
+      },
+      "engines": {
+        "node": ">=22.13"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pnpm"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "25.6.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz",
+      "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.19.0"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/msgpackr": {
+      "version": "1.11.8",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.8.tgz",
+      "integrity": "sha512-bC4UGzHhVvgDNS7kn9tV8fAucIYUBuGojcaLiz7v+P63Lmtm0Xeji8B/8tYKddALXxJLpwIeBmUN3u64C4YkRA==",
+      "license": "MIT",
+      "optionalDependencies": {
+        "msgpackr-extract": "^3.0.2"
+      }
+    },
+    "node_modules/msgpackr-extract": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
+      "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "node-gyp-build-optional-packages": "5.2.2"
+      },
+      "bin": {
+        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
+      },
+      "optionalDependencies": {
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
+      }
+    },
+    "node_modules/node-gyp-build-optional-packages": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
+      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.1"
+      },
+      "bin": {
+        "node-gyp-build-optional-packages": "bin.js",
+        "node-gyp-build-optional-packages-optional": "optional.js",
+        "node-gyp-build-optional-packages-test": "build-test.js"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "7.19.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz",
+      "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==",
+      "dev": true,
+      "license": "MIT"
+    }
+  }
+}
diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json
new file mode 100644
index 000000000000..17da52cd5e9e
--- /dev/null
+++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "pnpm-fixup-state-db",
+  "version": "0.0.0",
+  "description": "Fixup pnpm v11-store index.db to remove impurities",
+  "license": "MIT",
+  "author": "Sefa Eyeoglu <contact@scrumplex.net>",
+  "type": "module",
+  "main": "index.js",
+  "dependencies": {
+    "@pnpm/store.index": "^1100.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^25.6.0",
+    "typescript": "^6.0.3"
+  },
+  "scripts": {
+    "build": "tsc"
+  }
+}
diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json b/pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json
new file mode 100644
index 000000000000..55cc552808e3
--- /dev/null
+++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "module": "nodenext",
+    "target": "esnext",
+    "lib": ["esnext"],
+    "types": ["node"],
+    "strict": true
+  },
+  "include": ["index.ts"]
+}
diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix
index 82253bf52d46..76a0b40835e4 100644
--- a/pkgs/development/tools/pnpm/generic.nix
+++ b/pkgs/development/tools/pnpm/generic.nix
@@ -103,7 +103,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
               ];
             })
           );
-      inherit majorVersion;
+      inherit nodejs majorVersion;
 
       tests.version = lib.optionalAttrs withNode (
         testers.testVersion { package = finalAttrs.finalPackage; }
diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix
index 1e7d882ce295..85874ec1a57f 100644
--- a/pkgs/test/pnpm/default.nix
+++ b/pkgs/test/pnpm/default.nix
@@ -1,4 +1,5 @@
 { callPackage }:
 {
   pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { };
+  pnpm-fixup-state-db = callPackage ./pnpm-fixup-state-db { };
 }
diff --git a/pkgs/test/pnpm/pnpm-fixup-state-db/default.nix b/pkgs/test/pnpm/pnpm-fixup-state-db/default.nix
new file mode 100644
index 000000000000..f4c47ae00efa
--- /dev/null
+++ b/pkgs/test/pnpm/pnpm-fixup-state-db/default.nix
@@ -0,0 +1,23 @@
+{
+  pnpm-fixup-state-db,
+  testers,
+  sqlite,
+}:
+testers.runCommand {
+  name = "pnpm-fixup-state-db-test";
+
+  nativeBuildInputs = [
+    pnpm-fixup-state-db
+    sqlite
+  ];
+
+  script = ''
+    install -Dm644 ${./index.db} ./store/index.db
+
+    pnpm-fixup-state-db ./store
+
+    cp ./store/index.db $out
+  '';
+
+  hash = "sha256-tjpKgdMvDcs0X65PENIsiHELYPzVupEH3jS4PyLsF40=";
+}
diff --git a/pkgs/test/pnpm/pnpm-fixup-state-db/index.db b/pkgs/test/pnpm/pnpm-fixup-state-db/index.db
new file mode 100644
index 0000000000000000000000000000000000000000..705910416a042a68be532125cea69f6f6ee943dc
GIT binary patch
literal 65536
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
BWXJ#j

literal 0
HcmV?d00001


From 359a8ab763cc68c1c7d44daa39ce707285a636e6 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 9 May 2026 11:40:12 +0200
Subject: [PATCH 073/221] fetchPnpmDeps: use writableTmpDirAsHomeHook

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/build-support/node/fetch-pnpm-deps/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
index 80b637b57ddf..bba11ef60560 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
@@ -87,6 +87,7 @@ in
               moreutils
               pnpm # from args
               pnpm-fixup-state-db'
+              writableTmpDirAsHomeHook
               yq
               zstd
             ]
@@ -104,8 +105,6 @@ in
                 exit 1
               fi
 
-              export HOME=$(mktemp -d)
-
               # For fetcherVersion < 3, the pnpm store files are placed directly into $out.
               # For fetcherVersion >= 3, it is bundled into a compressed tarball within $out,
               # without distributing the uncompressed store files.

From 83ace87bc75eac42d93463c6cc2bac18336fc9d3 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 9 May 2026 11:41:40 +0200
Subject: [PATCH 074/221] fetchPnpmDeps,pnpmConfigHook: add support for pnpm 11

pnpm 11 does not support configuring some options through its new global
config format. As a workaround, we can define these environment
variables instead.

This also adds support for the new pmOnFail option in pnpm 11 that
replaces managePackageManagerVersions.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../node/fetch-pnpm-deps/default.nix          | 35 +++++++++++++------
 .../node/fetch-pnpm-deps/pnpm-config-hook.sh  | 22 +++++++++---
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
index bba11ef60560..79dcddbb4a81 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
@@ -99,6 +99,11 @@ in
             installPhase = ''
               runHook preInstall
 
+              versionAtLeast () {
+                  local cur_version=$1 min_version=$2
+                  printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC
+              }
+
               lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)"
               if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then
                 echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!"
@@ -115,19 +120,29 @@ in
                 storePath=$out
               fi
 
-              # If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs,
-              # any pnpm command would fail in that directory, the following disables this
-              pushd ..
-              pnpm config set manage-package-manager-versions false
+              pushd "$HOME"
+              pnpmVersion=$(pnpm --version)
+
+              if versionAtLeast "$pnpmVersion" "11"; then
+                # pnpm 11 uses a different mechanism to manage package manager versions
+                export pnpm_config_pm_on_fail=ignore
+
+                # Some packages produce platform dependent outputs. We do not want to cache those in the global store
+                export pnpm_config_side_effects_cache false
+
+                export pnpm_config_update_notifier false
+              else
+                pnpm config set manage-package-manager-versions false
+                pnpm config set side-effects-cache false
+                pnpm config set update-notifier false
+              fi
               popd
 
               pnpm config set store-dir $storePath
-              # Some packages produce platform dependent outputs. We do not want to cache those in the global store
-              pnpm config set side-effects-cache false
-              # As we pin pnpm versions, we don't really care about updates
-              pnpm config set update-notifier false
+
               # Run any additional pnpm configuration commands that users provide.
               ${prePnpmInstall}
+
               # pnpm is going to warn us about using --force
               # --force allows us to fetch all dependencies including ones that aren't meant for our host platform
               pnpm install \
@@ -150,7 +165,7 @@ in
               runHook preFixup
 
               # Remove timestamp and sort the json files
-              rm -rf $storePath/{v3,v10}/tmp
+              rm -rf $storePath/{v3,v10,v11}/tmp
               for f in $(find $storePath -name "*.json"); do
                 jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f
               done
@@ -161,7 +176,7 @@ in
 
               # This folder contains symlinks to /build/source which we don't need
               # since https://github.com/pnpm/pnpm/releases/tag/v10.27.0
-              rm -rf $storePath/{v3,v10}/projects
+              rm -rf $storePath/{v3,v10,v11}/projects
 
               # Ensure consistent permissions
               # NOTE: For reasons not yet fully understood, pnpm might create files with
diff --git a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh
index 2590de95343a..f9c19341d00b 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh
+++ b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh
@@ -1,5 +1,10 @@
 # shellcheck shell=bash
 
+versionAtLeast () {
+    local cur_version=$1 min_version=$2
+    printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC
+}
+
 pnpmConfigHook() {
     echo "Executing pnpmConfigHook"
 
@@ -17,13 +22,18 @@ pnpmConfigHook() {
       exit 1
     fi
 
-    # If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs,
-    # any pnpm command would fail in that directory, the following disables this
-    pushd $HOME
-    pnpm config set manage-package-manager-versions false
+    pushd "$HOME"
+    pnpmVersion=$(pnpm --version)
+
+    if versionAtLeast "$pnpmVersion" "11"; then
+      # pnpm 11 uses a different mechanism to manage package manager versions
+      export pnpm_config_pm_on_fail=ignore
+    else
+      pnpm config set manage-package-manager-versions false
+    fi
     popd
 
-    echo "Found 'pnpm' with version '$(pnpm --version)'"
+    echo "Found 'pnpm' with version '$pnpmVersion'"
 
     fetcherVersion=$(cat "${pnpmDeps}/.fetcher-version" || echo 1)
 
@@ -33,7 +43,9 @@ pnpmConfigHook() {
 
     export STORE_PATH=$(mktemp -d)
     export npm_config_arch="@npmArch@"
+    export pnpm_config_arch="@npmArch@"
     export npm_config_platform="@npmPlatform@"
+    export pnpm_config_platform="@npmPlatform@"
 
     if [[ $fetcherVersion -ge 3 ]]; then
       tar --zstd -xf "$pnpmDeps/pnpm-store.tar.zst" -C "$STORE_PATH"

From da48a72e27c4e7604f6e826ae5b4bc2f3c9abd2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 11 May 2026 10:05:32 -0700
Subject: [PATCH 075/221] python3Packages.qh3: 1.8.0 -> 1.8.1

Diff: https://github.com/jawah/qh3/compare/v1.8.0...v1.8.1

Changelog: https://github.com/jawah/qh3/blob/v1.8.1/CHANGELOG.rst
---
 pkgs/development/python-modules/qh3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qh3/default.nix b/pkgs/development/python-modules/qh3/default.nix
index 24757a511d88..bc299a4b42a9 100644
--- a/pkgs/development/python-modules/qh3/default.nix
+++ b/pkgs/development/python-modules/qh3/default.nix
@@ -14,19 +14,19 @@
 
 buildPythonPackage rec {
   pname = "qh3";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "qh3";
     tag = "v${version}";
-    hash = "sha256-aXFevAz5B58ZnK/LImULpETQNNyRKH9vY1CoGh5mKxI=";
+    hash = "sha256-/N0cVm5IHijShv0/q83useJRP5/N3+9L1vtrm7Y9vp8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-+J2MDFbynUWgyLcGYRMIvo0PW6Hy8+ka2H6HMaBIOl8=";
+    hash = "sha256-7SbN8uj+TPoAhIwXqhqCGqWGpg9sYob95TYAHixIVkM=";
   };
 
   nativeBuildInputs = [

From a2bdebd7d0bf5875c2d8044041477a013b35d729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 11 May 2026 10:05:07 -0700
Subject: [PATCH 076/221] python3Packages.urllib3-future: 2.19.913 -> 2.20.902

Diff: https://github.com/jawah/urllib3.future/compare/2.19.913...2.20.902

Changelog: https://github.com/jawah/urllib3.future/blob/2.20.902/CHANGES.rst
---
 pkgs/development/python-modules/urllib3-future/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix
index ec46491b574f..58db72ef3cb0 100644
--- a/pkgs/development/python-modules/urllib3-future/default.nix
+++ b/pkgs/development/python-modules/urllib3-future/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "urllib3-future";
-  version = "2.19.913";
+  version = "2.20.902";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "urllib3.future";
     tag = version;
-    hash = "sha256-ReoVZb31M1N1oxSFYGd1x1P5/qBx/oFEjaxJEiMwbvM=";
+    hash = "sha256-81t6yGmfON73oGg4uZYmVqeUpXX/SmKU69y/PfEWA7s=";
   };
 
   postPatch = ''

From 426c53d399120eb76bc04223838aef2f8fa76dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 11 May 2026 10:05:52 -0700
Subject: [PATCH 077/221] python3Packages.wassima: 2.0.6 -> 2.1.0

Diff: https://github.com/jawah/wassima/compare/2.0.6...2.1.0

Changelog: https://github.com/jawah/wassima/blob/2.1.0/CHANGELOG.md
---
 pkgs/development/python-modules/wassima/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wassima/default.nix b/pkgs/development/python-modules/wassima/default.nix
index 67196d717211..5a9a6b40240c 100644
--- a/pkgs/development/python-modules/wassima/default.nix
+++ b/pkgs/development/python-modules/wassima/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "wassima";
-  version = "2.0.6";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "wassima";
     tag = version;
-    hash = "sha256-k7gLLSfVVCk2YO7WRof3s3L2DVgFitQl9KRq9Bc+fJ8=";
+    hash = "sha256-0YHj5cmGZlZqUow+xkpQKHe+KB4X/OklEs4u8z/uV18=";
   };
 
   build-system = [ hatchling ];

From f66406d13c09f66be86d3f82435ba4478a5c8881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 11 May 2026 10:06:06 -0700
Subject: [PATCH 078/221] python3Packages.niquests: 3.18.7 -> 3.18.8

Diff: https://github.com/jawah/niquests/compare/v3.18.7...v3.18.8

Changelog: https://github.com/jawah/niquests/blob/v3.18.8/HISTORY.md
---
 pkgs/development/python-modules/niquests/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix
index f66a0d57f092..63f672046f6b 100644
--- a/pkgs/development/python-modules/niquests/default.nix
+++ b/pkgs/development/python-modules/niquests/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "niquests";
-  version = "3.18.7";
+  version = "3.18.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "niquests";
     tag = "v${version}";
-    hash = "sha256-ujqnb0B282MJi+2oy9AJfJY3KCE5JTjuJuyeeV0gZWA=";
+    hash = "sha256-yr0N+wkGyscCz34xtAU7qMQT+kN341AL/7PZwGwzhpo=";
   };
 
   build-system = [ hatchling ];

From 53dd2d01c05413a1f43a4c0ae2e7470f6e678e8a Mon Sep 17 00:00:00 2001
From: lukas-sgx <lukas.soigneux@epitech.eu>
Date: Mon, 11 May 2026 19:10:26 +0200
Subject: [PATCH 079/221] nixos/starship: respect pre-set STARSHIP_CONFIG env
 variable

---
 nixos/modules/programs/starship.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/starship.nix b/nixos/modules/programs/starship.nix
index 3f9ba0a02435..849c91b12ed3 100644
--- a/nixos/modules/programs/starship.nix
+++ b/nixos/modules/programs/starship.nix
@@ -116,7 +116,7 @@ in
         # config file.  starship appears to use a hardcoded config location
         # rather than one inside an XDG folder:
         # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651
-        if [[ ! -f "$HOME/.config/starship.toml" ]]; then
+        if [[ ! -f "$${STARSHIP_CONFIG:-$HOME/.config/starship.toml}" ]]; then
           export STARSHIP_CONFIG=${settingsFile}
         fi
         eval "$(${cfg.package}/bin/starship init bash --print-full-init)"
@@ -129,7 +129,8 @@ in
         # config file.  starship appears to use a hardcoded config location
         # rather than one inside an XDG folder:
         # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651
-        if not test -f "$HOME/.config/starship.toml";
+        set -q STARSHIP_CONFIG; or set STARSHIP_CONFIG "$HOME/.config/starship.toml"
+        if not test -f "$STARSHIP_CONFIG"
           set -x STARSHIP_CONFIG ${settingsFile}
         end
         ${lib.optionalString (!isNull cfg.transientPrompt.left) ''
@@ -153,7 +154,7 @@ in
         # config file.  starship appears to use a hardcoded config location
         # rather than one inside an XDG folder:
         # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651
-        if [[ ! -f "$HOME/.config/starship.toml" ]]; then
+        if [[ ! -f "$${STARSHIP_CONFIG:-$HOME/.config/starship.toml}" ]]; then
           export STARSHIP_CONFIG=${settingsFile}
         fi
         eval "$(${cfg.package}/bin/starship init zsh)"
@@ -167,8 +168,11 @@ in
         # config file.  starship appears to use a hardcoded config location
         # rather than one inside an XDG folder:
         # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651
-        if not `$HOME/.config/starship.toml`:
+        import os as _os
+        _sc = _os.environ.get('STARSHIP_CONFIG', _os.path.join(_os.environ['HOME'], '.config/starship.toml'))
+        if not _os.path.isfile(_sc):
           $STARSHIP_CONFIG = ('${settingsFile}')
+        del _os, _sc
         execx($(${cfg.package}/bin/starship init xonsh))
     '';
   };

From c5842303e42b9deb263198054d2923a1dd5effc3 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Tue, 14 Apr 2026 21:53:54 +0300
Subject: [PATCH 080/221] plezy: 1.30.0 -> 2.0.0

---
 pkgs/by-name/pl/plezy/git-hashes.json         |   5 +-
 pkgs/by-name/pl/plezy/package.nix             |  13 +-
 pkgs/by-name/pl/plezy/pubspec.lock.json       | 307 ++++++++----------
 .../pl/plezy/replace-sentry-fork.patch        |  32 ++
 pkgs/by-name/pl/plezy/update.sh               |  16 +-
 5 files changed, 186 insertions(+), 187 deletions(-)
 create mode 100644 pkgs/by-name/pl/plezy/replace-sentry-fork.patch

diff --git a/pkgs/by-name/pl/plezy/git-hashes.json b/pkgs/by-name/pl/plezy/git-hashes.json
index e263d0dab5fb..1054b3331dcc 100644
--- a/pkgs/by-name/pl/plezy/git-hashes.json
+++ b/pkgs/by-name/pl/plezy/git-hashes.json
@@ -3,7 +3,8 @@
   "auto_updater_macos": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=",
   "auto_updater_platform_interface": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=",
   "auto_updater_windows": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=",
+  "background_downloader": "sha256-U41AQVdXceT5ZBgvBR90h3JAAU2BLpguglcVBTrTww4=",
   "material_symbols_icons": "sha256-XRB6AZ4Q33sQKVZFA8lgdXCW/bx55h/RpmuItmFYVJM=",
-  "os_media_controls": "sha256-kSJov92pvzFQGIKnQb6XlwRXTY0Xs4iOZmc/390yf0c=",
-  "wakelock_plus": "sha256-OOTRP8v5mUma3j+G+koWoAufxrynWFMMhCLecvd1MhE="
+  "os_media_controls": "sha256-0Bghn1s28+xlcfSLyVA7B60atJkkdqcFKseSubPtzkQ=",
+  "wakelock_plus": "sha256-89xs0sLNuoCqApFqwEY+SEk2DUqjHf8JsSd7dfxX3P0="
 }
diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix
index f7cd8f1b1736..7bd849f6fde2 100644
--- a/pkgs/by-name/pl/plezy/package.nix
+++ b/pkgs/by-name/pl/plezy/package.nix
@@ -25,13 +25,13 @@
 
 let
   pname = "plezy";
-  version = "1.30.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "edde746";
     repo = "plezy";
     tag = version;
-    hash = "sha256-9bB9L9f2s0i2xF4JIe4vlEpt/bmF1gf3gxcoHdCrYqc=";
+    hash = "sha256-Pi5M74CI6J31Pzaf7wnUFFTpbOSwOTWdKUoYuXt8+Zs=";
   };
 
   simdutf = fetchurl {
@@ -46,7 +46,7 @@ let
   '';
 
   meta = {
-    description = "Modern cross-platform Plex client built with Flutter";
+    description = "Modern cross-platform Plex & Jellyfin client built with Flutter";
     homepage = "https://github.com/edde746/plezy";
     mainProgram = "plezy";
     license = lib.licenses.gpl3Only;
@@ -70,6 +70,11 @@ let
 
     gitHashes = lib.importJSON ./git-hashes.json;
 
+    # Upstream uses a sentry-dart fork that fetches sentry-native as a zip instead of via
+    # git clone. The PR was merged and reverted upstream (getsentry/sentry-dart#3630), so
+    # we use upstream since theres no actual meaningful difference
+    patches = [ ./replace-sentry-fork.patch ];
+
     nativeBuildInputs = [
       pkg-config
       copyDesktopItems
@@ -134,7 +139,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/edde746/plezy/releases/download/${version}/plezy-macos.dmg";
-      hash = "sha256-a3LvwWZvLPD7yKKbC+oYXSgoHXUS+mOojzfDyW7/QOE=";
+      hash = "sha256-zkctxQIgpU9dGhv8SdVy2S4eFUQ7GgeaWzwSEvFrWWc=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/pl/plezy/pubspec.lock.json b/pkgs/by-name/pl/plezy/pubspec.lock.json
index 6121af2bbdf4..fc3071b89a7a 100644
--- a/pkgs/by-name/pl/plezy/pubspec.lock.json
+++ b/pkgs/by-name/pl/plezy/pubspec.lock.json
@@ -4,31 +4,31 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
+        "sha256": "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "91.0.0"
+      "version": "93.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
+        "sha256": "de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.4.1"
+      "version": "10.0.1"
     },
     "analyzer_plugin": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer_plugin",
-        "sha256": "825071d553c4aef2252196d46a665fbd8e0cb06de07725f25d1b29bd18d65fff",
+        "sha256": "7df504f0c9d6891bacc9f73a5a8c5f6fe4fc49c90ec8e3379916372906ba0b32",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.13.6"
+      "version": "0.14.1"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -107,11 +107,12 @@
     "background_downloader": {
       "dependency": "direct main",
       "description": {
-        "name": "background_downloader",
-        "sha256": "4cb23d9ad4f5060944f38164e7b90d4bf99b57b2472a3bd4676e59b2db4afd06",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "1f42690",
+        "resolved-ref": "1f426908b0d9e1083de35b3dd353c3434ad32ef2",
+        "url": "https://github.com/edde746/background_downloader"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "9.5.4"
     },
     "boolean_selector": {
@@ -184,45 +185,45 @@
       "source": "hosted",
       "version": "8.12.4"
     },
-    "cached_network_image": {
+    "cached_network_image_ce": {
       "dependency": "direct main",
       "description": {
-        "name": "cached_network_image",
-        "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916",
+        "name": "cached_network_image_ce",
+        "sha256": "d4701fbbdf508de831e847fd1d49c644ffa6191c6018c416ab6f66bbe1ad5fff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.1"
+      "version": "4.6.4"
     },
-    "cached_network_image_platform_interface": {
+    "cached_network_image_platform_interface_ce": {
       "dependency": "transitive",
       "description": {
-        "name": "cached_network_image_platform_interface",
-        "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829",
+        "name": "cached_network_image_platform_interface_ce",
+        "sha256": "95343645becaeac01dd6eeb9f3a85448b6076d211010ff1973e8bbfd840b571d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.1"
+      "version": "5.2.0"
     },
-    "cached_network_image_web": {
+    "cached_network_image_web_ce": {
       "dependency": "transitive",
       "description": {
-        "name": "cached_network_image_web",
-        "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062",
+        "name": "cached_network_image_web_ce",
+        "sha256": "6bcd8608d4ace7c35625f09d971ce68c7a6581a4631b0fb6ceb2909b2c2e17a8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "2.1.1"
     },
     "characters": {
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.4.0"
     },
     "charcode": {
       "dependency": "transitive",
@@ -285,7 +286,7 @@
       "version": "4.11.1"
     },
     "collection": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "collection",
         "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
@@ -324,6 +325,16 @@
       "source": "hosted",
       "version": "3.1.2"
     },
+    "cronet_http": {
+      "dependency": "direct main",
+      "description": {
+        "name": "cronet_http",
+        "sha256": "07bfb4c6158aef72f8004631826abaeecdeaa2b6042f5f8916b8db20e1d01b4a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.6.0"
+    },
     "cross_file": {
       "dependency": "transitive",
       "description": {
@@ -345,7 +356,7 @@
       "version": "3.0.7"
     },
     "cryptography": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "cryptography",
         "sha256": "3eda3029d34ec9095a27a198ac9785630fe525c0eb6a49f3d575272f8e792ef0",
@@ -364,15 +375,25 @@
       "source": "hosted",
       "version": "1.0.2"
     },
+    "cupertino_http": {
+      "dependency": "direct main",
+      "description": {
+        "name": "cupertino_http",
+        "sha256": "82cbec60c90bf785a047a9525688b6dacac444e177e1d5a5876963d3c50369e8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.0"
+    },
     "dart_code_linter": {
       "dependency": "direct dev",
       "description": {
         "name": "dart_code_linter",
-        "sha256": "1b53722d9933a5f5d4580acc29c7f16b1fde66d21d1ecf7bb2a811caf3a42b42",
+        "sha256": "8ece88f710621ca1c40b6c344b316d78bb2269d728d37d2a44f19a81d9d2cb93",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "4.0.2"
     },
     "dart_discord_presence": {
       "dependency": "direct main",
@@ -388,11 +409,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
+        "sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.7"
     },
     "dbus": {
       "dependency": "transitive",
@@ -424,26 +445,6 @@
       "source": "hosted",
       "version": "7.0.3"
     },
-    "dio": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dio",
-        "sha256": "aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.9.2"
-    },
-    "dio_web_adapter": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dio_web_adapter",
-        "sha256": "2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
     "drift": {
       "dependency": "direct main",
       "description": {
@@ -550,16 +551,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "flutter_cache_manager": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_cache_manager",
-        "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.4.1"
-    },
     "flutter_lints": {
       "dependency": "direct dev",
       "description": {
@@ -608,6 +599,26 @@
       "source": "sdk",
       "version": "0.0.0"
     },
+    "freezed": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "freezed",
+        "sha256": "f23ea33b3863f119b58ed1b586e881a46bd28715ddcc4dbc33104524e3434131",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.5"
+    },
+    "freezed_annotation": {
+      "dependency": "direct main",
+      "description": {
+        "name": "freezed_annotation",
+        "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.0"
+    },
     "glob": {
       "dependency": "transitive",
       "description": {
@@ -628,6 +639,16 @@
       "source": "hosted",
       "version": "2.3.2"
     },
+    "hive_ce": {
+      "dependency": "transitive",
+      "description": {
+        "name": "hive_ce",
+        "sha256": "8e9980e68643afb1e765d3af32b47996552a64e190d03faf622cea07c1294418",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.19.3"
+    },
     "hooks": {
       "dependency": "transitive",
       "description": {
@@ -678,25 +699,15 @@
       "source": "hosted",
       "version": "4.1.2"
     },
-    "in_app_review": {
-      "dependency": "direct main",
-      "description": {
-        "name": "in_app_review",
-        "sha256": "ab26ac54dbd802896af78c670b265eaeab7ecddd6af4d0751e9604b60574817f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.11"
-    },
-    "in_app_review_platform_interface": {
+    "http_profile": {
       "dependency": "transitive",
       "description": {
-        "name": "in_app_review_platform_interface",
-        "sha256": "fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10",
+        "name": "http_profile",
+        "sha256": "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.5"
+      "version": "0.1.0"
     },
     "intl": {
       "dependency": "direct main",
@@ -718,6 +729,16 @@
       "source": "hosted",
       "version": "1.0.5"
     },
+    "isolate_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "isolate_channel",
+        "sha256": "a9d3d620695bc984244dafae00b95e4319d6974b2d77f4b9e1eb4f2efe099094",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.1"
+    },
     "jni": {
       "dependency": "transitive",
       "description": {
@@ -742,11 +763,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "c5b2ee75210a0f263c6c7b9eeea80553dbae96ea1bf57f02484e806a3ffdffa3",
+        "sha256": "5b89c1e32ae3840bb20a1b3434e3a590173ad3cb605896fb0f60487ce2f8104e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.11.2"
+      "version": "6.11.4"
     },
     "leak_tracker": {
       "dependency": "transitive",
@@ -812,21 +833,21 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.18"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
       "description": {
         "name": "material_color_utilities",
-        "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
+        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.13.0"
+      "version": "0.11.1"
     },
     "material_symbols_icons": {
       "dependency": "direct main",
@@ -859,16 +880,6 @@
       "source": "hosted",
       "version": "2.0.0"
     },
-    "mobile_scanner": {
-      "dependency": "direct main",
-      "description": {
-        "name": "mobile_scanner",
-        "sha256": "c92c26bf2231695b6d3477c8dcf435f51e28f87b1745966b1fe4c47a286171ce",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.2.0"
-    },
     "native_toolchain_c": {
       "dependency": "transitive",
       "description": {
@@ -923,12 +934,12 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "467251821f76bba37ed4c6d5ee1c9de27c285e34",
-        "resolved-ref": "467251821f76bba37ed4c6d5ee1c9de27c285e34",
+        "ref": "5ddd27c",
+        "resolved-ref": "5ddd27c2acacca31060d288db1371a870602cf46",
         "url": "https://github.com/edde746/os-media-controls"
       },
       "source": "git",
-      "version": "0.2.0"
+      "version": "0.2.1"
     },
     "package_config": {
       "dependency": "transitive",
@@ -1021,7 +1032,7 @@
       "version": "2.2.1"
     },
     "path_provider_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "path_provider_platform_interface",
         "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
@@ -1061,7 +1072,7 @@
       "version": "3.1.6"
     },
     "plugin_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "plugin_platform_interface",
         "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
@@ -1170,16 +1181,6 @@
       "source": "hosted",
       "version": "4.1.0"
     },
-    "rxdart": {
-      "dependency": "transitive",
-      "description": {
-        "name": "rxdart",
-        "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.28.0"
-    },
     "saf_stream": {
       "dependency": "direct main",
       "description": {
@@ -1254,21 +1255,21 @@
       "dependency": "transitive",
       "description": {
         "name": "sentry",
-        "sha256": "a49b4fb1cba576fe216347dc2a0e6d76076fb998e6012857db96f991c23b7b3c",
+        "sha256": "288aee3d35f252ac0dc3a4b0accbbe7212fa2867604027f2cc5bc65334afd743",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.15.0"
+      "version": "9.16.0"
     },
     "sentry_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "sentry_flutter",
-        "sha256": "25150030c93bd1d4b727ab61cfb09e99121c69ce90fa820bb9ca16dab433e43a",
+        "sha256": "f9e87d5895cc437902aa2b081727ee7e46524fe7cc2e1910f535480a3eeb8bed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.15.0"
+      "version": "9.16.0"
     },
     "serial_csv": {
       "dependency": "transitive",
@@ -1321,7 +1322,7 @@
       "version": "2.4.1"
     },
     "shared_preferences_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "shared_preferences_platform_interface",
         "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
@@ -1420,11 +1421,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
+        "sha256": "1d3b229b2934034fb2e691fbb3d53e0f75a4af7b1407f88425ed8f209bcb1b8f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.8"
+      "version": "1.3.11"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1436,56 +1437,6 @@
       "source": "hosted",
       "version": "1.10.2"
     },
-    "sqflite": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqflite",
-        "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2"
-    },
-    "sqflite_android": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqflite_android",
-        "sha256": "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2+3"
-    },
-    "sqflite_common": {
-      "dependency": "transitive",
-      "description": {
-        "name": "sqflite_common",
-        "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.5.6"
-    },
-    "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"
-    },
     "sqlite3": {
       "dependency": "transitive",
       "description": {
@@ -1556,16 +1507,6 @@
       "source": "hosted",
       "version": "1.4.1"
     },
-    "synchronized": {
-      "dependency": "transitive",
-      "description": {
-        "name": "synchronized",
-        "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.4.0"
-    },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
@@ -1580,11 +1521,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
+        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.9"
+      "version": "0.7.7"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1600,11 +1541,11 @@
       "dependency": "direct main",
       "description": {
         "name": "universal_gamepad",
-        "sha256": "6177944707639a20dd4f89e7f8d78bf66b40ba03d70a1962754d3bba45e14ccd",
+        "sha256": "3ada9b26e3b3471adc414fd50b8a27d2f890301d9d4cfd7a46732988a9f143d0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.4"
+      "version": "1.5.5"
     },
     "url_launcher": {
       "dependency": "direct main",
@@ -1750,8 +1691,8 @@
       "dependency": "direct main",
       "description": {
         "path": "wakelock_plus",
-        "ref": "HEAD",
-        "resolved-ref": "0085d705c80a961a4a5eeaa4ee8f723dcf4bc9b8",
+        "ref": "8595fee595c952b73d430f2eab05f2e0d858290e",
+        "resolved-ref": "8595fee595c952b73d430f2eab05f2e0d858290e",
         "url": "https://github.com/edde746/wakelock_plus"
       },
       "source": "git",
@@ -1827,6 +1768,16 @@
       "source": "hosted",
       "version": "2.1.0"
     },
+    "win_http": {
+      "dependency": "direct main",
+      "description": {
+        "name": "win_http",
+        "sha256": "efbfec044d43665e271b2c51d40864275d055b28eda1e9feddb42d884ae982df",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "window_manager": {
       "dependency": "direct main",
       "description": {
diff --git a/pkgs/by-name/pl/plezy/replace-sentry-fork.patch b/pkgs/by-name/pl/plezy/replace-sentry-fork.patch
new file mode 100644
index 000000000000..7ea9482ccebf
--- /dev/null
+++ b/pkgs/by-name/pl/plezy/replace-sentry-fork.patch
@@ -0,0 +1,32 @@
+--- a/pubspec.yaml
++++ b/pubspec.yaml
+@@ -56,11 +56,7 @@
+     git:
+       url: https://github.com/edde746/background_downloader
+       ref: 1f42690
+-  sentry_flutter:
+-    git:
+-      url: https://github.com/edde746/sentry-dart
+-      path: packages/flutter
+-      ref: build/fetch-native-zip
++  sentry_flutter: 9.16.0
+   auto_updater:
+     git:
+       url: https://github.com/edde746/auto_updater
+@@ -102,16 +98,6 @@
+       url: https://github.com/edde746/auto_updater
+       ref: 9e150f7
+       path: packages/auto_updater_windows
+-  sentry:
+-    git:
+-      url: https://github.com/edde746/sentry-dart
+-      path: packages/dart
+-      ref: build/fetch-native-zip
+-  sentry_flutter:
+-    git:
+-      url: https://github.com/edde746/sentry-dart
+-      path: packages/flutter
+-      ref: build/fetch-native-zip
+   material_symbols_icons:
+     git:
+       url: https://github.com/edde746/material_symbols_icons
diff --git a/pkgs/by-name/pl/plezy/update.sh b/pkgs/by-name/pl/plezy/update.sh
index 6befc9c04271..c7734d7b5353 100755
--- a/pkgs/by-name/pl/plezy/update.sh
+++ b/pkgs/by-name/pl/plezy/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go
+#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go flutter338 git
 
 set -eou pipefail
 
@@ -26,8 +26,18 @@ DMG_URL="https://github.com/edde746/plezy/releases/download/${latestVersion}/ple
 DMG_SHA=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$(nix-prefetch-url "$DMG_URL")")
 sed -i "/plezy-macos.dmg/,/hash/{s|hash = \".*\"|hash = \"${DMG_SHA}\"|}" "$ROOT/package.nix"
 
-curl --fail --silent "https://raw.githubusercontent.com/edde746/plezy/${latestVersion}/pubspec.lock" \
-  | yq eval --output-format=json --prettyPrint > "$ROOT/pubspec.lock.json"
+# Only here to handle the patched pubsec.yaml
+workdir=$(mktemp -d)
+trap 'rm -rf "$workdir"' EXIT
+
+curl --fail --silent --location "$GIT_SRC_URL" | tar -xz -C "$workdir" --strip-components=1
+patch -d "$workdir" -p1 < "$ROOT/replace-sentry-fork.patch"
+
+export PUB_CACHE="$workdir/.pub-cache"
+flutter --no-version-check config --no-analytics >/dev/null
+flutter --no-version-check pub --directory "$workdir" get
+
+yq eval --output-format=json --prettyPrint "$workdir/pubspec.lock" > "$ROOT/pubspec.lock.json"
 
 python3 "$(dirname "$(readlink -f "$0")")/../../../development/compilers/dart/fetch-git-hashes.py" \
   --input "$ROOT/pubspec.lock.json" \

From 1f457fe8ccdf2b83b1639eedf2a3f65951e26ce2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 May 2026 19:04:15 +0000
Subject: [PATCH 081/221] trufflehog: 3.95.2 -> 3.95.3

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

diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix
index 1c3523c96949..310fbcf9507d 100644
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "trufflehog";
-  version = "3.95.2";
+  version = "3.95.3";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7hHeJ+RBUUBznl9gm6IwemFsHLiKHh6B7T96jpEsAC0=";
+    hash = "sha256-FFYDlETo7r2j1e4l+oJ3yWn1hUyA/4Xe7onrX8GidZg=";
   };
 
   vendorHash = "sha256-2WBdBsOXjj4/9hLA+yk5PQAqOgi5vn1cH4NnkHg8umI=";

From 7d318dfe3b95f6ce5f97db40a3b2dee704d75227 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 30 Mar 2026 22:57:31 +0200
Subject: [PATCH 082/221] pnpm_11: init at 11.1.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../javascript.section.md                     |  56 ++++------------
 .../node/fetch-pnpm-deps/serve.nix            |   5 ++
 pkgs/development/tools/pnpm/default.nix       |   4 ++
 pkgs/development/tools/pnpm/generic.nix       |  29 +++++----
 pkgs/test/pnpm/default.nix                    |   1 +
 pkgs/test/pnpm/pnpm-fixup-state-db/index.db   | Bin 65536 -> 61440 bytes
 pkgs/test/pnpm/pnpm_11/default.nix            |  60 ++++++++++++++++++
 pkgs/test/pnpm/pnpm_11/src/.gitignore         |   2 +
 pkgs/test/pnpm/pnpm_11/src/index.ts           |   1 +
 pkgs/test/pnpm/pnpm_11/src/package.json       |  20 ++++++
 pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml     |  39 ++++++++++++
 pkgs/test/pnpm/pnpm_11/src/tsconfig.json      |  13 ++++
 pkgs/top-level/all-packages.nix               |   3 +-
 13 files changed, 176 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/test/pnpm/pnpm_11/default.nix
 create mode 100644 pkgs/test/pnpm/pnpm_11/src/.gitignore
 create mode 100644 pkgs/test/pnpm/pnpm_11/src/index.ts
 create mode 100644 pkgs/test/pnpm/pnpm_11/src/package.json
 create mode 100644 pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml
 create mode 100644 pkgs/test/pnpm/pnpm_11/src/tsconfig.json

diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index 362130e5ba5f..58a0805cc58d 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -305,7 +305,7 @@ This package puts the corepack wrappers for pnpm and yarn in your PATH, and they
 
 ### pnpm {#javascript-pnpm}
 
-pnpm is available as the top-level package `pnpm`. Additionally, there are variants pinned to certain major versions, like `pnpm_8`, `pnpm_9` and `pnpm_10`, which support different sets of lock file versions.
+pnpm is available as the top-level package `pnpm`. Additionally, there are variants pinned to certain major versions, like `pnpm_8`, `pnpm_9`, `pnpm_10`, `pnpm_10_29_2` and `pnpm_11`, which support different sets of lock file versions.
 
 When packaging an application that includes a `pnpm-lock.yaml`, you need to fetch the pnpm store for that project using a fixed-output-derivation. The function `fetchPnpmDeps` can create this pnpm store derivation. In conjunction, the setup hook `pnpmConfigHook` will prepare the build environment to install the pre-fetched dependencies store. Here is an example for a package that contains `package.json` and a `pnpm-lock.yaml` files using the fetcher and setup hook above:
 
@@ -313,11 +313,18 @@ When packaging an application that includes a `pnpm-lock.yaml`, you need to fetc
 {
   fetchPnpmDeps,
   nodejs,
-  pnpm,
+  pnpm_11,
   pnpmConfigHook,
   stdenv,
 }:
-
+let
+  # It is recommended to pin pnpm to a major version, due to regular breaking changes in the store format
+  # The latest major version is always available under `pkgs.pnpm`
+  # Optionally override pnpm to use a custom nodejs version
+  # Make sure that the same nodejs version is referenced in nativeBuildInputs
+  # pnpm = pnpm_11.override { nodejs = nodejs_24; };
+  pnpm = pnpm_11;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "foo";
   version = "0-unstable-1980-01-01";
@@ -334,54 +341,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
+    inherit pnpm;
     fetcherVersion = 3;
     hash = "...";
   };
 })
 ```
 
-It is highly recommended to use a pinned version of pnpm (i.e., `pnpm_9` or `pnpm_10`), to increase future reproducibility. It might also be required to use an older version if the package needs support for a certain lock file version. To do so, you can pass the `pnpm` argument to `fetchPnpmDeps` and override the `pnpm` arg in `pnpmConfigHook`. Here are the changes in the example above to use a pinned pnpm version:
-
-<!-- TODO: Does splicing still work when overriding in nativeBuildInputs here? -->
-
-```diff
- {
-   fetchPnpmDeps,
-   nodejs,
--  pnpm,
-+  pnpm_10,
-   pnpmConfigHook,
-   stdenv,
- }:
-+let
-+  # Optionally override pnpm to use a custom nodejs version
-+  # Make sure that the same nodejs version is referenced in nativeBuildInputs
-+  # pnpm = pnpm_10.override { nodejs = nodejs_20; };
-+in
- stdenv.mkDerivation (finalAttrs: {
-   pname = "foo";
-   version = "0-unstable-1980-01-01";
-
-   src = {
-     #...
-   };
-
-   nativeBuildInputs = [
-     nodejs # in case scripts are run outside of a pnpm call
-     pnpmConfigHook
--    pnpm # At least required by pnpmConfigHook, if not other (custom) phases
-+    pnpm_10 # At least required by pnpmConfigHook, if not other (custom) phases
-   ];
-
-   pnpmDeps = fetchPnpmDeps {
-     inherit (finalAttrs) pname version src;
-+    pnpm = pnpm_10;
-     fetcherVersion = 3;
-     hash = "...";
-   };
- })
-```
-
 In case you are patching `package.json` or `pnpm-lock.yaml`, make sure to pass `finalAttrs.patches` to the function as well (i.e., `inherit (finalAttrs) patches`.
 
 `pnpmConfigHook` supports adding additional `pnpm install` flags via `pnpmInstallFlags` which can be set to a Nix string array:
diff --git a/pkgs/build-support/node/fetch-pnpm-deps/serve.nix b/pkgs/build-support/node/fetch-pnpm-deps/serve.nix
index 9aa5d380a0cd..46288e974660 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/serve.nix
+++ b/pkgs/build-support/node/fetch-pnpm-deps/serve.nix
@@ -3,6 +3,7 @@
   pnpm,
   pnpmDeps,
   zstd,
+  lib,
 }:
 
 writeShellApplication {
@@ -41,4 +42,8 @@ writeShellApplication {
     pnpm server start \
       --store-dir "$storePath"
   '';
+
+  meta = {
+    broken = lib.versionAtLeast pnpm.version "11";
+  };
 }
diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 3975dbc04277..c1423124fc24 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -25,6 +25,10 @@ let
       version = "10.33.4";
       hash = "sha256-jnDdxmSbGLw9iVzzqQjAKR6kw4A5rYcixH4Bja8enPw=";
     };
+    "11" = {
+      version = "11.1.0";
+      hash = "sha256-VzyCrTVuiwl+bKxIG3OB+d7tM6MYr38xGYSFjr4fl+8=";
+    };
   };
 
   callPnpm = variant: callPackage ./generic.nix { inherit (variant) version hash; };
diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix
index 76a0b40835e4..aa50a4fd3a52 100644
--- a/pkgs/development/tools/pnpm/generic.nix
+++ b/pkgs/development/tools/pnpm/generic.nix
@@ -10,6 +10,7 @@
   testers,
   buildPackages,
   bashNonInteractive,
+  tests,
 
   withNode ? true,
   version,
@@ -43,16 +44,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     rm -r package/dist/reflink.*node package/dist/vendor
   '';
 
-  installPhase = ''
-    runHook preInstall
+  installPhase =
+    let
+      # Use ESM pnpm for versions > 11
+      ext = if lib.versionOlder finalAttrs.version "11" then "cjs" else "mjs";
+    in
+    ''
+      runHook preInstall
 
-    install -d $out/{bin,libexec}
-    cp -R . $out/libexec/pnpm
-    ln -s $out/libexec/pnpm/bin/pnpm.cjs $out/bin/pnpm
-    ln -s $out/libexec/pnpm/bin/pnpx.cjs $out/bin/pnpx
+      install -d $out/{bin,libexec}
+      cp -R . $out/libexec/pnpm
+      ln -s $out/libexec/pnpm/bin/pnpm.${ext} $out/bin/pnpm
+      ln -s $out/libexec/pnpm/bin/pnpx.${ext} $out/bin/pnpx
 
-    runHook postInstall
-  '';
+      runHook postInstall
+    '';
 
   postInstall =
     if lib.toInt (lib.versions.major version) < 9 then
@@ -105,9 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           );
       inherit nodejs majorVersion;
 
-      tests.version = lib.optionalAttrs withNode (
-        testers.testVersion { package = finalAttrs.finalPackage; }
-      );
+      tests = {
+        inherit (tests) pnpm;
+        version = lib.optionalAttrs withNode (testers.testVersion { package = finalAttrs.finalPackage; });
+      };
       updateScript = writeScript "pnpm-update-script" ''
         #!/usr/bin/env nix-shell
         #!nix-shell -i bash -p curl jq common-updater-scripts
diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix
index 85874ec1a57f..8cc5708ec735 100644
--- a/pkgs/test/pnpm/default.nix
+++ b/pkgs/test/pnpm/default.nix
@@ -2,4 +2,5 @@
 {
   pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { };
   pnpm-fixup-state-db = callPackage ./pnpm-fixup-state-db { };
+  pnpm_11 = callPackage ./pnpm_11 { };
 }
diff --git a/pkgs/test/pnpm/pnpm-fixup-state-db/index.db b/pkgs/test/pnpm/pnpm-fixup-state-db/index.db
index 705910416a042a68be532125cea69f6f6ee943dc..aa5dcd007e269e2024d09d8e4a995fa0b588a1ad 100644
GIT binary patch
delta 13499
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

delta 11263
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
PHg297p2e}T;V2UT#`6ba

diff --git a/pkgs/test/pnpm/pnpm_11/default.nix b/pkgs/test/pnpm/pnpm_11/default.nix
new file mode 100644
index 000000000000..bf3ab4d4f551
--- /dev/null
+++ b/pkgs/test/pnpm/pnpm_11/default.nix
@@ -0,0 +1,60 @@
+{
+  fetchPnpmDeps,
+  lib,
+  makeShellWrapper,
+  nodejs,
+  pnpmConfigHook,
+  pnpm_11,
+  stdenv,
+  testers,
+}:
+let
+  pnpm = pnpm_11;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pnpm-test";
+  inherit (pnpm) version;
+
+  src = ./src;
+
+  pnpmDeps = testers.invalidateFetcherByDrvHash fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    inherit pnpm;
+    fetcherVersion = 3;
+    hash = "sha256-+Vrv5ZiVIARDZrR5/4OYRmaecQQZmcZFtMjK4qhXKb8=";
+  };
+
+  nativeBuildInputs = [
+    makeShellWrapper
+    nodejs
+    pnpm
+    pnpmConfigHook
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 -t $out/lib/pnpm-11-test dist/index.js
+
+    makeWrapper ${lib.getExe nodejs} $out/bin/pnpm11test \
+      --add-flags "$out/lib/pnpm11test"
+
+    runHook postInstall
+  '';
+
+  __structuredAttrs = true;
+
+  meta = {
+    license = lib.licenses.mit;
+    mainProgram = "pnpm11test";
+    inherit (pnpm.meta) maintainers;
+  };
+})
diff --git a/pkgs/test/pnpm/pnpm_11/src/.gitignore b/pkgs/test/pnpm/pnpm_11/src/.gitignore
new file mode 100644
index 000000000000..1eae0cf6700c
--- /dev/null
+++ b/pkgs/test/pnpm/pnpm_11/src/.gitignore
@@ -0,0 +1,2 @@
+dist/
+node_modules/
diff --git a/pkgs/test/pnpm/pnpm_11/src/index.ts b/pkgs/test/pnpm/pnpm_11/src/index.ts
new file mode 100644
index 000000000000..accefceba62b
--- /dev/null
+++ b/pkgs/test/pnpm/pnpm_11/src/index.ts
@@ -0,0 +1 @@
+console.log("Hello World");
diff --git a/pkgs/test/pnpm/pnpm_11/src/package.json b/pkgs/test/pnpm/pnpm_11/src/package.json
new file mode 100644
index 000000000000..1eb3b51b3886
--- /dev/null
+++ b/pkgs/test/pnpm/pnpm_11/src/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "pnpm11test",
+  "version": "1.0.0",
+  "description": "",
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "tsc",
+    "start": "node dist/index.js"
+  },
+  "license": "MIT",
+  "packageManager": "pnpm",
+  "type": "module",
+  "files": [
+    "dist/"
+  ],
+  "devDependencies": {
+    "@types/node": "^25.5.0",
+    "typescript": "^6.0.2"
+  }
+}
diff --git a/pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml b/pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml
new file mode 100644
index 000000000000..def71aa4e5a2
--- /dev/null
+++ b/pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml
@@ -0,0 +1,39 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    devDependencies:
+      '@types/node':
+        specifier: ^25.5.0
+        version: 25.5.0
+      typescript:
+        specifier: ^6.0.2
+        version: 6.0.2
+
+packages:
+
+  '@types/node@25.5.0':
+    resolution: {integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==}
+
+  typescript@6.0.2:
+    resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  undici-types@7.18.2:
+    resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==}
+
+snapshots:
+
+  '@types/node@25.5.0':
+    dependencies:
+      undici-types: 7.18.2
+
+  typescript@6.0.2: {}
+
+  undici-types@7.18.2: {}
diff --git a/pkgs/test/pnpm/pnpm_11/src/tsconfig.json b/pkgs/test/pnpm/pnpm_11/src/tsconfig.json
new file mode 100644
index 000000000000..3471bd329666
--- /dev/null
+++ b/pkgs/test/pnpm/pnpm_11/src/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "outDir": "dist",
+    "rootDir": ".",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true
+  }
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0133a2683d37..f864001a47cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3141,8 +3141,9 @@ with pkgs;
     pnpm_9
     pnpm_10_29_2
     pnpm_10
+    pnpm_11
     ;
-  pnpm = pnpm_10;
+  pnpm = pnpm_11;
 
   inherit (callPackages ../build-support/node/fetch-pnpm-deps { })
     fetchPnpmDeps

From 574e3c6cefa79da2f659ab82bb37494aee8eab74 Mon Sep 17 00:00:00 2001
From: Xiangyan Sun <wishstudio@gmail.com>
Date: Mon, 11 May 2026 14:25:51 -0700
Subject: [PATCH 083/221] dablin: remove unused pcre dependency

---
 pkgs/by-name/da/dablin/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix
index 644c13ee5b0c..bddcbf70b9bc 100644
--- a/pkgs/by-name/da/dablin/package.nix
+++ b/pkgs/by-name/da/dablin/package.nix
@@ -8,7 +8,6 @@
   SDL2,
   gtkmm3,
   faad2,
-  pcre,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
     mpg123
     SDL2
     gtkmm3
-    pcre
   ];
 
   meta = {

From c3f22fcacdc343fda12feb9b279bce8a4b6960aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 May 2026 21:47:50 +0000
Subject: [PATCH 084/221] age-plugin-sss: 0.3.1 -> 0.4.0

---
 pkgs/by-name/ag/age-plugin-sss/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ag/age-plugin-sss/package.nix b/pkgs/by-name/ag/age-plugin-sss/package.nix
index 07e727428cfe..d354830d4038 100644
--- a/pkgs/by-name/ag/age-plugin-sss/package.nix
+++ b/pkgs/by-name/ag/age-plugin-sss/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "age-plugin-sss";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "olastor";
     repo = "age-plugin-sss";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QNu2Sp0CxYYXuMzf7X0mMYI677ICu5emOM4F9HlKhHA=";
+    hash = "sha256-XXlnot+oevRJKl0F1uz2DHg3yrtGhlBSlEGOsx/hCMw=";
   };
 
   vendorHash = "sha256-Aw7dwro6adluhQXPlZ9RZVGBAmNw539Z3c+a8TmPTXU=";

From 7482fdacb1b2520e5248e572a22778edca359bdc Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 12 May 2026 00:37:19 +0200
Subject: [PATCH 085/221] iina: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix
index 25c002a44172..51a280835fbc 100644
--- a/pkgs/by-name/ii/iina/package.nix
+++ b/pkgs/by-name/ii/iina/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "iina";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "https://github.com/iina/iina/releases/download/v${finalAttrs.version}/IINA.v${finalAttrs.version}.dmg";
-    hash = "sha256-F3rUaeoSm+2VqCrFm1+1jQoGw1NC/KejfbohSogh+Eg=";
+    hash = "sha256-Lg/Yn7uhySpsEVFx5bUZBIg7tJf75ROmlh0ID7qwj/Y=";
   };
 
   nativeBuildInputs = [ undmg ];

From b59d920e2bec7128c0a3daa673f47b174b7ab91e Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@euxane.eu>
Date: Sun, 29 Mar 2026 13:49:13 +0200
Subject: [PATCH 086/221] scantpaper: init at 3.0.6

---
 pkgs/by-name/sc/scantpaper/package.nix | 115 +++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 pkgs/by-name/sc/scantpaper/package.nix

diff --git a/pkgs/by-name/sc/scantpaper/package.nix b/pkgs/by-name/sc/scantpaper/package.nix
new file mode 100644
index 000000000000..97b06796cba5
--- /dev/null
+++ b/pkgs/by-name/sc/scantpaper/package.nix
@@ -0,0 +1,115 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+  wrapGAppsHook3,
+
+  # libs
+  gobject-introspection,
+  goocanvas_2,
+  unpaper,
+  djvulibre,
+  libtiff,
+  qpdf,
+
+  # tests
+  writableTmpDirAsHomeHook,
+  xvfb,
+  imagemagickBig,
+  poppler-utils,
+  ghostscript,
+  tesseract,
+}:
+
+let
+  runtimeExecDeps = [
+    unpaper
+    tesseract
+    djvulibre
+    libtiff
+    qpdf
+  ];
+
+in
+python3.pkgs.buildPythonApplication rec {
+  pname = "scantpaper";
+  version = "3.0.6";
+
+  src = fetchFromGitHub {
+    owner = "carygravel";
+    repo = "scantpaper";
+    rev = "v${version}";
+    hash = "sha256-MKO5/MIlgjWrL+xUVBe84PgUXUGR0tTxUrJed8LegZc=";
+  };
+
+  pyproject = true;
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  dontWrapGApps = true;
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  postPatch = ''
+    # disable formatting check, which breaks on Black version change
+    substituteInPlace pyproject.toml \
+      --replace "--black" ""
+  '';
+
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies =
+    (with python3.pkgs; [
+      img2pdf
+      ocrmypdf
+      pycairo
+      pygobject3
+      sane
+      tesserocr
+      python-iso639
+    ])
+    ++ [
+      goocanvas_2
+    ];
+
+  nativeBuildInputs = [
+    wrapGAppsHook3
+    gobject-introspection
+    writableTmpDirAsHomeHook
+  ];
+
+  nativeCheckInputs =
+    (with python3.pkgs; [
+      pytestCheckHook
+      pytest-cov # segfault with pytest-cov-stub
+      pytest-mock
+      pytest-xvfb
+      pytest-timeout
+    ])
+    ++ [
+      xvfb
+      imagemagickBig # "big" version needed for text rendering in tests
+      poppler-utils
+      ghostscript
+    ]
+    ++ runtimeExecDeps;
+
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath runtimeExecDeps)
+  ];
+
+  meta = with lib; {
+    description = "GUI to produce PDFs or DjVus from scanned documents";
+    homepage = "https://github.com/carygravel/scantpaper";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ euxane ];
+    platforms = platforms.linux;
+    mainProgram = "scantpaper";
+  };
+}

From 50162d94bb0990dd386d1ac98862a2ad635cd9ee Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 11 May 2026 23:36:02 +0000
Subject: [PATCH 087/221] python3Packages.keras: 3.14.0 -> 3.14.1

Diff: https://github.com/keras-team/keras/compare/v3.14.0...v3.14.1

Changelog: https://github.com/keras-team/keras/releases/tag/v3.14.1
---
 pkgs/development/python-modules/keras/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index caec623e5d16..111d658ee05c 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -37,14 +37,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "keras";
-  version = "3.14.0";
+  version = "3.14.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "keras-team";
     repo = "keras";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EMwqo+0mIwjDY3wKW4idiAczSSPIGjTRNIYlqPDwd+w=";
+    hash = "sha256-BaSD21mj7rPV53qFCOxGjGMm+rVzmfCooqcLcvQZa1U=";
   };
 
   build-system = [

From a3ad76573da2f6e1d262caddf925ff59bff30fe6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 11 May 2026 23:37:31 +0000
Subject: [PATCH 088/221] python3Packages.timm: 1.0.26 -> 1.0.27

Diff: https://github.com/huggingface/pytorch-image-models/compare/v1.0.26...v1.0.27

Changelog: https://github.com/huggingface/pytorch-image-models/blob/v1.0.27/README.md#whats-new
---
 pkgs/development/python-modules/timm/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix
index 57d7e19173b2..2f7167e4b287 100644
--- a/pkgs/development/python-modules/timm/default.nix
+++ b/pkgs/development/python-modules/timm/default.nix
@@ -23,14 +23,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "timm";
-  version = "1.0.26";
+  version = "1.0.27";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "pytorch-image-models";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pbzDoNRRwz41b4X40yBp7oTcJ2e/Y2dKyj9XbEX5c34=";
+    hash = "sha256-Tur4niy89MyMJ8TD7+zBY6x/tmvtYDkruksf65KdTkE=";
   };
 
   # Fix torch 2.11.0 compatibility

From 77c07ab1af06a51ea16684cd58280370e644c54a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 01:02:47 +0000
Subject: [PATCH 089/221] saga: 9.12.2 -> 9.12.3

---
 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 af721759e4e7..163a1b2b9a6d 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "saga";
-  version = "9.12.2";
+  version = "9.12.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz";
-    hash = "sha256-1q7/dBhmXSaj0bEGU8EAOJesR2sfnQPVK6DVL9TD3V0=";
+    hash = "sha256-GLVFk3gaTJ6+AF3Vk201NwzetDI6VTA1Q7sE3KHyqDA=";
   };
 
   sourceRoot = "saga-${finalAttrs.version}/saga-gis";

From 07c476ea531f0453258a6412da96592562379621 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 03:21:32 +0000
Subject: [PATCH 090/221] synology-drive-client: 4.0.2-17889 -> 4.0.3-17892

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

diff --git a/pkgs/by-name/sy/synology-drive-client/package.nix b/pkgs/by-name/sy/synology-drive-client/package.nix
index c73344e4a66e..dae8f02f5720 100644
--- a/pkgs/by-name/sy/synology-drive-client/package.nix
+++ b/pkgs/by-name/sy/synology-drive-client/package.nix
@@ -20,7 +20,7 @@
 let
   pname = "synology-drive-client";
   baseUrl = "https://global.synologydownload.com/download/Utility/SynologyDriveClient";
-  version = "4.0.2-17889";
+  version = "4.0.3-17892";
   buildNumberFn = ver: lib.last (lib.splitString "-" ver);
   meta = {
     description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server";
@@ -50,7 +50,7 @@ let
 
     src = fetchurl {
       url = "${baseUrl}/${finalAttrs.version}/Ubuntu/Installer/synology-drive-client-${buildNumberFn finalAttrs.version}.x86_64.deb";
-      sha256 = "sha256-refsAzqYmKAr107D4HiJViBQE1Qa6QoOECtX+TPjSwU=";
+      sha256 = "sha256-9q7FpZdNWZY+2DP98aDMe+vWEthpH0kcYsuncM3HjWc=";
     };
 
     nativeBuildInputs = [
@@ -138,7 +138,7 @@ let
 
     src = fetchurl {
       url = "${baseUrl}/${finalAttrs.version}/Mac/Installer/synology-drive-client-${buildNumberFn finalAttrs.version}.dmg";
-      sha256 = "sha256-KAoc31Y2RTHu7RWgC61brtoeFR1c+pNi4Odub2JHrfQ=";
+      sha256 = "sha256-+ZJA7r0xYhpu614I1mqILCfYN/8YddEwgWglmmpfB+o=";
     };
 
     nativeBuildInputs = [

From ecfb42134282140d2c34dc245d1df8d5aca535a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 03:26:30 +0000
Subject: [PATCH 091/221] vuls: 0.38.6 -> 0.39.0

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

diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix
index 26326b77d9da..37b71918ab43 100644
--- a/pkgs/by-name/vu/vuls/package.nix
+++ b/pkgs/by-name/vu/vuls/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "vuls";
-  version = "0.38.6";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "future-architect";
     repo = "vuls";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DY2woiaA6RisbOmHMoIr3sLn2kEccru58LGtST/iY3E=";
+    hash = "sha256-pK8bW/1Bq8MCGBRBWt4u6DMFjUitWFbJNr9ekP54X6s=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-s2N6MCcqMfwjW095iwOv8hHcrB6NC6XSkrtdSGWq8bE=";
+  vendorHash = "sha256-Oc1THgqt7MC+mE5X+4tFZPlVQKWaUD4gdxcD1rMfcAI=";
 
   ldflags = [
     "-s"

From d49d2a76bee5cb53c96b33c6b63671677dd3bc4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 03:28:32 +0000
Subject: [PATCH 092/221] libretro.fceumm: 0-unstable-2026-04-20 ->
 0-unstable-2026-05-06

---
 pkgs/applications/emulators/libretro/cores/fceumm.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix
index 43600cf59fca..3abd97a160f1 100644
--- a/pkgs/applications/emulators/libretro/cores/fceumm.nix
+++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fceumm";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-05-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-fceumm";
-    rev = "448a231618186b2af0bb9d6e37aeca05467e112f";
-    hash = "sha256-Kr3DEAk8dsFnUT73pOp5qwkCbcDItQwrRMI8hobrCuI=";
+    rev = "3a84a6fd0ba20dd4877c06b1d58741172148395f";
+    hash = "sha256-4+kEoN0+SWl284n7tIR76aysf0GlLdxELDXfpEK6mi8=";
   };
 
   meta = {

From a5468644af8b3a00f850b979bcc3172572239220 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 03:28:37 +0000
Subject: [PATCH 093/221] python3Packages.alexapy: 1.29.21 -> 1.29.22

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

diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix
index 1cc560e1cecf..0ba4c70a90bd 100644
--- a/pkgs/development/python-modules/alexapy/default.nix
+++ b/pkgs/development/python-modules/alexapy/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "alexapy";
-  version = "1.29.21";
+  version = "1.29.22";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "keatontaylor";
     repo = "alexapy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8oUgttLAhPSB7uysoObxqu0lYre8Y1qg/8m7NhwPazI=";
+    hash = "sha256-mWEotNbG4On7EqwPX5bVWr1ZRi4WdzCwJ06NXc/9RL4=";
   };
 
   pythonRelaxDeps = [ "aiofiles" ];

From 90f30d036c72c63742934d87eb18fbcf7eb8fb02 Mon Sep 17 00:00:00 2001
From: Arthur Azevedo de Amorim <arthur.aa@gmail.com>
Date: Tue, 12 May 2026 00:21:06 -0400
Subject: [PATCH 094/221] coqPackages.deriving: 0.2.2 -> 0.2.3

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 pkgs/development/coq-modules/deriving/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix
index 043005105356..bc8176069916 100644
--- a/pkgs/development/coq-modules/deriving/default.nix
+++ b/pkgs/development/coq-modules/deriving/default.nix
@@ -26,6 +26,7 @@ mkCoqDerivation {
     lib.switch
       [ coq.coq-version ssreflect.version ]
       [
+        (case (range "8.17" "9.1") (range "2.0.0" "2.5.0") "0.2.3")
         (case (range "8.17" "9.1") (range "2.0.0" "2.5.0") "0.2.2")
         (case (range "8.17" "9.0") (range "2.0.0" "2.3.0") "0.2.1")
         (case (range "8.17" "8.20") (range "2.0.0" "2.2.0") "0.2.0")
@@ -35,6 +36,7 @@ mkCoqDerivation {
 
   releaseRev = v: "v${v}";
 
+  release."0.2.3".sha256 = "sha256-LqrSlML5pA84FGY4C/xm1EKSgjDe+NaQCSFg2ggdPHE=";
   release."0.2.2".sha256 = "sha256-qsbyQ4spg5vVLZkechb2LoBazGjMh7pR9sSS0s7tXxs=";
   release."0.2.1".sha256 = "sha256-053bNa3rcy0fCs9CQoKPxDLXnKRHzteyClLDURpaZJo=";
   release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM=";

From 1fbb89002ab09ee2277f0c6fd2ce9304b9ac098e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 05:37:42 +0000
Subject: [PATCH 095/221] wavelog: 2.4 -> 2.4.2

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

diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix
index 964d42178027..1ddda41c5c86 100644
--- a/pkgs/by-name/wa/wavelog/package.nix
+++ b/pkgs/by-name/wa/wavelog/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "wavelog";
-  version = "2.4";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "wavelog";
     repo = "wavelog";
     tag = finalAttrs.version;
-    hash = "sha256-ELCLVZ0CiXcefxDKpE3AODDzDCgnljXY/ooy0U+ut54=";
+    hash = "sha256-qEGqAPRDXxO33CUfoIG1PjigEDhhCRTAvilrKZ1bvfI=";
   };
 
   installPhase = ''

From fc95fc0b7a9eb35ef25c3706290186fa1a18e41d Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 12 May 2026 01:34:41 -0400
Subject: [PATCH 096/221] fish: Use buildPackages.python3.withPackages

---
 pkgs/by-name/fi/fish/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 9ecccf3a9402..874b108f6471 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  buildPackages,
   coreutils,
   darwin,
   glibcLocales,
@@ -280,7 +281,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     rustc
     rustPlatform.cargoSetupHook
-    (python3.withPackages (ps: [
+    (buildPackages.python3.withPackages (ps: [
       ps.pexpect
       ps.sphinx
     ]))

From 3b42c56c435cbbb9162707bc9fe4a53426ccff51 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 12 May 2026 01:48:26 -0400
Subject: [PATCH 097/221] fish: Use native fish for docs building

---
 pkgs/by-name/fi/fish/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 874b108f6471..f75774a57b26 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -9,6 +9,7 @@
   gnused,
   gnugrep,
   gawk,
+  fish,
   man-db,
   ninja,
   getent,
@@ -287,6 +288,13 @@ stdenv.mkDerivation (finalAttrs: {
     ]))
     # Avoid warnings when building the manpages about HOME not being writable
     writableTmpDirAsHomeHook
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    # Building the docs ends up wanting to run fish_indent at build
+    # time, which obviously can't use a cross compiled fish_indent
+    # from this derivation. Pull in the build platform's fish to
+    # provide it.
+    fish
   ];
 
   buildInputs = [

From 19d7d720740b32568f33822c9cf4523fec23bcc3 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 12 May 2026 08:31:04 +0200
Subject: [PATCH 098/221] jaq: add stable release regex to update script

to avoid updating to pre-release versions.
For example: https://github.com/NixOS/nixpkgs/pull/518560
---
 pkgs/by-name/ja/jaq/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix
index 545594988841..9aca0ac88eef 100644
--- a/pkgs/by-name/ja/jaq/package.nix
+++ b/pkgs/by-name/ja/jaq/package.nix
@@ -28,7 +28,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
 
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [ "--version-regex=^v(\\d+\\.\\d+\\.\\d+)$" ];
+    };
     tests.simple =
       runCommand "jaq-test"
         {

From 0414ba635db3df854dda606981492b7a33b0bc43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 06:45:01 +0000
Subject: [PATCH 099/221] python3Packages.jupyterhub: 5.4.5 -> 5.4.6

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

diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index b7b9109a7278..bd3939370266 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -51,7 +51,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "jupyterhub";
-  version = "5.4.5";
+  version = "5.4.6";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -59,7 +59,7 @@ buildPythonPackage (finalAttrs: {
     owner = "jupyterhub";
     repo = "jupyterhub";
     tag = finalAttrs.version;
-    hash = "sha256-MdwH9IAV12GqmWc0tfCUi2NA5sT0BFlwCr20JVRzduU=";
+    hash = "sha256-ndL5pE332VDlCk16XYUDaXhsg/J8ndGtgDhKct+y26c=";
   };
 
   npmDeps = fetchNpmDeps {

From 29314531c4bb0d1ce30443ebd64490ded25280eb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 12 May 2026 08:14:56 +0200
Subject: [PATCH 100/221] =?UTF-8?q?ocamlPackages.ca-certs:=201.0.1=20?=
 =?UTF-8?q?=E2=86=92=201.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix
index 8c741e1931b9..4645f8971396 100644
--- a/pkgs/development/ocaml-modules/ca-certs/default.nix
+++ b/pkgs/development/ocaml-modules/ca-certs/default.nix
@@ -16,13 +16,11 @@
 
 buildDunePackage (finalAttrs: {
   pname = "ca-certs";
-  version = "1.0.1";
-
-  minimalOCamlVersion = "4.08";
+  version = "1.0.3";
 
   src = fetchurl {
     url = "https://github.com/mirage/ca-certs/releases/download/v${finalAttrs.version}/ca-certs-${finalAttrs.version}.tbz";
-    hash = "sha256-0818j1SLrs7yCNQlh3qBHYmOx9HZxL3qb3hlLHyDYcw=";
+    hash = "sha256-At/J53cLGCGN8uJRGScR3UTFhYrSRXVpOxRas9fUHCk=";
   };
 
   propagatedBuildInputs = [

From d3e90001a881f47cce38819aa1443ba0be2f256d Mon Sep 17 00:00:00 2001
From: Lyna <git@blooym.dev>
Date: Tue, 12 May 2026 08:38:39 +0100
Subject: [PATCH 101/221] porxie: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/by-name/po/porxie/package.nix b/pkgs/by-name/po/porxie/package.nix
index 4eade1cf6aa3..8a0369e2026e 100644
--- a/pkgs/by-name/po/porxie/package.nix
+++ b/pkgs/by-name/po/porxie/package.nix
@@ -11,15 +11,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "porxie";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromCodeberg {
     owner = "Blooym";
     repo = "porxie";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-BLlsvzmAQj/N1pmw+ZMBmC48O4SPvvLWDD198ihXR+k=";
+    hash = "sha256-mClUYDBgOtX0WcCG0rXhgnKFqnvE2UOFH3PABeF+pkI=";
   };
-  cargoHash = "sha256-4gRC7ZXok9oshUCkDBhxtbnxma224smaL4GcCgdCkSc=";
+  cargoHash = "sha256-SImynSnWJ/tiEoSYuFYQ/JncMeierAioZO2Fnx6FHN4=";
 
   buildInputs = [ rust-jemalloc-sys ];
 

From 670fdf6db990b900bb7584f2f27c70e6c02da3a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 07:53:10 +0000
Subject: [PATCH 102/221] terraform-providers.aiven_aiven: 4.55.2 -> 4.56.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 68bccf2ae7e9..2dff01e29c48 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -27,13 +27,13 @@
     "vendorHash": null
   },
   "aiven_aiven": {
-    "hash": "sha256-0f+ZxjMoPyOL4qatcRVk8jjn9TAZkinUX7eYQ1hv+FQ=",
+    "hash": "sha256-ni4Y5MRnu6AL491wRD8UoQ4MJmnopumYoq59wGujSUQ=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.55.2",
+    "rev": "v4.56.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-toCbbqzi0h6hUeyKMClUBcWsh8+H00K0IjdkgZ5HmOs="
+    "vendorHash": "sha256-vSSgABGm1aHGVPIsNXylpan8E07eOQ/Nc8Lf1N3+P5c="
   },
   "akamai_akamai": {
     "hash": "sha256-/+IE06obx4Rxzz3uh5QbeS/FhGlK2qTJJFWGAlDWJaw=",

From 5e77c83b0428ac08166f4376b10b87dff2e26867 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 07:54:25 +0000
Subject: [PATCH 103/221] terraform-providers.hashicorp_google-beta: 7.30.0 ->
 7.31.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 68bccf2ae7e9..f228ab5da339 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -580,13 +580,13 @@
     "vendorHash": "sha256-UoS4iIVHhCQ+Zk+SJmsMHJgJBKLMbfMVmtm4MDmzT68="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-ltqZ6nyl/leYsV2pBJVgOtcOYIyfDmDLsZLfHTPOyew=",
+    "hash": "sha256-/HxUOhDATteiUDIeA8zvGI9xQ5rOWJAhLN9PLHiBFfI=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.30.0",
+    "rev": "v7.31.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-WMfT/gtjRDACXWDf1w3cUiEUdeFrGAnYvDQcuXiQNkk="
+    "vendorHash": "sha256-5PnJ87cGMCwEl7zEwjbzgU5kZO9IC4Ls47HX2SZ2h2w="
   },
   "hashicorp_helm": {
     "hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",

From 12461a3912e07e5f70100870fd2b7a2034ae4d60 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 12 May 2026 07:45:19 +0000
Subject: [PATCH 104/221] nixl: 1.0.1 -> 1.1.0

Diff: https://github.com/ai-dynamo/nixl/compare/v1.0.1...v1.1.0

Changelog: https://github.com/ai-dynamo/nixl/releases/tag/v1.1.0
---
 pkgs/by-name/ni/nixl/package.nix                 | 6 ++++--
 pkgs/development/python-modules/nixl/default.nix | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixl/package.nix b/pkgs/by-name/ni/nixl/package.nix
index 9df2e2b9990c..43ffdcef4e1f 100644
--- a/pkgs/by-name/ni/nixl/package.nix
+++ b/pkgs/by-name/ni/nixl/package.nix
@@ -21,6 +21,7 @@
   liburing,
   numactl,
   taskflow,
+  tomlplusplus,
   ucx,
 
   # passthru
@@ -35,7 +36,7 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "nixl";
-  version = "1.0.1";
+  version = "1.1.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -44,7 +45,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     owner = "ai-dynamo";
     repo = "nixl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mDpDqwUwI0baIDDpt9/wgIP3saBWY8yWKgwzHgrzJiU=";
+    hash = "sha256-lzR+haBtRPUJ9VE1AcPndp3CPtW7KCI3nNPeVIGyR0U=";
   };
 
   postPatch =
@@ -103,6 +104,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     liburing
     numactl
     taskflow
+    tomlplusplus
     ucx
 
     python3Packages.python
diff --git a/pkgs/development/python-modules/nixl/default.nix b/pkgs/development/python-modules/nixl/default.nix
index 8aa00155a58d..a2fb72e2ea57 100644
--- a/pkgs/development/python-modules/nixl/default.nix
+++ b/pkgs/development/python-modules/nixl/default.nix
@@ -50,6 +50,7 @@ buildPythonPackage.override { inherit (nixl) stdenv; } (finalAttrs: {
     pytest
     pyyaml
     setuptools
+    torch
     types-pyyaml
   ];
   dontUseMesonConfigure = true;

From e872bce769a39d20d10fd39608a0b160b5df1fee Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 12 May 2026 09:56:57 +0200
Subject: [PATCH 105/221] zensical: 0.0.39 -> 0.0.41

---
 pkgs/by-name/ze/zensical/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix
index 4712b614b36e..a2b647083d4d 100644
--- a/pkgs/by-name/ze/zensical/package.nix
+++ b/pkgs/by-name/ze/zensical/package.nix
@@ -8,7 +8,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "zensical";
-  version = "0.0.39";
+  version = "0.0.41";
   pyproject = true;
 
   # We fetch from PyPi, because GitHub repo does not contain all sources.
@@ -16,12 +16,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
   # We could combine sources, but then nix-update won't work.
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-KocTxUNirbCIHpsFFLWtmmljJHVmmd7bVfocvzzMDto=";
+    hash = "sha256-bDyQMBEjdJ38JqIQ1sCA8GkSU8fHZa0wihC0UYNppv4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-dsmb65a/dDQJXxPqM2re1w9NkomuL4JtJm0c09rN4BI=";
+    hash = "sha256-pfDqqtD0kKGVKkv7DvEUKpdDYk9xvRs5gmLCafFHrhs=";
   };
 
   nativeBuildInputs = with rustPlatform; [
@@ -32,6 +32,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   dependencies = with python3Packages; [
     click
     deepmerge
+    jinja2
     markdown
     pygments
     pymdown-extensions

From 517ec842a7e2f7ec6075c7a96a9f1b83613f91b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 08:17:03 +0000
Subject: [PATCH 106/221] nexttrace: 1.6.4 -> 1.6.5

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

diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix
index 31becd409076..aa95a3d9d8d0 100644
--- a/pkgs/by-name/ne/nexttrace/package.nix
+++ b/pkgs/by-name/ne/nexttrace/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "nexttrace";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "nxtrace";
     repo = "NTrace-core";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-atouv41R49HVJui60ivh1OPIDFwtILdu4BU+x0cLVQ4=";
+    sha256 = "sha256-PpCWTak14Y2zZBYOtCHEjNtvrXo6JOAo/ddYrJZMou8=";
   };
-  vendorHash = "sha256-U0OXsZ9eME2paV8+DuPGYuNdaPnfmc4AdaT6cri3Nlw=";
+  vendorHash = "sha256-8evslWY5EgZT5ah63t6UmREUgkuY8aYwdsox4xxyKiA=";
 
   buildInputs = [ libpcap ];
 

From 93fdf921bc1e6b770aafd7663c1a38f5b95bd0cc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 12 May 2026 08:02:17 +0000
Subject: [PATCH 107/221] python3Packages.tensorflow-datasets: 4.9.9 -> 4.9.10

Diff: https://github.com/tensorflow/datasets/compare/v4.9.9...v4.9.10

Changelog: https://github.com/tensorflow/datasets/releases/tag/v4.9.10
---
 .../tensorflow-datasets/default.nix           | 53 +++----------------
 1 file changed, 7 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
index 5dde0d7682e1..5191764018e8 100644
--- a/pkgs/development/python-modules/tensorflow-datasets/default.nix
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -2,9 +2,9 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
 
   # build system
+  packaging,
   setuptools,
 
   # dependencies
@@ -64,58 +64,22 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tensorflow-datasets";
-  version = "4.9.9";
+  version = "4.9.10";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "tensorflow";
     repo = "datasets";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZXaPYmj8aozfe6ygzKybId8RZ1TqPuIOSpd8XxnRHus=";
+    hash = "sha256-nq0c5hBTVwkxCRvWxtnfI+AHD+URY+nNfZAurEGaLXk=";
   };
 
-  patches = [
-    # TypeError: Cannot handle this data type: (1, 1, 4), <u2
-    # Issue: https://github.com/tensorflow/datasets/issues/11148
-    # PR: https://github.com/tensorflow/datasets/pull/11149
-    (fetchpatch2 {
-      name = "fix-pillow-12-compat";
-      url = "https://github.com/tensorflow/datasets/pull/11149/commits/21062d65b33978f2263443280c03413add5c0224.patch";
-      hash = "sha256-GWb+1E5lQNhFVp57sqjp+WqzZSva1AGpXe9fbvXXeIA=";
-    })
+  build-system = [
+    packaging
+    setuptools
   ];
 
-  postPatch =
-    # AttributeError: 'google._upb._message.FieldDescriptor' object has no attribute 'label'
-    ''
-      substituteInPlace tensorflow_datasets/core/dataset_info.py \
-        --replace-fail \
-          "elif field.label == field.LABEL_REPEATED:" \
-          "elif hasattr(field_value, 'extend'):"
-    ''
-    # mlcroissant 1.1.0 requires leaf fields to define `source` or `value`
-    + ''
-      substituteInPlace tensorflow_datasets/core/utils/croissant_utils_test.py \
-        --replace-fail \
-          "references=mlc.Source(field='splits/name')," \
-          "references=mlc.Source(field='splits/name'), source=mlc.Source(field='splits/name')," \
-        --replace-fail \
-          "references=mlc.Source(field='labels/label')," \
-          "references=mlc.Source(field='labels/label'), source=mlc.Source(field='labels/label'),"
-    ''
-    # TypeError: only 0-dimensional arrays can be converted to Python scalars
-    + ''
-      substituteInPlace tensorflow_datasets/datasets/smallnorb/smallnorb_dataset_builder.py \
-        --replace-fail \
-          "magic = int(np.frombuffer(s, dtype=int32_dtype, count=1))" \
-          "magic = int(np.squeeze(np.frombuffer(s, dtype=int32_dtype, count=1)))" \
-        --replace-fail \
-          "ndim = int(np.frombuffer(s, dtype=int32_dtype, count=1, offset=4))" \
-          "ndim = int(np.squeeze(np.frombuffer(s, dtype=int32_dtype, count=1, offset=4)))"
-    '';
-
-  build-system = [ setuptools ];
-
   dependencies = [
     absl-py
     array-record
@@ -231,9 +195,6 @@ buildPythonPackage (finalAttrs: {
     "tensorflow_datasets/core/dataset_utils_test.py"
     "tensorflow_datasets/core/features/sequence_feature_test.py"
 
-    # Requires `tensorflow_docs` which is not packaged in `nixpkgs` and the test is for documentation anyway.
-    "tensorflow_datasets/scripts/documentation/build_api_docs_test.py"
-
     # Not a test, should not be executed.
     "tensorflow_datasets/testing/test_utils.py"
 

From e1de4f46292cc8d1b895889030cb40598d5c17b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 02:22:58 +0000
Subject: [PATCH 108/221] python3Packages.chatlas: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/development/python-modules/chatlas/default.nix b/pkgs/development/python-modules/chatlas/default.nix
index 19018d8f821f..5a5fb904d00f 100644
--- a/pkgs/development/python-modules/chatlas/default.nix
+++ b/pkgs/development/python-modules/chatlas/default.nix
@@ -31,14 +31,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "chatlas";
-  version = "0.16.0";
+  version = "0.17.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "chatlas";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8dME+zY+yzPiUK2WUKlOJS6GF7UA2qSym617P2DoV68=";
+    hash = "sha256-wf+YYC7coJ9euOXIP9Oq7k2z8zhLZdfjVM+yxmM9MAY=";
   };
 
   build-system = [

From 1b3291df7eb62ce5a0f579018396c8355f92dc7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 08:27:55 +0000
Subject: [PATCH 109/221] wasm-language-tools: 0.10.4 -> 0.10.7

---
 .../extensions/gplane.wasm-language-tools/default.nix       | 4 ++--
 pkgs/by-name/wa/wasm-language-tools/package.nix             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix b/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix
index fe6f30fa0b53..543b8ef5fa53 100644
--- a/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix
@@ -14,8 +14,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "gplane";
     name = "wasm-language-tools";
-    version = "1.16.0";
-    hash = "sha256-H2exVPaF8tYdpXBcooFi5bysp85OLOwxbKrB3HJes0Y=";
+    version = "1.20.0";
+    hash = "sha256-AXLwEp6uospVZwd2NxLEfABsNQOt1uRJTQ4HMTXbrJc=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/wa/wasm-language-tools/package.nix b/pkgs/by-name/wa/wasm-language-tools/package.nix
index 028de3651040..904bb262eab3 100644
--- a/pkgs/by-name/wa/wasm-language-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-language-tools/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasm-language-tools";
-  version = "0.10.4";
+  version = "0.10.7";
 
   src = fetchFromGitHub {
     owner = "g-plane";
     repo = "wasm-language-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0E4bifmjx0sr9pp8vycqS0EcTI73A90hiyLTAlkw954=";
+    hash = "sha256-iPZAF4BJ+uVUADsltJpkjc1O1X4dJOIQB5V6Nv5L3TU=";
   };
 
-  cargoHash = "sha256-nN07OSzq29Z08o0s5ozGQAI0Dh/125UmFO7G+28B8Qc=";
+  cargoHash = "sha256-KrKtTcQFVHaaxTxozszH7V3qkOK/EVrCk17OWGkJa3E=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/wat_server";

From eeef7c4c904878c2aacfe6e5cd202e16c1805e97 Mon Sep 17 00:00:00 2001
From: samooyo <samidarnaud@gmail.com>
Date: Tue, 12 May 2026 10:42:30 +0200
Subject: [PATCH 110/221] foundry: 1.5.1 -> 1.7.0

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

diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix
index aad6d8bfde95..04791ba1efeb 100644
--- a/pkgs/by-name/fo/foundry/package.nix
+++ b/pkgs/by-name/fo/foundry/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "foundry";
-  version = "1.5.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "foundry-rs";
     repo = "foundry";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dMYuv5noIn86WuUJkUixnoNGLgByacung/TBU+EYhUw=";
+    hash = "sha256-UCaBo4hMStmh79UiyYu7vEO7UtrvwJshe4PTMkqZV0w=";
   };
 
-  cargoHash = "sha256-+5RLCkAQR8UepdUIsq1FnQmjKMg7YNC1Sxu0CVpWcnc=";
+  cargoHash = "sha256-iAWUEVgOgn2Zw9fINxyH9Bynh+flzCY40YFGoVLgG8k=";
 
   nativeBuildInputs = [
     pkg-config

From e222ae734e1540d481aec129397f47d0f7dea7c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 08:48:49 +0000
Subject: [PATCH 111/221] reproxy: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/by-name/re/reproxy/package.nix b/pkgs/by-name/re/reproxy/package.nix
index 7eef6040875a..23850ea81c48 100644
--- a/pkgs/by-name/re/reproxy/package.nix
+++ b/pkgs/by-name/re/reproxy/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "reproxy";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "reproxy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nJAE2oEoIzuRFRlgypRROXZYfQy3y2m14QbBUUGQBSg=";
+    hash = "sha256-eAxksLPCQrmKRKNlFhDb5dfXSaa9o/rexM1n+CiPZvw=";
   };
 
   vendorHash = null;

From 3256c2ecc983cb3fd11e5c0f6bc87963e0794cf6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 09:00:05 +0000
Subject: [PATCH 112/221] melonds: 1.1-unstable-2026-04-30 ->
 1.1-unstable-2026-05-11

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

diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix
index 36a715ebc1b2..fb2b1df4da1d 100644
--- a/pkgs/by-name/me/melonds/package.nix
+++ b/pkgs/by-name/me/melonds/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonds";
-  version = "1.1-unstable-2026-04-30";
+  version = "1.1-unstable-2026-05-11";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "a4d41faae34da170a19aad859e748af0aafa2e6d";
-    hash = "sha256-dqtjgOMwDp90p4HytNYDTvCIWr2vrPWNqZBX3M9Wc4o=";
+    rev = "889e26e9490c828b039387e8a2ef04079b86801d";
+    hash = "sha256-mMeBDsZcljG4FAhkpYlQwfUjA0HMZKNlIx6ndkhn4C0=";
   };
 
   nativeBuildInputs = [

From a792d9125a813af5e6fb904abbfc7d39a5079a42 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 09:11:43 +0000
Subject: [PATCH 113/221] libretro.genesis-plus-gx: 0-unstable-2026-05-01 ->
 0-unstable-2026-05-08

---
 .../emulators/libretro/cores/genesis-plus-gx.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index be2b54bda5b9..0aa598cb972f 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2026-05-01";
+  version = "0-unstable-2026-05-08";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "252694adb9ebf2abcc7a1340d4078dce53d8954f";
-    hash = "sha256-mFij3fLDMvyby3ata47YJN7YuBKGv4/xphFQDiFKY3A=";
+    rev = "fa993f040d7150bda672b3e3ebe36c9bd2ea8904";
+    hash = "sha256-4igo4uwpDwbP6oTtlF6pwDF7+WZ0FgeFCtmPVNpULBo=";
   };
 
   meta = {

From 74bbaab6d199b49be95775123439d5b149e6ff45 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 12 May 2026 11:37:30 +0200
Subject: [PATCH 114/221] xdp-tools: backport musl fix

---
 pkgs/by-name/xd/xdp-tools/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/xd/xdp-tools/package.nix b/pkgs/by-name/xd/xdp-tools/package.nix
index 1e5e8067a0a0..23e2125719e7 100644
--- a/pkgs/by-name/xd/xdp-tools/package.nix
+++ b/pkgs/by-name/xd/xdp-tools/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPackages,
   fetchFromGitHub,
+  fetchpatch,
   libbpf,
   elfutils,
   zlib,
@@ -26,6 +27,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-wLSLDgACl6a6gQLvRiRR9HQFRMrGWYZAa5CcdzECExE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "musl.patch";
+      url = "https://github.com/xdp-project/xdp-tools/commit/2ff228be7926ba01e13c8d328828a270af2e7e0d.patch";
+      hash = "sha256-jYdcC36nL4P4IadwGfva8nqMerd/2HHw2RYhc+wR9nk=";
+    })
+  ];
+
   outputs = [
     "out"
     "lib"

From 15eb8c038978d01fe11ea67993dc12bb85173fea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 10:08:03 +0000
Subject: [PATCH 115/221] mycelium: 0.7.6 -> 0.7.7

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

diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix
index 7c0438c778c5..2350248cad8a 100644
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mycelium";
-  version = "0.7.6";
+  version = "0.7.7";
 
   sourceRoot = "${finalAttrs.src.name}/myceliumd";
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "threefoldtech";
     repo = "mycelium";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6A93ySGmnkqu+TrPsIZJNl4iw26yrUW89TkkfouArn0=";
+    hash = "sha256-amw0DkPT7As7L9Zhts+s4g3N67uu/BDZmbJXapr89XQ=";
   };
 
-  cargoHash = "sha256-Firp6R8JZXTzJhV2Psve0kmxP6bT74xHjNq8/q0/pOc=";
+  cargoHash = "sha256-Shi7AbyuvWwWOm9RuUYYLS/wEqZ7/YiOo+8m2XDFAnM=";
 
   nativeBuildInputs = [ versionCheckHook ];
 

From 8124b02ad58bfb396ebb527976b0b7a4a95113d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 10:31:46 +0000
Subject: [PATCH 116/221] aws-vault: 7.10.4 -> 7.10.7

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

diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index e81a44126884..be3e2d934b63 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "aws-vault";
-  version = "7.10.4";
+  version = "7.10.7";
 
   src = fetchFromGitHub {
     owner = "ByteNess";
     repo = "aws-vault";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Feb/GFi5bpfZQcBW7ydNgCXZJZHeu7Iv352i9UwVgE8=";
+    hash = "sha256-lpk19VhnhC+aKutThzHGUKq4bveFm+Jn64/eqL+/lrE=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-ogAwkoOw/Toh1JtAjcZHxu2MzzDlv33tfoOYCeV0vN0=";
+  vendorHash = "sha256-Qxgi6wa5NZ8hseLSlFa52WWH1BiB04YZmoqk7KRdVuk=";
 
   nativeBuildInputs = [
     installShellFiles

From 8cabfa08669c19caa186dcea022aa1e66e17e998 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 10:34:00 +0000
Subject: [PATCH 117/221] xremap: 0.15.5 -> 0.15.6

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

diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index cf54185a3ac1..83477f245cdf 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -58,13 +58,13 @@ assert (
 );
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xremap${variant.suffix or ""}";
-  version = "0.15.5";
+  version = "0.15.6";
 
   src = fetchFromGitHub {
     owner = "xremap";
     repo = "xremap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DwI0y344MLsbz1V2yok2vrFF774xybUrD/g+euF13Nk=";
+    hash = "sha256-/Hd12d4F9Ocv7Rj1q+KsKdb2T3eq7odOhfZTMgKLZ5o=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildNoDefaultFeatures = true;
   buildFeatures = variant.features;
 
-  cargoHash = "sha256-Q+riJ7fbbSj0Dspm4cNp0uYlDa0bmj4wsYVm8uzWKu0=";
+  cargoHash = "sha256-Qsql2BJGM6Knvnm8NMtCMOvplHU04CxxwrzedSxUA1I=";
 
   passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
 

From 707bac656942f208a473fae51c9b1d0a695e2eb4 Mon Sep 17 00:00:00 2001
From: NullString1 <kernd2005@gmail.com>
Date: Tue, 10 Mar 2026 13:27:11 +0000
Subject: [PATCH 118/221] objection: fix missing android dependencies and
 objection agent

---
 pkgs/by-name/ob/objection/package.nix | 120 ++++++++++++++++++++++++--
 1 file changed, 113 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ob/objection/package.nix b/pkgs/by-name/ob/objection/package.nix
index c2c445f742ca..08b5f65a2bc6 100644
--- a/pkgs/by-name/ob/objection/package.nix
+++ b/pkgs/by-name/ob/objection/package.nix
@@ -2,14 +2,20 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  fetchurl,
   frida-tools,
+  apktool,
+  aapt,
+  apksigner,
+  android-tools,
+  androidenv,
+  makeWrapper,
+  buildNpmPackage,
+  stdenv,
 }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "objection";
+let
+  androidComposition = androidenv.composeAndroidPackages { };
   version = "1.12.4";
-  pyproject = true;
-
   src = fetchFromGitHub {
     owner = "sensepost";
     repo = "objection";
@@ -17,16 +23,98 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-sXMhLwTsksLRFBGEsKSmDaD0+uDugz2U3yn50rHFbnQ=";
   };
 
+  fridaVersion = "17.5.1";
+
+  supportedPlatforms = {
+    x86_64-linux = {
+      fridaArch = "linux-x64";
+      fridaHash = "sha256-g7uZs/fUwraIu6SZaU9kGGVuzD/nyqmXHVp0zL3jhdY=";
+    };
+    aarch64-linux = {
+      fridaArch = "linux-arm64";
+      fridaHash = "sha256-BsCgpHS3IFMPciu9hsdu9vWwKu+pon+EtqF10NO1EAc=";
+    };
+    armv7l-linux = {
+      fridaArch = "linux-armv7l";
+      fridaHash = "sha256-mNl+kP+9a4AC2Tf1SM7mYL5b+j4pPz+E9R88JjLgifE=";
+    };
+    i686-linux = {
+      fridaArch = "linux-ia32";
+      fridaHash = "sha256-vLwf+EwWNDLznda8J+xVqp8XmuivdZ0VKgISR9YoQR0=";
+    };
+    x86_64-darwin = {
+      fridaArch = "darwin-x64";
+      fridaHash = "sha256-raODa/EHRpMYNwFK9gxTXWrxnx1G1IbKTKV1343MTm8=";
+    };
+    aarch64-darwin = {
+      fridaArch = "darwin-arm64";
+      fridaHash = "sha256-mR6HM9rmRmXhWqXA0GC4Xkdj9KVSthhtvMAzijE+j5c=";
+    };
+    x86_64-freebsd = {
+      fridaArch = "freebsd-x64";
+      fridaHash = "sha256-ddvUtdZJdVH9O7np04ayB/Nebxq4Raw0eAQJpFAFl6Q=";
+    };
+  };
+
+  currentPlatform =
+    supportedPlatforms.${stdenv.hostPlatform.system}
+      or (throw "frida Node.js binding: unsupported system ${stdenv.hostPlatform.system}");
+
+  fridaNodeBinding = fetchurl {
+    url = "https://github.com/frida/frida/releases/download/${fridaVersion}/frida-v${fridaVersion}-napi-v8-${currentPlatform.fridaArch}.tar.gz";
+    hash = currentPlatform.fridaHash;
+  };
+
+  runtimeTools = [
+    apktool
+    aapt
+    apksigner
+    android-tools
+  ];
+
+  agent = buildNpmPackage {
+    pname = "objection-agent";
+    inherit version src;
+    sourceRoot = "source/agent";
+
+    npmDepsHash = "sha256-oG0uMhy6Gv2lc1SNJwqnvYRdhhqWwPMY0MCDMt2hPf0=";
+
+    npmRebuildFlags = [ "--ignore-scripts" ];
+
+    postPatch = ''
+      substituteInPlace package.json \
+        --replace-fail '"frida-compile src/index.ts -o ../objection/agent.js -T none"' \
+                       '"frida-compile src/index.ts -o ./agent.js -T none"'
+    '';
+
+    preBuild = ''
+      mkdir -p node_modules/frida
+      tar -xzf ${fridaNodeBinding} -C node_modules/frida
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm644 agent.js $out/agent.js
+      runHook postInstall
+    '';
+  };
+in
+python3Packages.buildPythonApplication {
+  pname = "objection";
+  inherit version src;
+  pyproject = true;
+
   build-system = with python3Packages; [
     setuptools
   ];
 
-  buildInputs = [
-    frida-tools
+  nativeBuildInputs = [
+    makeWrapper
   ];
 
   dependencies = with python3Packages; [
     frida-python
+    frida-tools
     prompt-toolkit
     click
     tabulate
@@ -48,6 +136,23 @@ python3Packages.buildPythonApplication rec {
 
   pythonRuntimeDepsCheck = true;
 
+  postUnpack = ''
+    cp ${agent}/agent.js $sourceRoot/objection/
+  '';
+
+  postFixup = ''
+    mkdir -p "$out/bin-wrapped"
+    ln -s "${aapt}/bin/aapt2" "$out/bin-wrapped/aapt"
+    BUILD_TOOLS_PATH="${androidComposition.androidsdk}/libexec/android-sdk/build-tools"
+    if [ -d "$BUILD_TOOLS_PATH" ]; then
+      LATEST_BUILD_TOOLS=$(ls -d "$BUILD_TOOLS_PATH"/* 2>/dev/null | sort -V | tail -1)
+      [ -n "$LATEST_BUILD_TOOLS" ] && ln -s "$LATEST_BUILD_TOOLS/zipalign" "$out/bin-wrapped/zipalign" 2>/dev/null || true
+    fi
+
+    wrapProgram $out/bin/objection \
+      --prefix PATH : "$out/bin-wrapped:${lib.makeBinPath runtimeTools}"
+  '';
+
   meta = {
     description = "Runtime mobile exploration toolkit, powered by Frida";
     longDescription = ''
@@ -60,5 +165,6 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ nullstring1 ];
     mainProgram = "objection";
+    platforms = builtins.attrNames supportedPlatforms;
   };
 }

From f8845994760dc4a5a91a66253c01cf697b880167 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 11:09:14 +0000
Subject: [PATCH 119/221] thunderbird-latest-unwrapped: 150.0.1 -> 150.0.2

---
 .../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 6ea375646a63..e8a2b74c4156 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -73,8 +73,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "150.0.1";
-    sha512 = "bf3d33357965cd144decef7c8865b6c18043502aea8d090d93fe29555379b924e3925d58276411f38fdcdc87b54ab3ae7d6aa6619feec9b856f8f227225cb375";
+    version = "150.0.2";
+    sha512 = "3e52220ff34aa6cd1bf46a910dba1f30d0abf7d19ed7f501ffeeb8f5901b8d97fdc0adb0cceb434ef8e83c7f7b83f28024b872280237af72ff2da9d89fafe065";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";

From e2ba981d086ec77e5117b9aac9df2500e9626e5a Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 12 May 2026 13:40:54 +0200
Subject: [PATCH 120/221] woodpecker-{agent,cli,server}: 3.14.0 -> 3.14.1

---
 .../tools/continuous-integration/woodpecker/common.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index 66ececb749ba..51869f9e65cb 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 let
-  version = "3.14.0";
+  version = "3.14.1";
   vendorHash = "sha256-fibx+Ky2cfP71tPzeiDybx+0f/+XvZbDXC7PAWQMRIY=";
   nodeModulesHash = "sha256-wQUOUB5uhWbdEP1nP02ihRZf3F1sEvQeZTDxOa5P1lQ=";
 in
@@ -11,7 +11,7 @@ in
     owner = "woodpecker-ci";
     repo = "woodpecker";
     tag = "v${version}";
-    hash = "sha256-FFGNjQa4W6T1BmbNh3rD1m7vtJFBWmgxocRV+OO5ZfA=";
+    hash = "sha256-D9AC9D8O3n420yvEzYhV7ev7dLZULAZ55iUWDmla4z0=";
   };
 
   postInstall = ''

From 57cd12fadb66b5aa924e08f0355abd7b87900997 Mon Sep 17 00:00:00 2001
From: samooyo <samidarnaud@gmail.com>
Date: Tue, 12 May 2026 13:46:50 +0200
Subject: [PATCH 121/221] maintainers: add samooyo

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2e12985a6319..26cc7397306c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24325,6 +24325,12 @@
     githubId = 12882091;
     name = "Sam L. Yes";
   };
+  samooyo = {
+    email = "samidarnaud@gmail.com";
+    github = "samooyo";
+    githubId = 46531012;
+    name = "Sami Darnaud";
+  };
   samrose = {
     email = "samuel.rose@gmail.com";
     github = "samrose";

From c8310e46bf61fe5919650976ca860ba5ede9937b Mon Sep 17 00:00:00 2001
From: samooyo <samidarnaud@gmail.com>
Date: Tue, 12 May 2026 13:47:00 +0200
Subject: [PATCH 122/221] foundry: adopt strictDeps and __structuredAttrs

---
 pkgs/by-name/fo/foundry/package.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix
index 04791ba1efeb..c9e1947cf4a3 100644
--- a/pkgs/by-name/fo/foundry/package.nix
+++ b/pkgs/by-name/fo/foundry/package.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   libusb1,
   nix-update-script,
+  perl,
   pkg-config,
   rustPlatform,
   versionCheckHook,
@@ -14,6 +15,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "foundry";
   version = "1.7.0";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "foundry-rs";
     repo = "foundry";
@@ -23,7 +26,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-iAWUEVgOgn2Zw9fINxyH9Bynh+flzCY40YFGoVLgG8k=";
 
+  strictDeps = true;
+
   nativeBuildInputs = [
+    # `sha3-asm`'s build script runs cryptogams perl scripts to generate
+    # Keccak assembly, so perl must be available at build time.
+    perl
     pkg-config
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
@@ -43,6 +51,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   env = {
+    # The build script in `crates/common/build.rs` uses vergen to embed
+    # `git describe` / SHA output, but the GitHub source tarball has no `.git`
+    # directory. Pre-set the values so vergen reuses them instead of shelling
+    # out to git.
+    VERGEN_GIT_SHA = finalAttrs.src.rev;
+    VERGEN_GIT_DESCRIBE = "v${finalAttrs.version}";
+
     SVM_RELEASES_LIST_JSON =
       if stdenv.hostPlatform.isDarwin then
         # Confusingly, these are universal binaries, not amd64.
@@ -64,6 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       beeb
       mitchmindtree
       msanft
+      samooyo
     ];
     platforms = lib.platforms.unix;
   };

From b198adc8e51476b8a4c6e010d187717aa5d2f27e Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Tue, 12 May 2026 08:28:54 -0400
Subject: [PATCH 123/221] forgejo: 15.0.1 -> 15.0.2

changelog: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/15.0.2.md
---
 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 45dd978fd3a5..071a5fea9f2e 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 = "15.0.1";
-  hash = "sha256-40hyQ6MPskyty/LsMVczuDpbu2q3Syoj3c00HUS+pVE=";
-  npmDepsHash = "sha256-xWbnSX11RkLjtJ62qG6rD+xQAOnUuI99r9uEHakkZPY=";
-  vendorHash = "sha256-JUBAcRYgflrvoAK0OvaU/Xr6/BakgaUtYwtvBF9vyk0=";
+  version = "15.0.2";
+  hash = "sha256-ba5jog6eXY4TTmBblhfVa2LSLPGE1/HPfslIb30b3kk=";
+  npmDepsHash = "sha256-70w39jbMWpuAsbzBC9oFHaUMwshtFDeTSEOXDgFNPmE=";
+  vendorHash = "sha256-I6bGvXBP2K3+Xx9E9DS/AyG6Ilqf/s8VjfBnCmLUHsk=";
   lts = true;
   nixUpdateExtraArgs = [
     "--override-filename"

From 2590a3ea7e1af817e28408a93524ac3c22c03f1d Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Tue, 12 May 2026 16:04:14 +0300
Subject: [PATCH 124/221] nixos/regreet: enable accounts-daemon service

Reference https://github.com/NixOS/nixpkgs/pull/509861#issuecomment-4429820675
---
 nixos/modules/programs/regreet.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix
index 800642e2087a..84781449a0c1 100644
--- a/nixos/modules/programs/regreet.nix
+++ b/nixos/modules/programs/regreet.nix
@@ -152,6 +152,9 @@ in
       theme_name = cfg.theme.name;
     };
 
+    # Needed to fetch accounts
+    services.accounts-daemon.enable = true;
+
     services.greetd = {
       enable = lib.mkDefault true;
       settings.default_session.command = lib.mkDefault "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${lib.getExe cfg.package}";

From 8d944bd96ca4e1ac9000bf5ffbd14e46f44cdc2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 13:08:46 +0000
Subject: [PATCH 125/221] tektoncd-cli: 0.44.1 -> 0.45.0

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

diff --git a/pkgs/by-name/te/tektoncd-cli/package.nix b/pkgs/by-name/te/tektoncd-cli/package.nix
index 172bc3ebac89..390fe27f4615 100644
--- a/pkgs/by-name/te/tektoncd-cli/package.nix
+++ b/pkgs/by-name/te/tektoncd-cli/package.nix
@@ -14,13 +14,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "tektoncd-cli";
-  version = "0.44.1";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "tektoncd";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-99DqW4nZFTKuGOa7f/xU+5wyaIxx5yoGJMKgCbnWWLU=";
+    sha256 = "sha256-2n/RBMy3mkG9F9PtFaZ1TCyW9MYbGF1nr6GgL+ps7ok=";
   };
 
   vendorHash = null;

From 728ca24df35e3cb8f9817fcda189325146bfaddc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 13:17:19 +0000
Subject: [PATCH 126/221] raspberrypi-eeprom: 2026.01.09-2711 ->
 2026.05.11-2712

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

diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
index 4f09232a1548..d3f3cc30577f 100644
--- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
+++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raspberrypi-eeprom";
-  version = "2026.01.09-2711";
+  version = "2026.05.11-2712";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpi-eeprom";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-grJc7wvnYIYouybJhAE6uRb28JGJ12YP6eHIt/xrPPs=";
+    hash = "sha256-19aVPfMQOqAWNVYoBxowV5zWjshuE5LPKaLNLxZlmHw=";
   };
 
   buildInputs = [ python3 ];

From ec1841e734baff3310d614e2a39c22828beef199 Mon Sep 17 00:00:00 2001
From: codgician <15964984+codgician@users.noreply.github.com>
Date: Tue, 12 May 2026 21:23:32 +0800
Subject: [PATCH 127/221] open-webui: 0.9.4-> 0.9.5

Diff: https://github.com/open-webui/open-webui/compare/v0.9.4...v0.9.5

Changelog: https://github.com/open-webui/open-webui/blob/v0.9.5/CHANGELOG.md
---
 pkgs/by-name/op/open-webui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 78e694468196..f1e6bf46a83d 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -9,13 +9,13 @@
 }:
 let
   pname = "open-webui";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-J0B/N4Bb7lRK4/BiILliy/Gw7FayM3liG+4NiskOq9U=";
+    hash = "sha256-RVmFRThK6dNJyqxKepk9WfxzXIwkRoYijZjR1HEhDm8=";
   };
 
   frontend = buildNpmPackage rec {
@@ -32,7 +32,7 @@ let
       url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
     };
 
-    npmDepsHash = "sha256-jPGSJ+f5xuhnB4E9/FlgQkC37W6Yw2aGh8O8f8ajVC4=";
+    npmDepsHash = "sha256-kAUbFAFNo5RHMGqO7sPHSxSEZw9Ky6Pxp/vddDyw90E=";
 
     # See https://github.com/open-webui/open-webui/issues/15880
     npmFlags = [

From 280247007e08559f5b24816c943241751e7d20c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 13:28:51 +0000
Subject: [PATCH 128/221] postgresqlPackages.timescaledb-apache: 2.26.4 ->
 2.27.0

---
 pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 9e931d62aca2..fe293b9ce6cb 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -13,13 +13,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
-  version = "2.26.4";
+  version = "2.27.0";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = "timescaledb";
     tag = finalAttrs.version;
-    hash = "sha256-fCaB0LSffjmen1zDjsR/4V3FgH05gkLDHYmLqVpyTLQ=";
+    hash = "sha256-ytEVnNmLARsDQKqvfuInRf1AZ9vNRdTo0yJBebQqDrg=";
   };
 
   nativeBuildInputs = [ cmake ];

From eb0c38b81aa0ea1042cb043fc156cf61627d24f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 13:30:34 +0000
Subject: [PATCH 129/221] openscad-lsp: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/by-name/op/openscad-lsp/package.nix b/pkgs/by-name/op/openscad-lsp/package.nix
index ccfc5f180726..9559d2e2f9c8 100644
--- a/pkgs/by-name/op/openscad-lsp/package.nix
+++ b/pkgs/by-name/op/openscad-lsp/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "openscad-lsp";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "Leathong";
     repo = "openscad-LSP";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ACxsXGeVYmB13x/n+molCoScSOe6Zh2PYiaGGHnd4DQ=";
+    hash = "sha256-vzlwt1lTaZIqHS/+6bVPHjd+Ex3G/YDVNW0JKZ0arnk=";
   };
 
-  cargoHash = "sha256-Q4NrRVSic7M1CFq24ffUv3d835PmaHus4Z0lLnUQ7Ts=";
+  cargoHash = "sha256-BU3gabsC/5lH59NSSBn2Zr5/egxcHAt7iCAftrOh1ak=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 4b942dba8c58f6e436b069f28b2f5af0f34453e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 13:45:29 +0000
Subject: [PATCH 130/221] nixos-facter: 0.4.3 -> 0.4.4

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

diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index 9a0379f2fa2a..938861ccd10a 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -25,13 +25,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "nixos-facter";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nixos-facter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bbF16siqAqokXOHwLmBL61p/C7YiDGqBJhhJiF08pHk=";
+    hash = "sha256-w4tFIouJQLf/JeY7wvvSLbxQv73Bbs11a8EAu6iXwKU=";
   };
 
   vendorHash = "sha256-5duwAxAgbPZIbbgzZE2m574TF/0+jF/TvTKI4YBH6jM=";

From f6fc5010414d0f2c1facba0fb941cdfba2fb4666 Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Mon, 11 May 2026 17:16:27 -0700
Subject: [PATCH 131/221] opencode-desktop: fix empty window and missing
 desktop entry

- Patch prebuilt .node files (node-pty, @parcel/watcher) with
  autoPatchelfHook so they can dlopen libstdc++. Without this, the
  sidecar exits on startup because glibc does not consult electron's
  DT_RUNPATH transitively for dlopened libraries, and the renderer
  shows an empty window with no backend.
- Ignore unresolved libc.musl-* SONAMEs in the prebuilt .node files
  so autoPatchelfHook accepts them on glibc systems. The musl-targeting
  bindings are dead code at runtime on the host's libc anyway.
- Pass --config.asarUnpack='**/*.node' to electron-builder so every
  prebuilt native binding lands on the filesystem (not embedded in
  app.asar where dlopen cannot find them).
- Disable the auto-updater at source via postPatch. With the package
  now correctly identifying as packaged, the updater would otherwise
  try to download and run upstream binaries that aren't patched for
  Nix.
- Generate a .desktop entry via makeDesktopItem. electron-builder
  --dir skips the deb/AppImage/rpm stages that normally produce one,
  so copyDesktopItems on its own was a no-op.
- Install icons into share/icons/hicolor/{30,32,44,64,71,89,107,128,
  142,150,284,310}x*/apps/ mirroring upstream's deb layout, so desktop
  environments find them. Previously a single bare PNG at
  share/icons/opencode-desktop.png (not part of any icon theme path).
- Set ELECTRON_FORCE_IS_PACKAGED=1 in the wrapper. With
  --inherit-argv0, Electron's app.isPackaged heuristic returns false,
  which routes the app to the dev XDG dir and breaks the WM-class
  match with StartupWMClass=OpenCode.
- On darwin, symlink Contents/MacOS/OpenCode into $out/bin and set
  mainProgram accordingly so lib.getExe works on both platforms.
- Drop the unused opencode-cli sidecar copy; the bundled chunk hosts
  its own server and never spawns the CLI.

Assisted-by: OpenCode:claude-opus-4-7
Co-authored-by: typedrat <alexis@typedr.at>
---
 pkgs/by-name/op/opencode-desktop/package.nix | 110 ++++++++++++-------
 1 file changed, 73 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix
index 9ca30437f227..bfc0cf9c482c 100644
--- a/pkgs/by-name/op/opencode-desktop/package.nix
+++ b/pkgs/by-name/op/opencode-desktop/package.nix
@@ -1,12 +1,15 @@
 {
+  autoPatchelfHook,
   bun,
   copyDesktopItems,
   electron_41,
   lib,
   makeBinaryWrapper,
+  makeDesktopItem,
   models-dev,
   nodejs,
   opencode,
+  stdenv,
   stdenvNoCC,
   writableTmpDirAsHomeHook,
 
@@ -30,9 +33,20 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     nodejs # for patchShebangs node_modules
     makeBinaryWrapper
     writableTmpDirAsHomeHook
+  ]
+  ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
+    autoPatchelfHook
     copyDesktopItems
   ];
 
+  buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  # The musl prebuilts ship libc.musl-*.so.1 SONAMEs that autoPatchelfHook can't
+  # resolve on glibc systems. They aren't loaded at runtime on the host libc anyway.
+  autoPatchelfIgnoreMissingDeps = [ "libc.musl-*.so.*" ];
+
   strictDeps = true;
 
   env = {
@@ -42,6 +56,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     OPENCODE_DISABLE_MODELS_FETCH = true;
   };
 
+  postPatch = ''
+    # The auto-updater would try to download and run an upstream binary that
+    # isn't patched for Nix. Disable it at source.
+    substituteInPlace packages/desktop/src/main/constants.ts \
+      --replace-fail 'app.isPackaged && CHANNEL !== "dev"' 'false'
+  '';
+
   configurePhase = ''
     runHook preConfigure
 
@@ -69,10 +90,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # Build with electron-vite
     node_modules/.bin/electron-vite build
 
-    # Copy opencode CLI as sidecar
-    sidecar_name="opencode-cli"
-    install -D ${lib.getExe opencode} "resources/$sidecar_name"
-
     # Package with electron-builder (unpacked directory mode)
     cp -r "${electron.dist}" $HOME/.electron-dist
     chmod -R u+w $HOME/.electron-dist
@@ -80,53 +97,72 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     node_modules/.bin/electron-builder --dir \
       --config=electron-builder.config.ts \
       --config.electronDist="$HOME/.electron-dist" \
-      --config.electronVersion=${electron.version}
+      --config.electronVersion=${electron.version} \
+      --config.asarUnpack='**/*.node'
 
     cd ../..
 
     runHook postBuild
   '';
 
-  installPhase = ''
-    runHook preInstall
-  ''
-  + lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
-    mkdir -p $out/Applications
-    mv packages/desktop/dist/mac-*/OpenCode.app "$out/Applications/OpenCode.app"
-  ''
-  + lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
-    mkdir -p $out/opt/opencode-desktop
-    ${
-      if stdenvNoCC.hostPlatform.isAarch64 then
-        ''
-          appDir="packages/desktop/dist/linux-arm64-unpacked"
-        ''
-      else
-        ''
-          appDir="packages/desktop/dist/linux-unpacked"
-        ''
-    }
-    [ -d "$appDir" ] || { echo "no electron-builder output dir found: $appDir"; exit 1; }
-    cp -r "$appDir/resources" $out/opt/opencode-desktop/
+  desktopItems = lib.optional stdenvNoCC.hostPlatform.isLinux (makeDesktopItem {
+    name = "opencode-desktop";
+    desktopName = "OpenCode";
+    exec = "opencode-desktop %U";
+    icon = "opencode-desktop";
+    startupWMClass = "OpenCode";
+    categories = [ "Development" ];
+    mimeTypes = [ "x-scheme-handler/opencode" ];
+  });
 
-    install -Dm644 packages/desktop/resources/icons/icon.png $out/share/icons/opencode-desktop.png
+  installPhase =
+    let
+      appDir = if stdenvNoCC.hostPlatform.isAarch64 then "linux-arm64-unpacked" else "linux-unpacked";
+    in
+    lib.concatLines [
+      ''
+        runHook preInstall
+      ''
+      (lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
+        mkdir -p $out/Applications $out/bin
+        mv packages/desktop/dist/mac-*/OpenCode.app "$out/Applications/OpenCode.app"
+        ln -s "$out/Applications/OpenCode.app/Contents/MacOS/OpenCode" $out/bin/OpenCode
+      '')
+      (lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
+        mkdir -p $out/opt/opencode-desktop
+        appDir="packages/desktop/dist/${appDir}"
+        [ -d "$appDir" ] || { echo "no electron-builder output dir found: $appDir"; exit 1; }
+        cp -r "$appDir/resources" $out/opt/opencode-desktop/
 
-    makeWrapper ${lib.getExe electron} $out/bin/opencode-desktop \
-      --inherit-argv0 \
-      --add-flags $out/opt/opencode-desktop/resources/app.asar \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
-      --add-flags ${lib.escapeShellArg commandLineArgs}
-  ''
-  + ''
-    runHook postInstall
-  '';
+        for size in 32 64 128; do
+          install -Dm644 \
+            packages/desktop/resources/icons/''${size}x''${size}.png \
+            $out/share/icons/hicolor/''${size}x''${size}/apps/opencode-desktop.png
+        done
+        for size in 30 44 71 89 107 142 150 284 310; do
+          install -Dm644 \
+            packages/desktop/resources/icons/Square''${size}x''${size}Logo.png \
+            $out/share/icons/hicolor/''${size}x''${size}/apps/opencode-desktop.png
+        done
+
+        makeWrapper ${lib.getExe electron} $out/bin/opencode-desktop \
+          --inherit-argv0 \
+          --set ELECTRON_FORCE_IS_PACKAGED 1 \
+          --add-flags $out/opt/opencode-desktop/resources/app.asar \
+          --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
+          --add-flags ${lib.escapeShellArg commandLineArgs}
+      '')
+      ''
+        runHook postInstall
+      ''
+    ];
 
   meta = {
     description = "AI coding agent desktop client";
     homepage = "https://opencode.ai";
     inherit (opencode.meta) platforms;
     license = lib.licenses.mit;
-    mainProgram = "OpenCode";
+    mainProgram = if stdenvNoCC.hostPlatform.isDarwin then "OpenCode" else "opencode-desktop";
     maintainers = with lib.maintainers; [ xiaoxiangmoe ];
   };
 })

From 7de0f5f7e0855032ccc47e63407b2a7818fc7358 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 12 May 2026 14:51:05 +0100
Subject: [PATCH 132/221] deno: only expose unit tests in passthru

The deno tests have been found to be flakey in hydra.
By exposing the full build with unit tests in the passthru
maintainers can run them locally (which seem to be fine).
---
 pkgs/by-name/de/deno/package.nix          | 34 +++++++++++++++++------
 pkgs/by-name/de/deno/rusty-v8/default.nix | 16 +++++++++++
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index bcc620b3d62d..1c382f5a9d9e 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -14,7 +14,6 @@
   sqlite,
   lld,
   writableTmpDirAsHomeHook,
-  fetchpatch,
 
   # Test deps
   curl,
@@ -22,6 +21,9 @@
   git,
   python3,
   esbuild,
+
+  # self for passthru
+  deno,
 }:
 
 let
@@ -90,13 +92,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
   env.RUSTY_V8_ARCHIVE = librusty_v8;
 
-  # Many tests depend on prebuilt binaries being present at `./third_party/prebuilt`.
-  # We provide nixpkgs binaries for these for all platforms, but the test runner itself only handles
-  # these four arch+platform combinations.
-  doCheck =
-    stdenv.hostPlatform.isDarwin
-    || (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64));
-
+  # Don't run checks on hydra as they've been observed to be flakey for us and
+  # other distros CI: https://gitlab.alpinelinux.org/alpine/aports/-/blob/bec8b026686323b496365b825ad14fdf4473adf2/community/deno/APKBUILD#L79
+  # We haven't reproduced it on local machines, could be related to doing other
+  # builds simultaneously.
+  # A build with tests (+ librusty_v8 tests) is included in `deno.passhtru.tests`
+  doCheck = false;
+  # check related config is left in the main package so if someone uses
+  # `overrideAttrs` to always build with tests, it'll all work.
   preCheck =
     # Provide esbuild binary at `./third_party/prebuilt/` just like upstream:
     # https://github.com/denoland/deno_third_party/tree/master/prebuilt
@@ -243,7 +246,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru = {
     updateScript = ./update.sh;
-    tests = callPackage ./tests { };
+    tests = (callPackage ./tests { }) // {
+      build-with-unit-tests = deno.overrideAttrs (fa: {
+        # The tools test suite requires building the test server
+        dontBuild = false;
+        # Many tests depend on prebuilt binaries being present at `./third_party/prebuilt`.
+        # We provide nixpkgs binaries for these for all platforms, but the test runner itself only handles
+        # these four arch+platform combinations.
+        doCheck =
+          stdenv.hostPlatform.isDarwin
+          || (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64));
+      });
+      # Also include librusty_v8 tests
+      librusty_v8-tests = librusty_v8.passthru.tests;
+    };
     inherit librusty_v8;
   };
 
diff --git a/pkgs/by-name/de/deno/rusty-v8/default.nix b/pkgs/by-name/de/deno/rusty-v8/default.nix
index 725ecebed0b3..2db5c12778ed 100644
--- a/pkgs/by-name/de/deno/rusty-v8/default.nix
+++ b/pkgs/by-name/de/deno/rusty-v8/default.nix
@@ -153,6 +153,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "fortify3"
   ];
 
+  # Don't run checks on hydra as they've been observed to be flakey for us and
+  # other distros CI: https://gitlab.alpinelinux.org/alpine/aports/-/blob/bec8b026686323b496365b825ad14fdf4473adf2/community/deno/APKBUILD#L79
+  # We haven't reproduced it on local machines, could be related to doing other
+  # builds simultaneously.
+  # A build with tests is included as part of `deno.passhtru.tests` via `librusty_v8.passthru.tests`
+  doCheck = false;
+  # Check related config is left in the main package so if someone uses
+  # `overrideAttrs` to always build with tests, it'll all work.
   checkFlags = [
     # These tests probably fail due to a more recent rustc version (upstream: 1.89.0, here: 1.93.0)
     "--skip=ui"
@@ -167,6 +175,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru = {
+    tests = {
+      build-with-unit-tests = deno.passthru.librusty_v8.overrideAttrs (fa: {
+        doCheck = true;
+      });
+    };
+  };
+
   requiredSystemFeatures = [ "big-parallel" ];
 
   meta = {

From ad6bedc7e0871d4f23b49a2002a157ee2f146f4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 14:04:48 +0000
Subject: [PATCH 133/221] n8n: 2.19.5 -> 2.20.6

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

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 67c7f425725d..6a57b725baef 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -26,20 +26,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "2.19.5";
+  version = "2.20.6";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-BOxSiSDDMC1OX4Otbn6DiSG4ThIsiRssKwfXh9y9JSM=";
+    hash = "sha256-c0O6tC+QDhHN3nmzXqNwhAM4+NoFYVO1mtO3V348hDs=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-gDlTNwsLT4hW1+3agSS/eBAW/804c7ElXCEfs58gP8U=";
+    hash = "sha256-ft7n3J7L+u2hwEiR32Jw2k0ZsHCfI5yIB+IfmtB8xMY=";
   };
 
   nativeBuildInputs = [

From a5c9d91fd368f9e188cfe4bddb15fb052a2b640e Mon Sep 17 00:00:00 2001
From: Jesse Hallett <jesse@sitr.us>
Date: Mon, 4 May 2026 16:29:46 -0700
Subject: [PATCH 134/221] vimPlugins.nvim-treesitter: allow overlay changes to
 affect queries packages

The upstream nvim-treesitter defines tree-sitter queries for many
languages. Those are made available as separate packages in nixpkgs via
derivations that symlink to subdirectories in
vimPlugins.nvim-treesitter's src input. But derivations for those
queries packages are defined in an overlay where nvim-treesitter is
referenced via `super` instead of `self`. That means that if end users
patch nvim-treesitter's src input, changes do not propagate to the
queries packages.

This change switches nvim-treesitter references from attributes on
`super` to use `self` instead.
---
 .../editors/vim/plugins/nvim-treesitter/overrides.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index 092fbfb5a5b3..6f1fb384f9af 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -37,8 +37,8 @@ let
         }
         ''
           mkdir -p "$out/queries"
-          if [ -d "${super.nvim-treesitter.src}/runtime/queries/${language}" ]; then
-            ln -s "${super.nvim-treesitter.src}/runtime/queries/${language}" "$out/queries/${language}"
+          if [ -d "${self.nvim-treesitter}/runtime/queries/${language}" ]; then
+            ln -s "${self.nvim-treesitter}/runtime/queries/${language}" "$out/queries/${language}"
           else
             echo "Error: there are no queries for ${language}."
             exit 1

From 8cfae545552616904eea32bfd558e06615825ccf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 14:13:11 +0000
Subject: [PATCH 135/221] buildkite-agent: 3.124.0 -> 3.126.0

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

diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix
index d99f0098fffe..76f06d121c17 100644
--- a/pkgs/by-name/bu/buildkite-agent/package.nix
+++ b/pkgs/by-name/bu/buildkite-agent/package.nix
@@ -14,16 +14,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "buildkite-agent";
-  version = "3.124.0";
+  version = "3.126.0";
 
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HdTMsCBvd3vN/OkpBpiJ7dXq50PXx165NWmKGGpikUQ=";
+    hash = "sha256-JkXWd8I66iQVx/L+qHH0MGcJ/1AtPRZ7bL7+/pqCky0=";
   };
 
-  vendorHash = "sha256-VE7YEBIrkDG1ERGXnib0LPjBWcrepGAqwY5yKzSQ6wg=";
+  vendorHash = "sha256-p8Xfm+jql2tFihiETlCjZBsx6o5S8DwpHkkjKk6yCV8=";
 
   postPatch = ''
     substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash

From 7b179410bc57702a210eb4f96da6a6c4d393f55e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 14:49:13 +0000
Subject: [PATCH 136/221] terraform-providers.sumologic_sumologic: 3.2.7 ->
 3.2.8

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 68bccf2ae7e9..039b60d17f06 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1265,11 +1265,11 @@
     "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
   },
   "sumologic_sumologic": {
-    "hash": "sha256-Hw3+tck9kQmZ3TmtGUR8hu36gfMOgEGPjCscqaen8EU=",
+    "hash": "sha256-5X/3oHaW+b9U8W1DPKAJltDwGJjV4Mx1XP/JCkQtpwA=",
     "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
     "owner": "SumoLogic",
     "repo": "terraform-provider-sumologic",
-    "rev": "v3.2.7",
+    "rev": "v3.2.8",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-R/+PS4cUtr8/twUXOPRiVweb5I9NNiD6mGOcAFr9IDs="
   },

From a234430a54fda56fd5b8cdaf4519beebaef5fe5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 14:54:31 +0000
Subject: [PATCH 137/221] vscode-extensions.marp-team.marp-vscode: 3.5.0 ->
 3.5.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 9466541813e6..c9e5eac612d0 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2918,8 +2918,8 @@ let
         mktplcRef = {
           name = "marp-vscode";
           publisher = "marp-team";
-          version = "3.5.0";
-          hash = "sha256-BH+9HK08+G2hZTanOuBplxl/cYpGrIqrapFGjNIX4QA=";
+          version = "3.5.1";
+          hash = "sha256-t8ozV99HBHLiVMYMxh8bJ2QzMd/2PEeEDpzvqHavwPw=";
         };
         meta = {
           license = lib.licenses.mit;

From 6e2d634b642fd36408edd481612570a160f5c14d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 25 Mar 2026 08:39:41 -0500
Subject: [PATCH 138/221] maxima,maxima-ecl: migrate derivation to by-name,
 migrate override

---
 pkgs/by-name/ma/maxima-ecl/package.nix          | 17 +++++++++++++++++
 .../ma}/maxima/5.47.0-CVE-2024-34490.patch      |  0
 .../ma/maxima/package.nix}                      |  3 ++-
 pkgs/top-level/all-packages.nix                 |  7 -------
 4 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/by-name/ma/maxima-ecl/package.nix
 rename pkgs/{applications/science/math => by-name/ma}/maxima/5.47.0-CVE-2024-34490.patch (100%)
 rename pkgs/{applications/science/math/maxima/default.nix => by-name/ma/maxima/package.nix} (99%)

diff --git a/pkgs/by-name/ma/maxima-ecl/package.nix b/pkgs/by-name/ma/maxima-ecl/package.nix
new file mode 100644
index 000000000000..9a7b347e3d91
--- /dev/null
+++ b/pkgs/by-name/ma/maxima-ecl/package.nix
@@ -0,0 +1,17 @@
+{
+  maxima,
+  ecl,
+  lisp-compiler ? ecl,
+  ...
+}@args:
+
+maxima.override (
+  {
+    inherit lisp-compiler;
+  }
+  // removeAttrs args [
+    "maxima"
+    "ecl"
+    "lisp-compiler"
+  ]
+)
diff --git a/pkgs/applications/science/math/maxima/5.47.0-CVE-2024-34490.patch b/pkgs/by-name/ma/maxima/5.47.0-CVE-2024-34490.patch
similarity index 100%
rename from pkgs/applications/science/math/maxima/5.47.0-CVE-2024-34490.patch
rename to pkgs/by-name/ma/maxima/5.47.0-CVE-2024-34490.patch
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/by-name/ma/maxima/package.nix
similarity index 99%
rename from pkgs/applications/science/math/maxima/default.nix
rename to pkgs/by-name/ma/maxima/package.nix
index 462ea5d853fd..ab65bdd92b12 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/by-name/ma/maxima/package.nix
@@ -8,10 +8,11 @@
   python3,
   makeWrapper,
   autoreconfHook,
+  sbcl,
   rlwrap ? null,
   tk ? null,
   gnuplot ? null,
-  lisp-compiler,
+  lisp-compiler ? sbcl,
 }:
 
 let
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f864001a47cc..5675f04cf75c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11579,13 +11579,6 @@ with pkgs;
 
   gap-full = lowPrio (gap.override { packageSet = "full"; });
 
-  maxima = callPackage ../applications/science/math/maxima {
-    lisp-compiler = sbcl;
-  };
-  maxima-ecl = maxima.override {
-    lisp-compiler = ecl;
-  };
-
   ### SCIENCE / MISC
 
   boinc-headless = boinc.override { headless = true; };

From f1557fc668acc5742121c405a6dff82921d8f9f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 15:18:35 +0000
Subject: [PATCH 139/221] git-ls: 6.0.0 -> 6.1.0

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

diff --git a/pkgs/by-name/gi/git-ls/package.nix b/pkgs/by-name/gi/git-ls/package.nix
index 20575057747f..20b016cad61b 100644
--- a/pkgs/by-name/gi/git-ls/package.nix
+++ b/pkgs/by-name/gi/git-ls/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-ls";
-  version = "6.0.0";
+  version = "6.1.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
     owner = "llimllib";
     repo = "git-ls";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Is1bt1XLrzatxhMTrzClBeIWkTdepzDaDla1Ng+wrJ0=";
+    hash = "sha256-RSSddZRgYYQcHQA7ZVGLx/iZFx0crFiSY/EF2luWVjA=";
   };
 
   vendorHash = "sha256-Bk6IBG+BrqY4FNVIlbSSSnqqAeL+8SJUtRXuIp4e8f8=";

From e6e7f0210eccff70d2ed94d4a660c0536da96a5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 15:40:32 +0000
Subject: [PATCH 140/221] c3c: 0.7.11 -> 0.8.0

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

diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix
index 7aad19389076..507d348c8a8f 100644
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@@ -19,13 +19,13 @@ in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   pname = "c3c${optionalString debug "-debug"}";
-  version = "0.7.11";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "c3lang";
     repo = "c3c";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M6lx7MHhR1ghR+stRGJB7NL2SwHoyFOfU2tKu9Hh2oU=";
+    hash = "sha256-dsg1pPkFiZKuwoT/XGu4ommH54jFXvGMVddi1bmxfnE=";
   };
 
   cmakeBuildType = if debug then "Debug" else "Release";

From c33c34f5743e3603f9b06c5d7ef5ac6ed8135573 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 15:41:41 +0000
Subject: [PATCH 141/221] caddy: 2.11.2 -> 2.11.3

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

diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix
index 9f3ab5fcd15f..25fe6c7df909 100644
--- a/pkgs/by-name/ca/caddy/package.nix
+++ b/pkgs/by-name/ca/caddy/package.nix
@@ -11,7 +11,7 @@
   versionCheckHook,
 }:
 let
-  version = "2.11.2";
+  version = "2.11.3";
   dist = fetchFromGitHub {
     owner = "caddyserver";
     repo = "dist";
@@ -27,10 +27,10 @@ buildGoModule (finalAttrs: {
     owner = "caddyserver";
     repo = "caddy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QoGq8+lhaSQuC1VwIYE8h8N/ZC1ozfmIwmsIPk29Jos=";
+    hash = "sha256-7Hgmo7ldDtbwl/acEY/4RNhSGnK/NNcXn+eIm1I8HKg=";
   };
 
-  vendorHash = "sha256-zlwVgSEr01bbgV7N9szwqa9cPjBU34Cu7vqj4/MoSuU=";
+  vendorHash = "sha256-QiZZxYsYFUneZ52TfFKQWJ42lmBofvUTZrHmDBuN2O4=";
 
   ldflags = [
     "-s"

From 644ec5768c8c68ef6fbb36ba51e445772e87348f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 15:44:10 +0000
Subject: [PATCH 142/221] vscode-extensions.github.copilot-chat: 0.44.2 ->
 0.45.1

---
 .../editors/vscode/extensions/github.copilot-chat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
index ca76e9dbb55d..042f86577079 100644
--- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "github";
     name = "copilot-chat";
-    version = "0.44.2";
-    hash = "sha256-kjLpbA6zUta4K86yEDiLNWvy3kJ3AvF2fncCO/JVl6I=";
+    version = "0.45.1";
+    hash = "sha256-xxJ+h0/XyT8otXUzIYW9/KMxKLk5zoEE/fiqj4SZK+A=";
   };
 
   meta = {

From df15ec029dfc634d6d16fe206d70ab8e8801f125 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 16:00:42 +0000
Subject: [PATCH 143/221] flow: 0.312.0 -> 0.313.0

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

diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix
index 1267a1a437a1..b9fa4836b0f0 100644
--- a/pkgs/by-name/fl/flow/package.nix
+++ b/pkgs/by-name/fl/flow/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "flow";
-  version = "0.312.0";
+  version = "0.313.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dZJ/WjCmwNIbo/kgFTuaSBOtK/fOg69L5D5PFdvSn/w=";
+    hash = "sha256-U2TC9IV414X71zhrRb47kCvQkVqOSxzeNnfuoBSeJQE=";
   };
 
   patches = [

From 72b7c46c2e44206a07a7185437c37954019ed9ef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 12 May 2026 18:09:48 +0200
Subject: [PATCH 144/221] firefox-unwrapped: 150.0.2 -> 150.0.3

https://www.firefox.com/en-US/firefox/150.0.3/releasenotes/
https://www.mozilla.org/security/advisories/mfsa2026-45

Fixes: CVE-2026-8388, CVE-2026-8389, CVE-2026-8390, CVE-2026-8391,
       CVE-2026-8401
---
 .../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 88240b0c820d..13ba53e3272a 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 = "150.0.2";
+  version = "150.0.3";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "e22fc66f7faeb9bef4036d0a90af4c27dabc45a3dc59c7290536bfe46c7624d73388d29b36a8999e364065fa31a5fa167596632229b0af9bc1baf4135fa29a4d";
+    sha512 = "8452da61200f8ee66790d3fff230ca84b2ac9291af2b57e018486c50f938c53c6fb4943fe6cfe1e99b9783466fb00bf707fa006293753ac698618fc1e3b70a4a";
   };
 
   meta = {

From 1033cc0b6ce7912bd149b6befa168c121fbd56af Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 12 May 2026 18:10:46 +0200
Subject: [PATCH 145/221] firefox-bin-unwrapped: 150.0.1 -> 150.0.3

https://www.firefox.com/en-US/firefox/150.0.3/releasenotes/
https://www.mozilla.org/security/advisories/mfsa2026-45

Fixes: CVE-2026-8388, CVE-2026-8389, CVE-2026-8390, CVE-2026-8391,
       CVE-2026-8401
---
 .../browsers/firefox-bin/release_sources.nix  | 1436 +++++++----------
 1 file changed, 619 insertions(+), 817 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 6a921c8c2936..c1c4d66f3d16 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,2057 +1,1859 @@
 {
-  version = "150.0.1";
+  version = "150.0.3";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ach/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ach/firefox-150.0.3.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "8df967bb0baa0dcc1e16e6b9d36654068fa263839af105e04103bddd9a3b3cb6";
+      sha256 = "b110d79a025db3f1250e0015f126e17326e31c6eba8ba991f7e8f7ec92438d55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/af/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/af/firefox-150.0.3.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "e0bd056bc365ea58b008cacafbaddb4af0eea7f025aeb5a980144513f5be3dbb";
+      sha256 = "88c2649644c313a6d739fdaabe6e2708f737fcea3a01f9e735e0b5ae901fb95a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/an/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/an/firefox-150.0.3.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "d29cfd51a2881834bdb4878d774cd29134f1b3d86f781853b57a1368337c16a4";
+      sha256 = "dc6a77a941b1838a4c123aa010432b93e5f89ad58ba92e18229a6dda9f4a4dad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ar/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ar/firefox-150.0.3.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "9953650bfb2a9da5cae6950c5649ce4ee1a1891da53a3ce94c0739039c61e620";
+      sha256 = "6b2757524aa7c6fdcef222d88c20b83131da70287d0834d1a0c970deb71580be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ast/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ast/firefox-150.0.3.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "557ddda3f673963872057b7b87438150dcab1ec707ab4a98620e5d9dd4ed4bb3";
+      sha256 = "667a267dd94b629b984c58147e46c56afd179ee0459c9cedd6b8834b8e5fabf9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/az/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/az/firefox-150.0.3.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "b054f3f119b2cdcc2acd69d2b1595ffc51385aefa8066a887de9567e3431b7cb";
+      sha256 = "7c16a8304cb3847487514a8ce645649973d442ca48642d4791de95cc921b137a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/be/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/be/firefox-150.0.3.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "dc2681e0b390ee722ac3d9b8af4afc31d8ada28b5e65af2486cb08a3c85f3eee";
+      sha256 = "1c6a3b08fa09ea90cc26b8b2ba74936b7eec8e8a2ba3c49390bda93736829e2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/bg/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/bg/firefox-150.0.3.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "398974bcd5c80e513db99e8d282a1c0acaff3596123f0af161de6082a989e492";
+      sha256 = "f3c61e0b87003a323f824d819a545f7dee8a60d3e4804612816b69b87d5345b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/bn/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/bn/firefox-150.0.3.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "8ed8814129d7e2a2e15a90d6e9eb089e2b57061ad3f8085c0b2c86b21c9809ed";
+      sha256 = "82cdccc9c40bd3e18c416a46219bfb2f6ddc3b5b5be1270b618377dec5e25262";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/bo/firefox-150.0.1.tar.xz";
-      locale = "bo";
-      arch = "linux-x86_64";
-      sha256 = "4dd922931156b14ddada8dad36c14c3d046d388d2314e9720f6671a4a6ff4adf";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/bqi/firefox-150.0.1.tar.xz";
-      locale = "bqi";
-      arch = "linux-x86_64";
-      sha256 = "f5a959afa143a3c5576944758c1c6595498345a76cc12f0d649f68025d35f870";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/br/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/br/firefox-150.0.3.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "a10ebb49d0f1a551a8c956d3232c351769533eed0c433ac00b075ff3ed932600";
+      sha256 = "f42d5b6ef018ebeecace0a91d12c6deb891613e1bc00710e0b7d41de461bd4e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/brx/firefox-150.0.1.tar.xz";
-      locale = "brx";
-      arch = "linux-x86_64";
-      sha256 = "2a557041f621c371be99762f31816fbc87fa6a9413f2ba148d8076c064038034";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/bs/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/bs/firefox-150.0.3.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "986f07ce957f704a1c5711755bf052aa694df87998eb265ac8ce68bb59acd9f8";
+      sha256 = "b8b6f26430a0e8fbb38c4ef678247f754f5399b47ccfeaffe4fdb229b4db2d0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ca-valencia/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ca-valencia/firefox-150.0.3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "f0db798b7e2b2d5459fdba9ab143e72c151577e8416108c8df1f168fd72b37e7";
+      sha256 = "4d6f35ed64701809ea8f988ea0a16e95f189cf7142cba0667232461364ebd0af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ca/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ca/firefox-150.0.3.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "128abfe1d356d6ef07202ca992c415f0b8a3b2cf319c68245272209b2752d6ce";
+      sha256 = "4dc354f71b7639e65d5056c9e40d920ca96c9c61eb0e8d0564648b7961f4969e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/cak/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/cak/firefox-150.0.3.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "e068e8371fd28a6feaa7829cc27d853c256a6cf64c03f37521e0ac51f6ef4862";
+      sha256 = "1c93b4be443a73952956c4f10d76ca26b3b1d01747e75827d7479831b3a92963";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ckb/firefox-150.0.1.tar.xz";
-      locale = "ckb";
-      arch = "linux-x86_64";
-      sha256 = "1bf8bcf2e8dafd46719d0b52539661ce9309bee9d1b014d221b3029e8a4041f4";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/cs/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/cs/firefox-150.0.3.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "15201a284b7c4b3c7fef023ec6041c7fb0749e93e72bad0ab33cb2cb7ffa98e7";
+      sha256 = "c4ddba4015be9f07f6d50c0bd02e70d7f6d4b328efe4645ed5362e5b63c4e23d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/cy/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/cy/firefox-150.0.3.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "b4b101b4df576e53abd7ddc44f6d845d485148864b09ef58c15c72f69d1bf9af";
+      sha256 = "e68a6ae874cc708ddf7e0fa6220d3a79a94fe9a8953178df34eb014aab6ad14f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/da/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/da/firefox-150.0.3.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "75d1a8fe304e8e4fe2209571de9917806e56d5ef2dcf4beb0e70034464141453";
+      sha256 = "76ddb9c43712fb52f03b3a6cfdf0842a5e2226734b7e174949484db0b496d804";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/de/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/de/firefox-150.0.3.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "ec9a6c64811db82b51b003d6f9c61719be185a2ab102be753d54886902bb0b97";
+      sha256 = "1dfdaab8fe8a71f69ac23b9e51e68bc4754db56096c824af62373fd8f3f42720";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/dsb/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/dsb/firefox-150.0.3.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "702f2b853c8dd9d6b851792740796903a5b471b2be7d6dce514825a3330c7054";
+      sha256 = "62a87ab977bf84178aff68e57fb57d800b9865acc17d217f7aa1f13d3f86f9a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/el/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/el/firefox-150.0.3.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "24291afc0c758a2823406ef48b66f7ce82f051bf1cb77bec54f605a5f7f18d12";
+      sha256 = "592faf30bd51a727ccad2b3baf85b4118c7e6c0558ce6eb1302c2299784c374f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/en-CA/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/en-CA/firefox-150.0.3.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "563445823374ac3a4b2d7a35902e7c8bca507590fb49bf51fc7289cb58466af0";
+      sha256 = "01b678402f9f20ef3e0eeab4436aec920a676ba5c1c784009ac22ac905120991";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/en-GB/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/en-GB/firefox-150.0.3.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "927bf825b1f72d36e28fdc9ebc04ebd79cc86265f2c4739891ba69a2f80babcf";
+      sha256 = "e59e003251ee575389df00ad1f6b2a359a5984cd79309f014698fcb2041310a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/en-US/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/en-US/firefox-150.0.3.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "83871560c3d3514d3b5bdd196cd258dde23d53f5d3d89d266765bd7e8306b895";
+      sha256 = "cb679bcceaef49ac38b671b66e78fa1ccc3e603555fe9d79ce16b4b55a388b91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/eo/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/eo/firefox-150.0.3.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "e5b4e12d05e99bde29fc96566efc4d039d1fca07d4b257f1c0ba36b9a64d88d0";
+      sha256 = "46831e655a7f314f16f7a4be415187059eb97b9f967e68a1557afe45d59dd590";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/es-AR/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/es-AR/firefox-150.0.3.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "7b1914eee5c0155f95a93bfb53e641240889ffe707423abcbb130c34c6a6c6a1";
+      sha256 = "0b05b0dd72bfce1d2076570605ab02838bcc0649a465ec4147bf9e7d4f139279";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/es-CL/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/es-CL/firefox-150.0.3.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "29c6efef9868b0383338af0afba7ee623e1f06155a8e47a86dc6229418b399e5";
+      sha256 = "da6a0c053acf0b1e49f066471467547ae0dda617331e979d03854da720bd4ddf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/es-ES/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/es-ES/firefox-150.0.3.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "ce1fa5fcef78563a4d2921f600f91b378b0c81ed22b167eef0b503a274752a20";
+      sha256 = "658f734bb3b9ad5d3113cb8fb8c5137c7ec582f645071b0e7e312af664bb0b54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/es-MX/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/es-MX/firefox-150.0.3.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "f31252190c4fccaea01b328a1a4a73837ae7060180ac5d610ea0cb53c028533d";
+      sha256 = "aef367df499e1994fad49760409bbbce50249b112aa2d760911dd6794f1d828c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/et/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/et/firefox-150.0.3.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "b7862bdecc8492c76d110971d28da8de194cd38b0351a286fb71506f88474032";
+      sha256 = "7970b9c1a8df297640a4a75ecf7f987d6c9ad1a81b827b95a25c679ea6f06c4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/eu/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/eu/firefox-150.0.3.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "d9686a806b870adf51f512589b23649e66a94e59a66689b0fed69dfef62844c7";
+      sha256 = "785515b7aa70db97cdcd1f2b6a8ed96f69d6d86ddd92da822c833e60cb7cb3db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/fa/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/fa/firefox-150.0.3.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "bc48fd47694ab1040d7880c9dedb3461f3f87c95493a0571cf4b314c8297d1c1";
+      sha256 = "c14f0edec796668457cdcaa39ae991e74c81955d19c2bdee203fb1f4d7d21c2e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ff/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ff/firefox-150.0.3.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "a93365446a506e1453c6815d8ad8913208c11390df7d60d8fdb38636e73c9044";
+      sha256 = "1a0369b2f14c69411f54dd1c46c7f4410ac7d7577a9700557858f75355e42de3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/fi/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/fi/firefox-150.0.3.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "84379104f44ace79de75ae0b65b09d63a7bc519b57a00135925d38f177ddd290";
+      sha256 = "2f05be2b87cb88ed71532540bb0b760f45dc120e0db9975a89428eed3cf9f49e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/fr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/fr/firefox-150.0.3.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "8ace62c3c41df014135d2f598a7e9cbfc8efa0836d0489fc4f12ed8bc5e5b820";
+      sha256 = "1aa3f2a047b5095487fe29bd6359a807c3c481a0302d4fd2b5693690dda553d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/fur/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/fur/firefox-150.0.3.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "f9704f4587d080b3938b03468cfda8d9f8028f57d4ddfaff9f222622fac841c9";
+      sha256 = "55e8cc652e576bf553f2404cf726a12f1ae86bfc8e927ec6f6e73323ca7fc784";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/fy-NL/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/fy-NL/firefox-150.0.3.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "aa04c83b25a9d09f6bb7d10b95fa03b6ca9219e2c1697e3085882edb9c2b0015";
+      sha256 = "c1bff6ec2b0920b61bd395ef00cbc610354edd7d1791774ad8b47e0d8a644342";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ga-IE/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ga-IE/firefox-150.0.3.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "a63ad6d692a605f7382bbd8a39d8496b9dab813573f33697d26b8c696e453b7b";
+      sha256 = "745d777b25fc46ff5b58afeec4f3c6a0499833f3294c5690b6a62480efec9085";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/gd/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/gd/firefox-150.0.3.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "7a97768ea9326f844b00f63e716ebd87b8fa4304cb949f3be6c2d0ff3b44d829";
+      sha256 = "eb94eaf391a79e6ee45be37bbecd9afd52fc142469e0198d7db0de528cf0ab10";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/gl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/gl/firefox-150.0.3.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "9421edf800c0b68c057a0bffef4071d1e76affb06d06c97f04c0429ef6825bea";
+      sha256 = "22ea7a5936bf686bbb693852c0adf21e42ef84ed8275beb766f2007f14ef4f27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/gn/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/gn/firefox-150.0.3.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "12a62535360280796c6eb4f22c6745c16a0d45a8e473728da5d0763898bb97d4";
+      sha256 = "58d46df41de1c854ce334835850992cb21a9640ef3d7e043b6abd3b95acc1335";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/gu-IN/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/gu-IN/firefox-150.0.3.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "b9b93f9ba1c1ac8e83a605ee5cb26482362024cfea5a198efd265add2470692d";
+      sha256 = "b48a14634ee0642b21dacc7e6d38d6645659d1607796e305f083bc815711de92";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/he/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/he/firefox-150.0.3.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "92f907d375d8d43b4226047b3326c00884a03bcc012b7f385c1fbea8417fb275";
+      sha256 = "da8b260d4a5af7347760d6b18dee7a7a7b49a4893209aea4e738479122f67e55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hi-IN/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/hi-IN/firefox-150.0.3.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "82ad07e69ab74b7256d6a623033c8e8a8c5c8c4015c59b605a876fd1fbdb8260";
+      sha256 = "cdad6d1a38aa72de0021179bddea83be1dee79f9727fd2739f6c5228aac3e596";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/hr/firefox-150.0.3.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "c8655f3a8b8829419a82bc63f9eade478fce4f0643b6a7e65c76e0fd63de209f";
+      sha256 = "b5b6b93f52d043d185cb2d6503f4bb6dd66c04bde58622b0b4adeb885842315a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hsb/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/hsb/firefox-150.0.3.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "57d39bd2c7969b1b7de9864d8ced6f14bdbfa231fc18a7c3a5be6a54cd1e392a";
+      sha256 = "8d6fd77cceaf9f2cabb1f65e856ad539fd187c302e6b7903458d759520b93923";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hu/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/hu/firefox-150.0.3.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "9a3ceffe953e4e935e68295a67d933073d368d07addc54b40f745709ddfdadb6";
+      sha256 = "874d79e05564fb70ac94ae99fffe5c88ea38b2d40eb433d25bebc5175a5b7149";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hy-AM/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/hy-AM/firefox-150.0.3.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "a66233ddeb1ad03a1f5a14134480cbcaa64e3f58e3f30ab9fcc40bb2fb681868";
+      sha256 = "1925cf8a11406ea67412b1111fa1f25d3f328044486be84ec187382f5b72381e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hye/firefox-150.0.1.tar.xz";
-      locale = "hye";
-      arch = "linux-x86_64";
-      sha256 = "be4bb38c9b57ab42e055a1d2c167307c656473c4296d6f2c435e1bf81a1393a3";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ia/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ia/firefox-150.0.3.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "57f5feab33ae6be40c363b805785aa9e6c1b9aa8082ba600e34bad04cefb7162";
+      sha256 = "f095c529089f392312867c18f73dee2614b6f24f868a1dafd9c494d172ae8896";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/id/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/id/firefox-150.0.3.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "b1e7bdd4631f50e5b1910a850fae113415997563bfc4ad981cfb5f29bcaf3105";
+      sha256 = "24d3aaa147ff7e644da345344e61ca8cb37ef2139915b384a15fe6d004a5e535";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/is/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/is/firefox-150.0.3.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "036ea67243ce666c54086d0e219bb063217f2e8321ab1dfcbf2e7690fefb353d";
+      sha256 = "a1ce21f7c83a3ccc3491fe14cb33ed714791892efbc0924cde78af16fad193b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/it/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/it/firefox-150.0.3.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "00f38bb2ec48dec5a202774b4c50440b06b9936726922850d3663e641a09c927";
+      sha256 = "f749900f86d6d019d834623fe70881761318094c84e415251f74a4fe55505d81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ja/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ja/firefox-150.0.3.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "56faf471236f66aa4739287885d458324d91c715407dceaddc24bcd30d752394";
+      sha256 = "3f539fdac0bf494694666510b05426ebff87279a19161725e997b00ca126a950";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ka/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ka/firefox-150.0.3.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "e16ce6b7994cf29fc875c70eba04c6aa6172a1d508455a9e48298f942bdf7b31";
+      sha256 = "76a12a3a66d14f97c24255e9a00a8364adaa583e3ab85c097434320f10b7aa4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/kab/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/kab/firefox-150.0.3.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "1a6c584963332e16c55db5b16f6acaf27847a56696a3c7d3057f139fd1fbe6e1";
+      sha256 = "db5fddc015628c1db3bc605c4e752d2dbbecc7dbebd3c556646a7abf94cc4d85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/kk/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/kk/firefox-150.0.3.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "fbd12f3014207ef7c0e4dc5c7b116eb69bd9305afd7da4e1e0535ad4237d7565";
+      sha256 = "f8e91d4ba7cdcdf93ce2f6b7832987c28285bd775e093ebef9b0d3235d4a6617";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/km/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/km/firefox-150.0.3.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "f65d60e0d21ed87e061a1668575ce54c90699ab06decf42b0acf1c6dfa799099";
+      sha256 = "643514091766594647ab583049b386fb391bd2789b78bf760dd4f37888d9a332";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/kn/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/kn/firefox-150.0.3.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "979b78ba65f70f875f2364aa0d3621fa965a54c42e5520e2a34ef03fd80a7c02";
+      sha256 = "f0af1711504be1683799f7a00cd44e129b59c3e0b2237a3aa2b04c25ac693f7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ko/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ko/firefox-150.0.3.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "d1f7142a6bca24b26d1ede360c8e2013376e300117a10054f7a2cbaef4bd236a";
+      sha256 = "7c3c1e484677f678bd6d1c9a4a8ae7145edfc88d406031a61634e7f221689bef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/lij/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/lij/firefox-150.0.3.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "bf4fca76941f2b92288a79be529c6d8daae42d00dfa1509cbf0b1c4acd546f88";
+      sha256 = "490c760720d8af5cdc56058b0d7dc17a9695e1f8f2c867f55750ada9de41cc4f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/lo/firefox-150.0.1.tar.xz";
-      locale = "lo";
-      arch = "linux-x86_64";
-      sha256 = "5849e07330a477098364863d114fde1fd54fa97460183443514f0beef386b2de";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/lt/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/lt/firefox-150.0.3.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "b3295000050b405dc8131c79a5e7c6f4ac63157bba554dc270227a0d0e1d12c9";
+      sha256 = "2cfc6f4310adcd7a848fead558f410d10b26a6bd38826473b9fd5101e469efa6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ltg/firefox-150.0.1.tar.xz";
-      locale = "ltg";
-      arch = "linux-x86_64";
-      sha256 = "62a0d117c718d07f2f63e5976fa5ef01a98147e0d066cf8e1c7961b095f7ad86";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/lv/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/lv/firefox-150.0.3.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "4cbab42225c919b21dc7ba624bcac999188d3a7452f237ff0594653f0fc9b103";
+      sha256 = "a43c6c335e8da84b91fedd9367814e6c5692ffcf85239f39dc0ec3a7fbe61f26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/meh/firefox-150.0.1.tar.xz";
-      locale = "meh";
-      arch = "linux-x86_64";
-      sha256 = "3900f5657d5655d73ceffb15a9f912cf16e5abdc9c2ea51a8e437c2ab7decb4a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/mk/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/mk/firefox-150.0.3.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "ab45fc250423d23da2f0f80abbac28abdfdca22239f629d11d8527c566f36865";
+      sha256 = "81f85f4c78d7d0b151ace4bf2719409322e08dd2abf19302b3e6a022c02ca32e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ml/firefox-150.0.1.tar.xz";
-      locale = "ml";
-      arch = "linux-x86_64";
-      sha256 = "26b8e74037fee5ef9b88a8b1fd042f8efa3909f41c2a90f7b3503376f75f0910";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/mr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/mr/firefox-150.0.3.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "e720a7acde548cdc4ed45a3a6a1a633b81b523579d03af314e67943e6f6f326c";
+      sha256 = "a8d46f0c5cfa6148d2410e93d1bbf9d4b3f263d6eb1b68d71a5adb0e66e86c5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ms/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ms/firefox-150.0.3.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "ef2e8232de91b87581572c33b4cb9dea2e197f325cbc1c389da20b08fd9025fa";
+      sha256 = "81d651d5b913aee2fd9469c2076c2e247dd381b927d9459c1f1cb029883df749";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/my/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/my/firefox-150.0.3.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "f7c6592ad7b8edab343de438ddc756b1031439d5fe0be44ffae7c41bd3abf490";
+      sha256 = "7441547d3f8547214420cbcc930635baa4bb348589d6e3ee413f12881a281653";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/nb-NO/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/nb-NO/firefox-150.0.3.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "e76c556b97bd5e70f098b88678ce85ea80da9afe5f63f7214d18bca2678264f9";
+      sha256 = "1ef8884724b9eb19dac94bdcd2e9ba8d70e32fb733064d21be175396140750e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ne-NP/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ne-NP/firefox-150.0.3.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "bfcc08764cd5ae2c5afe6a8796f0fd8248c65fc8378248b23d7cdd8177478d9c";
+      sha256 = "1d0c27f7ef131f257e2b72d4fee3e1028ddd5ac1cba7e69d335431c1f2cc6c96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/nl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/nl/firefox-150.0.3.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "a38d38a5115cfdd3b8a6af0f3a227c41b81ff1df989a8f7eaedb1a8ea5c3a76d";
+      sha256 = "47e6716b923a42dc99a746e7a8c2824de77768c52af1d37561d9400669d746fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/nn-NO/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/nn-NO/firefox-150.0.3.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "69399f4217d4bacfc317b76c2d98e35ec1db8792f74a48e48a78ffce79cf7562";
+      sha256 = "3d3f6664d205794fcb2802e26763082efb48602271a89ef3e40d8c9f647dd9cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/oc/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/oc/firefox-150.0.3.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "71acefaa84fc651a0244976c9861a98595abf7f5372e242b8e76aff6b10fdb82";
+      sha256 = "19b98aad2118211bd538bbe17fb2079ffd83735edc5609483871bc621613f5f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/pa-IN/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/pa-IN/firefox-150.0.3.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "3ad8da6f8b29e0523383ab75b0312b11a316ff3b7a7e7fc53482f899b7e75cca";
+      sha256 = "8ca6dc0c63aae6fada75497d9ad8159ae8a602e840e4427e12024eb1ae869a30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/pl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/pl/firefox-150.0.3.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "4dc09fb01345cf5e4e6a38f2977821e0bca4ecac57ea6ab37069e89325489fad";
+      sha256 = "7a64dbfaa6fce9cf34331008013de0dfcee9dadb6f02f164afbc3604ade5b3d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/pt-BR/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/pt-BR/firefox-150.0.3.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "7e178f959ed18806149625c05d64a3867b71c36d327defe3bafa4f1a294d2dbe";
+      sha256 = "830824327328f9267203681fee852af84912eca734fb32a9ff924f2fb47185f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/pt-PT/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/pt-PT/firefox-150.0.3.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "0fd02b1e54dcbfdf33e20d078d3ab9e252e2f7be9f4cf6b4ab2a6e84e7ba673a";
+      sha256 = "08da83ba17317717d28c4f56ebb5505d3002af50fedd38f0640c2dc203e3888a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/rm/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/rm/firefox-150.0.3.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "8f3a004e64a884e6e6adc71bc1958e4bb0624f1ddf9641b595a9aad77a78a103";
+      sha256 = "4c7f41735317d8f00e0af96cf257b0943afa080cb8e1098d1fd4c07ecc9f24e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ro/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ro/firefox-150.0.3.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "39d91e36bd820f514b1555c7efc4119e178be0bfc50d7d80cbd235dc79fa3f88";
+      sha256 = "9fdf91169d564f70ab89a7bf690c05035444c29afa64715b06bb410b59cacff5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ru/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ru/firefox-150.0.3.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "3ea866bea819fe2924b31c2d230864ded8e79c520efe5a0077807d40d6ff1f8b";
+      sha256 = "55387683c3ee7b1eb97e36830a1fbbc67b2249cfe90dba8260e8f2c7010fd57f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sat/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sat/firefox-150.0.3.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "108a14c809facc50001caa056ac5662a01a71920b879eb04f64e71199b9c679c";
+      sha256 = "a97632c8c724cf478ed890bd01a7f6edf5d4052949c287b3bb304a9b58652f55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sc/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sc/firefox-150.0.3.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "af53472a3e87aadf764521da7c8de117bd05d99df70d40b1d7e7ccde6b77de5e";
+      sha256 = "53570d38e3c74e6f380e2d8d7f54cd31eb6d5d8de186a8727bcf1adef61ea247";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/scn/firefox-150.0.1.tar.xz";
-      locale = "scn";
-      arch = "linux-x86_64";
-      sha256 = "1487280795ec63cf95df8aa086ce47f344db0e68114eb3c0d1bb7e9d6952b324";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sco/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sco/firefox-150.0.3.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "f2892f2af3fc11a9850cbc3cd35efea9303631265b83af5df4c9b491a7725cbd";
+      sha256 = "7fd18819e67a648daf64dba6d80bcb7349cee865b2c1653b1a09fb2ac9d74064";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/si/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/si/firefox-150.0.3.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "22b3677a751ec0ecfbba034727ee3422c455e06b3c4bf1689c6078d5bf4f5621";
+      sha256 = "cd5a37080dfff288c9b34cc5a345eca808cfe7c163e05d3eae382f499a19a24e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sk/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sk/firefox-150.0.3.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "be838c44417a55bda3daa5b32d1319f366659c84f718bbd47877e7aeaae4b4c9";
+      sha256 = "758b474a3f175d08ce236b46d821ecb619bd038a6a1ec0b351c873fc8ee3d731";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/skr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/skr/firefox-150.0.3.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "116eabc0df45208024ad748dccd0560d402ef0e07120668cf38f460752dacf93";
+      sha256 = "76a5af24cae928fa8e75eca1ddeeb341d8b3db7c764ab5fe2983ce76fe5f971f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sl/firefox-150.0.3.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "1d9cd0ee1d9c1ee32836dfd2528df34b20b58a6f7b048ac992856239b6c9f45a";
+      sha256 = "8ea2c59728d235f6ede416dfc4b9c0c68667383ec902235bbda0978cc83efd63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/son/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/son/firefox-150.0.3.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "d664e04da60898edc227eb6c978c94d09d9c704186ab11c7f1b3d069d371ee0e";
+      sha256 = "10f3ef71708c527e100e15314d02263331f413af014529115bdb9e92511a0029";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sq/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sq/firefox-150.0.3.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "1809114fcc1f39a7cf5fba17c7cdb7c388d7db200140e72e43eb68cf51e56ede";
+      sha256 = "e1d234ac615a6be12521e9298e7a05009bfeb20d5fe79bf0d5c6c700c7711254";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sr/firefox-150.0.3.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "721c182205e4117a8d361e1b7b01e5544b6883c08c55baa0228ee220414fbd00";
+      sha256 = "580acdf2e8ea44817cbb47027b25848c271e367d1b8d634d919c0be45639d8cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sv-SE/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/sv-SE/firefox-150.0.3.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "47f22dc1ea086df633dbc2cbc4e758a6cbc9d54b01e0c90904a3d0d4cf4b3d79";
+      sha256 = "b42b665b3333970d5b80e4faa81c7ed8088fde7e25bb11dd7e834f48d1ea5b5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/szl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/szl/firefox-150.0.3.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "f87f2c5233d5ae337c0e7e495636b40279fa94c5d193b0f1f81dd3457e7a9e29";
+      sha256 = "ad4ee3459216f4de9a4591aa6bf377f7c242c79b1bcde7edcd039eb2aa62a627";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ta/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ta/firefox-150.0.3.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "c1b15e4ee9698f76104efbff260cd74a3ce94a6511f4f4c3117291dbbb624309";
+      sha256 = "414619fa8c15531f898ae1ce59e6b3f02d97054c910148427a501eee05539d7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/te/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/te/firefox-150.0.3.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "dd0dc5f8dd74e75104054f1f654adaefcac5bae0f1c41bf516c4962e9d9aa9f9";
+      sha256 = "62739c34dbddc93ea442a85095995ce95f0812c7ce86e1b6075fcfa41608d048";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/tg/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/tg/firefox-150.0.3.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "1d304edba33e9dca7e72905593de1d3e14ebbd56602ba43c00450e9a13cd34a2";
+      sha256 = "48348263b0e806c68a99c4f451da31f4b0e360d371783ebbc1fb24d97b4eaf0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/th/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/th/firefox-150.0.3.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "73ca92e278c3eaf6598a76679f47b6efc4d617686247ba1fe2f19acdd30668ba";
+      sha256 = "07180251e6a4a94506bfcd1546ded10307d825a7847a9bbc861308da647d706a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/tl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/tl/firefox-150.0.3.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "fa1fcddcb3f1d87d326f05613de3a99ab3d4f445b4b14245c5ea4e308020fc70";
+      sha256 = "75d2ddb6c1293653b96b7e334d4a42d65aceff197b39d8a46f0db2d08f82bb69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/tr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/tr/firefox-150.0.3.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "e3f709f5180be6086baf6ecaa3aaeb1acf0760ab37ae7a31b733ab0b974b5848";
+      sha256 = "392fdbf3dca29ff825ae6ea818e16a5b0518daef775d28eb600d655a3f5aeae3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/trs/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/trs/firefox-150.0.3.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "aae7fdb048cc4bc752070183d24db7acd19f41545e4dff1448274d161a72dbb1";
+      sha256 = "38d0f308c6f01e87119e72e2c78bc04887051cfe19a1d081c95836522a312ac1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/uk/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/uk/firefox-150.0.3.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "acb0a8a039bb68c7dcf7447c2166c3b38b0adc8d2b06647cb88fb8cdacb5265c";
+      sha256 = "f6e5ae5a73b2e5df4b9803c6c4cf70e8033b7a900cdce9feca2ce15a84c3fba3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ur/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/ur/firefox-150.0.3.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "4203ffc02c641c0418b32a542c3e17ee79b37cfe0f84daa6c5be1222dd078916";
+      sha256 = "1114389bfa8b4fa878c8a682955659705c4e5746cf91a7d613dca0133a364a1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/uz/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/uz/firefox-150.0.3.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "49c275a012b480aee408f3f4e344f2e7c94e1944dfa897ff12e957ad2faaea68";
+      sha256 = "ddd541250de960a71494b9533e66fbe17b0b4ee3133e55b4fafc3b3620cc0227";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/vi/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/vi/firefox-150.0.3.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "b899bef5925fe50e87d9b035ef4f74b9346fcee88d8a71da56aafec924abfb5b";
+      sha256 = "1cc1aa1b8bcd7fccf73d8357a9ff666cf1ba6e94821e8b22e4aa210be202ebe1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/wo/firefox-150.0.1.tar.xz";
-      locale = "wo";
-      arch = "linux-x86_64";
-      sha256 = "81d19e8b73c5400067b6c10d822389227b362ba8e0b4a5f259ad5180d44e8e53";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/xh/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/xh/firefox-150.0.3.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "93550d5d0fc22862165f7ea6be56866184c0e9682ddd78fe9c2e39bb8ee91429";
+      sha256 = "1bbbe449feddf3c3bcfbd5b51b2227c5e656b4b2c3f0458525c5d2f542d2dd7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/zh-CN/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/zh-CN/firefox-150.0.3.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "6e636a89f9b8b5843a0771be51019cbed3e423b54ccf5343f571afa10c55bdbb";
+      sha256 = "6a9bd9c8c197826c1fccc8a5823ca6f81c04eb685d07fc65d3e494dad773d7bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/zh-TW/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-x86_64/zh-TW/firefox-150.0.3.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "ae716b38a97120a13bc0d83a1eb8645ba7e172ae7a6e9bb154923ad42d195650";
+      sha256 = "e9e9b9b715f609afeefed53b9bce5560106470859ea8cd725886ff6a6534ceba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ach/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ach/firefox-150.0.3.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "910dd87259210daba781325b2e50c546ead88bb15f94f7e516f5c8bc52038acd";
+      sha256 = "609142b2e36f495780fc6cbf9b429d00653d9e5b266aba4d0fbbd6235be69659";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/af/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/af/firefox-150.0.3.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "dbe844fe5cc2f8584bc066ccb3edca2d1114730155802ac3b43d6e2c7bfa916d";
+      sha256 = "7ae1c6de8c829c840fcc417070b0e24c1dc8f058fff6434aeccb127777396e68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/an/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/an/firefox-150.0.3.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "459950fdeae20b8ea1ba5eb33a34fcfb68e1dde611e37432acbbfa5d35d2b412";
+      sha256 = "7b25462a271226f660e46fe72c3c915794daef4823e1b6bf1c847868033ba145";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ar/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ar/firefox-150.0.3.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "908d14dc45cfebaf9ad6109640931d325cb7f3dd3ebcda18e367f762114f2ddb";
+      sha256 = "8e290a30cc7df79c249d4799cbb458a5385bf456e2d8eb6691220719f73013c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ast/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ast/firefox-150.0.3.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "b138b3ae317e1af4846a348428752a5f3d81133bb3ca7d0cb4cac78a671455e0";
+      sha256 = "f63b32b398fa7838e13a4009584d5b32b71351ac9f4da40d069b5e8f16797b02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/az/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/az/firefox-150.0.3.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "8d05dc93c246be985255edcff836b3a4dcb00c5e4d18ebb5ddf90b2b0245ed04";
+      sha256 = "d6bb3bcf504899c291197bd6fd1e253cbe30966cf8525d0ca98d151f250275f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/be/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/be/firefox-150.0.3.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "700cdb0e00e83b606158fd7a3008e3df758af53131f525a1f2c61128d3c57559";
+      sha256 = "c1104590bfbcf7893a91d210eabf6c596e0567cd1ca2e3adf09af108f12c8a26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/bg/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/bg/firefox-150.0.3.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "fad7345dc157a279a45c14f5cf6ae5375ec647718bb407647ad05c4481c32829";
+      sha256 = "8c67f2a9ba38319798b87dd1c5dab1d32e5433a6e153aeb2a42eec6009316fd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/bn/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/bn/firefox-150.0.3.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "3634edd19c446c4a0467f8f3854ddf7a81e30656aeaf9d4561ab0c653d5b6089";
+      sha256 = "dd99bb4b20bcfcb6ee207a626f55c2cafa690212554696dc39b8f1ff99ce4c0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/bo/firefox-150.0.1.tar.xz";
-      locale = "bo";
-      arch = "linux-aarch64";
-      sha256 = "b8105ebcf2d955572f7a36bf9a03f4c05d63a11df83baec3496769dfe97acdc7";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/bqi/firefox-150.0.1.tar.xz";
-      locale = "bqi";
-      arch = "linux-aarch64";
-      sha256 = "44fc51ff937c71ce644bfef7a942731b2a47ee66a34bf24d9438588cb8b224e5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/br/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/br/firefox-150.0.3.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "6d2bf509548feeace1904f6e0d9fdf035372777062c4f1c84c085875b7224d17";
+      sha256 = "e0a1cbb25bbecb6e6d353bb26635eae3123a916d65cf5aba8d110f8a9cd33740";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/brx/firefox-150.0.1.tar.xz";
-      locale = "brx";
-      arch = "linux-aarch64";
-      sha256 = "b935ea946b2f6955a4302cd22a204538ae96e674aafb217f2bc26c2d7da7c828";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/bs/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/bs/firefox-150.0.3.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "e3e9d0e21b157948294403b1714c07d1cbdbb5254b2f1032d032784b28ddb80d";
+      sha256 = "6058300cef0b3dcea5d0a6668a781c4d6460d0970120419325cc82e147ae674e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ca-valencia/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ca-valencia/firefox-150.0.3.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "32610991c8831417b8df60b57f01743692809fe439833b99e6579738720988e8";
+      sha256 = "fdc4dd4cd9142227929defe2c029c6870ad6653925c8e092c99a46cfd6030f3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ca/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ca/firefox-150.0.3.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "111f8191b7584db3e84ccfb1138c36dd11a385bf00281b99f74e5ed32aaa1a95";
+      sha256 = "4e0b515065940e05744d4ae8b7f2bd8a530a576d285ee9349f0157bacc7666e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/cak/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/cak/firefox-150.0.3.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "e81a113824976a5a9eeb531e91040e1b7c904a66fc480b013ea6f409a171041b";
+      sha256 = "32b7ef7ddc8f85d727b950af7eb120206a4da390cf8871e8cec2f95f480646bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ckb/firefox-150.0.1.tar.xz";
-      locale = "ckb";
-      arch = "linux-aarch64";
-      sha256 = "579f0f3bd781d8cade5be3e5b3b4826b3ff65135cded7e24395a11d6bcc274d1";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/cs/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/cs/firefox-150.0.3.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "03e7b4241c6ba9bb91ce71702d7affa989e9c505ac9cd79d78ed392f4a394a55";
+      sha256 = "2a2e86c4adb60d7d695e4c9ca215e688a4cc2abb152565b6fad27e37f7ff805f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/cy/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/cy/firefox-150.0.3.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "c7f966b86291160687e79c105d1d3f5203386112e171511d80d065a663b05bd7";
+      sha256 = "504abf3b27c3f832d2a493be02cea13bbbeb96832ed99846eb32d880848f899b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/da/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/da/firefox-150.0.3.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "4b8cc62221236e8d698505ec650bc42cf6bd08fbe8f8537d5ce6d703a1a45836";
+      sha256 = "1454d2610c666c9e0927e0b143cbf6a2df391da9089beb0d6c445fad8542881d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/de/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/de/firefox-150.0.3.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "607fe83aaa513237cca04bab5425c97911fc34d89a53fdcc13f53b1a7e5c9e53";
+      sha256 = "634e3f3a68b84f4121f7b99879c5abe126f14c727ef9d64c76b50cf331d2b7b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/dsb/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/dsb/firefox-150.0.3.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "b0223639f7373c0cc5b675e89e31a77d9f59b7c559da49cf866a16919a79f508";
+      sha256 = "9caeb08a987b1538005243ed70145c30285297f0cd1c580e87e919cc9c85f51d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/el/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/el/firefox-150.0.3.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "3c97360ac2afeb34cb15dfb5755d7c89b320f69deb1564bc4ac07d3c3958a141";
+      sha256 = "e7e809d616c80a7249fdc9cffe0ecf8fc590517ba7e8f25b29af1b991ddc68ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/en-CA/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/en-CA/firefox-150.0.3.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "493a0a53f94c3a964a471d4b72163babf2ba456dcbf983cb1b53dc3063ae0fb4";
+      sha256 = "78c9869393a40d6c72b19d9ee8de6160fc59272751e37f84b9e10800b4763abf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/en-GB/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/en-GB/firefox-150.0.3.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "0bf22734ba59b5bfe8bfe7115688c7bff15f7a145b94245b0f2e929a2d7f9af3";
+      sha256 = "8f2567a4425d62e619b099bb592109c803e7b16e0250afc0feb1b1544ec76f86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/en-US/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/en-US/firefox-150.0.3.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "518c3bcfe5b859a2fe0405f9fc9ac4271072dd68f3164629c4ecc14729ed9c7f";
+      sha256 = "04dba22d48149121d04b3c934ad4b505b38ea13c652f394ee645a65c8148d56f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/eo/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/eo/firefox-150.0.3.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "e4a4eb335a85640bf9723e0a63aa66713cc96aaa55696e43de887b6355b3fe80";
+      sha256 = "5576dc2eb993c9f79c6f0e58e898abb98eb2840eea040dddaf9d15a48baddf92";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/es-AR/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/es-AR/firefox-150.0.3.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "78873ac54608fd436220415e225be4d6ef37229cc0af116164f927aca3b430c2";
+      sha256 = "523e5dcb8eba0696e2d0fd9235327b34e1b22eb66161bb515983632a078194d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/es-CL/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/es-CL/firefox-150.0.3.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "add480f9e15598a1cbed863aa7acf4c76ff703a9fd56c6695394561e231d4ede";
+      sha256 = "4ce1ba60a5a56b5141d9c93484215e0cc83f17a05d022efa2d84ed27294f161b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/es-ES/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/es-ES/firefox-150.0.3.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "48cb9dedceb524023bc70145d685259a3e743b117fa7a7743aeebff2a07937f8";
+      sha256 = "980ffe716e56d63e220d063ed295870fc448dfbe5977c41e1cff001cc8d8322b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/es-MX/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/es-MX/firefox-150.0.3.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "096731da41334f1ec3112fa5b07b0c5335c358fe932155b78736eb05f56d8edf";
+      sha256 = "03e4991204f5d8e792c55c0fed319965298d8a4ae938d4edae5b21cad5490aa8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/et/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/et/firefox-150.0.3.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "790eb765d8a1ad0d50d03c82a35345a65a7ab5ba0f0c71bf1ed249f0bd65d2e6";
+      sha256 = "1680a1eb650aecd296821e284a23b23c00c8161d14c5a5bf440cfa04217baedf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/eu/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/eu/firefox-150.0.3.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "19bdb6d0b9e28572440c1eb9cada15cf7b129e366781fb90de8087c8ea58f8bb";
+      sha256 = "8589a59a69c7a41b2ada5047bf41f73c498bcb567df64e0cbe3b34ba04dcfb23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/fa/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/fa/firefox-150.0.3.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "b23b79cef42c1daf3b190e14bdc7b52eb9bdde17a19dfc0bc36074ffe9868d73";
+      sha256 = "0e7463b8bd40d2c80b1fd682779c59c6e2201673cec74d444c8094e83b87d837";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ff/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ff/firefox-150.0.3.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "d8726f896933022054b95bbc29da0a616d1094528bb1c1a77d1bd54ec57aa8f8";
+      sha256 = "c4871f073a8361302073221f3018bf507ed7c7622f5d76e8aed5640d4bf46bb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/fi/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/fi/firefox-150.0.3.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "76a5db7fe2709e68074e80823151eaaddd7460e29fab797bf657c2b9db023fac";
+      sha256 = "8a7014b69f9bd97a308451fcff32d49b81d71ef8665fb9adac5472d322e0036b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/fr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/fr/firefox-150.0.3.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "574c9aa9e8806cd4bb60f86503be11a0ee6914a1f0710433717fce0c880352f9";
+      sha256 = "018b5680940243ea75fbc8bf5c400e0ac56105a4acaca1949bf211e5a0bb6ddc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/fur/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/fur/firefox-150.0.3.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "46239042deb73913442236ab5c49b1486d996078710fe537ae73ed11ad1d4b1c";
+      sha256 = "6da3116767ea86e63471666baf9556cbd2b3414d5e5678b8552239e518832b7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/fy-NL/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/fy-NL/firefox-150.0.3.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "efcf678e26f400072f3976004c44c0d9236bbfe6fe0a42f335d1ba2faf4d728a";
+      sha256 = "a83ee94f813fbde530450fb7474c5103898ea3bc96d2c69d2a49165158330c0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ga-IE/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ga-IE/firefox-150.0.3.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "80260ae606e9656c85ac24ea9404ac5cde7e88b531f26fa904c3c70268698e28";
+      sha256 = "55d5b536906007d90667eb45ed5aa2712f01d7efcf2cefd1bb342e9c9caead4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/gd/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/gd/firefox-150.0.3.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "31e77e7c5b4ec9303bf46af168a53bb360249ed87cd1f18095e50d1750dab150";
+      sha256 = "0eb5db71cb9924e7d514fa9c69d87b637ac4b8a2337a5a9c1cab2703086a89a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/gl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/gl/firefox-150.0.3.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "b3189d324834fd21107a82fde12bd2be0e4dfd29017328fff6a276af8322a118";
+      sha256 = "d13e92fe4f4bf1f7bde9fb3c4256eca0ecd4b33469a54e566750c22a7d930760";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/gn/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/gn/firefox-150.0.3.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "9c3283d98b8716d6a2a11261eccba29d6cec6dcb7b8f4e190ecdced7e6dd7262";
+      sha256 = "c950481f0ce79058facb0284b5d701ec4e89f53537c463f18d6db0772f7794ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/gu-IN/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/gu-IN/firefox-150.0.3.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "bb6b2b8cc620e328deb9dcff90e671c5cafe702b19fafbc9af81764429ed07b1";
+      sha256 = "4f4b0a720f1d9fd1163c7b32476000cbda79aa645dcd92afd8b5ab0e4422fd63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/he/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/he/firefox-150.0.3.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "55b9954cfde56434b8c0dab9e76c409246cc66f6a9dc69ed0d42d7da93a6cae8";
+      sha256 = "bc4e36dc5a79db5ff3f8cacf334177fbda100f4be1d9762c555c2d9cd42af15b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hi-IN/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/hi-IN/firefox-150.0.3.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "2ec0590056f85476199e9f61a4a59e297f53a4793aad749bc88e5479a6bbb5cf";
+      sha256 = "06cf47c19ae73c097342ade1a936fcda8290b3b57c50655add4342843ab458fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/hr/firefox-150.0.3.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "bfb02b878e13f4a1d98b9631659a07ae075a607bc328c3ee5aa5ac86bd42f6d2";
+      sha256 = "ee82c974d8c16d1498435299af9926c3ad508bca18eb6d41b3eca68182a07f44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hsb/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/hsb/firefox-150.0.3.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "e6d5e54117250e22c6c2329a4b8c98546d65cb27797c9a42f69cfc92c72cdb1d";
+      sha256 = "b0e6dbb6e9f39d889a5ae6137b0b00b8e7d26ca4ff8bd6d84b8a8581ff2340e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hu/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/hu/firefox-150.0.3.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "3903debfd0638dda86b13d27c92585fa3e8fdbb750366d77d83bbe1f6b29b29e";
+      sha256 = "1762cd4150d8ea4ce442d61e13c645bc7cc000e49bcf2c6eb186cade8c6865ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hy-AM/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/hy-AM/firefox-150.0.3.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "624f032b814ba01334ec52727bf9cbd3805cf94488994f0e1076ebeca21e8bbe";
+      sha256 = "dd813c5bbdae53745982f7be3b962f310a2058a97a8cca08e2ac244e457de56c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hye/firefox-150.0.1.tar.xz";
-      locale = "hye";
-      arch = "linux-aarch64";
-      sha256 = "ffc537707535c9a19ae66ac684c4792882da0986eac643d118614c67bb3eed10";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ia/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ia/firefox-150.0.3.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "51f84bf0c6cf4c8783553d113ce079153225e3df8c0c45462e3df70af4b31b79";
+      sha256 = "92060ca5ac712853903c4c25d5f1008b8c0edc321ca7d07872b18d61a7528fe7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/id/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/id/firefox-150.0.3.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "7613525439e39b7275887b6dcd100b7bf2d3b9fb4ee0c43525974376b1040243";
+      sha256 = "86e494b77a5df88f83cae19fe119a6b4c5fe787c899dba3657450accac2c2372";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/is/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/is/firefox-150.0.3.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "c2a85e67d6bee9d9149badc4489a4d70a8716e278819e03379c309471ed93ef5";
+      sha256 = "e303c74ec09e5e9c412684b85c6fe674d9a6a8f99eaae5ec4c8fdee7258cce41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/it/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/it/firefox-150.0.3.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "b2847b5bd62d3551c6cea210fed3a42f67c44ea500d1d007b574f8958aa8759a";
+      sha256 = "75286030038c669c8603019f21015468ef08ca952d48e0febc1cc3734afec7e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ja/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ja/firefox-150.0.3.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "56620a77759b736c554a3f825b8d8e643e8d943e5330a4b2d378a6ec618a8f9a";
+      sha256 = "99d3c66cbf605b18a417ac7e8503504bdc5d130f7b65943f748cb05a1e419473";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ka/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ka/firefox-150.0.3.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "11b0d303dcd30bbcff1e918446cb0e2134ff58adf33f8836e53ba743832ebe36";
+      sha256 = "e21892a51e7e89eed7be2232abf3f4e0295803c08f300da780b50bd217ce244f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/kab/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/kab/firefox-150.0.3.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "d2ef86d352a2a9ac56f25368f9174a152b781305055725e796118e2600b86a3f";
+      sha256 = "444382155f323ff8bfd5079ab3cd2e153d8ea9d95c4dc3bd6aa4372ccb9d5ef1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/kk/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/kk/firefox-150.0.3.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "b143536df5ed2798a836306c3bc677490050f37a11b1027a03b061c136e36e4d";
+      sha256 = "4b0d60ca1778052e23fcf8302889e3b8ed03cb4b4383410f7a3c48bf4058503b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/km/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/km/firefox-150.0.3.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "e4d4285bd3ec06cc6183957d7c21374661945575bbf89815fab92211b1f4f142";
+      sha256 = "52645c40e961b1cc03b5d9db4a661311e1bd071331756a440d13fead456be462";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/kn/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/kn/firefox-150.0.3.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "3d62a8980af44837d04946fecb786869583951887804791496ed9b407388df1d";
+      sha256 = "4cf67abfd7d553b4d67b340f047644e0fa0bdab7db657e2d4562a44d6fb9146a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ko/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ko/firefox-150.0.3.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "7c3013343f1d52b2345983452bda56dab05460f374dddd03e1d198ee92d537de";
+      sha256 = "9c710febcd8cd5a0c4f292bcfeef26c86fa4d8cf9a3f195afc068751489da97e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/lij/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/lij/firefox-150.0.3.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "71211c4c8dee826dae432f77d7d26e4da19c939714890b11abcd628c9443bcad";
+      sha256 = "55cab9d3e0d0a4a8a4c0cbeb98d0bf6a93e48d8a0fd4f2c6bfecd89601f8d99d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/lo/firefox-150.0.1.tar.xz";
-      locale = "lo";
-      arch = "linux-aarch64";
-      sha256 = "e78b38500aff29d791eef802e7bd328f9b961d53c276ea625cb36156126df70a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/lt/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/lt/firefox-150.0.3.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "d88dc2b7e1331de2ef82a6960020b7a0f27dcf8fb4c9de4de199c66ba6fc51b0";
+      sha256 = "1095dba04b0fdd6e8f62cd101519dc70b58c06514ec8fe29129a4c25f5b7d760";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ltg/firefox-150.0.1.tar.xz";
-      locale = "ltg";
-      arch = "linux-aarch64";
-      sha256 = "45086a95b8166412ab51a8db6446c540b9dab49a779eea8656e010a5d31fca4c";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/lv/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/lv/firefox-150.0.3.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "2bbf06086aab432fd384416da0d5ca872df102bc88d9006ddd83dd6757c5ef3d";
+      sha256 = "a62e5dd7258dfc90718dd1e4e7225c966563cb1cbc69c932d0a39bd2700bf0b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/meh/firefox-150.0.1.tar.xz";
-      locale = "meh";
-      arch = "linux-aarch64";
-      sha256 = "7b7fe732cf7246d11b2fe5c889546abfec1649e06cac3df3212c36a65e5edc87";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/mk/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/mk/firefox-150.0.3.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "3bd132654564c9d6da1fe962bb4ffa24db04e0c5cc10909312bd892bdee805f8";
+      sha256 = "6f02418ed0b7d9b9d83c383db8c9af514d73dedd591bf7a23f953512dfdce720";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ml/firefox-150.0.1.tar.xz";
-      locale = "ml";
-      arch = "linux-aarch64";
-      sha256 = "c2a533d488c0b1a41380aab5e8adf24bf4d228f2c3bf9105a5ca06ae598e13bc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/mr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/mr/firefox-150.0.3.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "584cb5c0ce829333b8789c5c0e3b0b92e360528525d1b7b26095e9aa7451ade7";
+      sha256 = "95f79acc5f0351e7328602bc10da43e71c839f3a836e5ebad73d6032e19e368e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ms/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ms/firefox-150.0.3.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "a0e657870a6727167b9d09ca64a290240ad70603dd1f00041c98567cde2ac79f";
+      sha256 = "1b5990fb87358ceef5f038a13e12eb1d0a84f54c97daf0c40e4f7d831fd88559";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/my/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/my/firefox-150.0.3.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "0be94e433659efa1195fbbd7cc3dda57a27ad792d6f27fcc3fbb4ef568c6ba24";
+      sha256 = "3727df44bf1b33d427b62a93bcfd5e3532fc85294847a88da9fd1c0b4b96be3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/nb-NO/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/nb-NO/firefox-150.0.3.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "13a7c44869ad992b3b5e5d96bd728da805c008ddd6911a9a0b02080c0043b1ad";
+      sha256 = "711f96f135b3016b4652992f931308a842d62ef3fd91579756a2696c77a513f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ne-NP/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ne-NP/firefox-150.0.3.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "239cb386656b0b399a28fd255e5e8f87dd8cf88494ae6d2d68e9bffddd8aff82";
+      sha256 = "ece69ded232925d5b75c07c7cead942426827f7b8935389905c4da7d4cf04596";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/nl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/nl/firefox-150.0.3.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "7d8b35934fbede88f8fe419db69823fae84ec0fe76b975ac0b91684148fdb1d2";
+      sha256 = "7f25b5d90624642259d2173bdca8efeaef7e41e71fa89fdab50173b503c5f99a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/nn-NO/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/nn-NO/firefox-150.0.3.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "8a5cb9d59f364915ccfa2422cf0b89eeb0cea0955e6104634f982c7e6c03a0d1";
+      sha256 = "04f6d46292fb789ba4139fd2801bde18b9152fd8d5d515959e3107d0deec6763";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/oc/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/oc/firefox-150.0.3.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "c79e5e732756d38f55b41ad41292b094c24f39d6babd3b49650ca9fbd71b8606";
+      sha256 = "795230f7a96e1624bb6a341b8a172c12e89b584b4a5bc3cede089e58e7153600";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/pa-IN/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/pa-IN/firefox-150.0.3.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "6e8f56c5b989333fb0a38bc4cda2cad8822b622dcc46614a634f4e508973f631";
+      sha256 = "bfdc3ba2dde0a62cbad1bd1b0e4fc6334f9ee4b66e75c59b8b40fe744eb8b6cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/pl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/pl/firefox-150.0.3.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "9552d9903201258af9ae36a7e83b33593280ebb560e2c43e03b0210fcc0aec5d";
+      sha256 = "89479a1a75575fad97879f0a13fcb9e3583e8f6a2cfff99dfb0f86985cdddaff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/pt-BR/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/pt-BR/firefox-150.0.3.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "aa0a2910705bf3ad409289403a2a53c99f050020e233c94055dc9256b7a81dbe";
+      sha256 = "dc454c03cf7ebcb9e13266e30a12219a11599be49b5c8b8d94b64cf65800607c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/pt-PT/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/pt-PT/firefox-150.0.3.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "9c779f7c6ba13d77878cf5d3677bd8a079f30cfc69c9f140a6f4d6a31dc3ec5d";
+      sha256 = "7032f11e50ab917d5f53846a2e09e70bb9a163ecb8dc3eec1e041af943e8b42e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/rm/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/rm/firefox-150.0.3.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "f90c9cd8cd7d8adbc235fc6b8c7bb009e91101473f4a2e722d4746b29534daca";
+      sha256 = "c76935fe32c69581dfe49a71d68cd173f830cc6e9a84f652d69360d946b89d95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ro/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ro/firefox-150.0.3.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "b5cfb3ceee3ff68a831f4251fe653ec080b3921656814b4c8f034058ba8ead9f";
+      sha256 = "ee62d2d12b2acb2d8544478621f3c5e8ac7ae76de14252999640424efce68534";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ru/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ru/firefox-150.0.3.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "72c877dc903a52d2375348a16fad7ded617ba199016d6f22aada1f28c5035b62";
+      sha256 = "dc93bcfd05d4a49027aa530216156d34a1f882bbc9e4c6a66cb35eb940bacc3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sat/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sat/firefox-150.0.3.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "ac17c01232d386ae52eaa504f05b70a22db1dfcbdf463e1020b5351e07265a9d";
+      sha256 = "047ce0f2aba3c43238c475fcd9827dbfe77028fd5baa2be92ad149effe47362b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sc/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sc/firefox-150.0.3.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "a7809ab6f568896beb07b1ad7106ac6f514af736a40b5d91fe351968c421bdaa";
+      sha256 = "9e07f64f3c67682451fcb28bc6b40074101f959cb8f7e2a648a209a8368cef47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/scn/firefox-150.0.1.tar.xz";
-      locale = "scn";
-      arch = "linux-aarch64";
-      sha256 = "e6d09b48c3ab312504f932319b4b0fb5389ac282be44221db222837f129bd3fc";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sco/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sco/firefox-150.0.3.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "139aedbb5d6293fd939ab84a9bc45980987a1e7015d0696d66bb76dd726cee44";
+      sha256 = "ff09ea9b2d5bc328eb6aef2f5e44e79c914087db873390843465ebcfde2084cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/si/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/si/firefox-150.0.3.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "7c78c58f7ff019fbd9ae99fdd71085511f8469b47624bb9794b5a19c96c92373";
+      sha256 = "01cc154a4fc995101e834b2e50cd4c410314904f6bdda8ac1037f47b31b8bad6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sk/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sk/firefox-150.0.3.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "015c865fcd5ce8cb3da3bc055146ad1e3d84ac2ba034dad8db1cf5c40458ea93";
+      sha256 = "0dbb0c589a5a72e18485c510f8ca5d10a1a8e714a0d61a64e33751340f951b7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/skr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/skr/firefox-150.0.3.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "0886595e8ae4776a83ddcddd6c2d8bf2257f8fc7b37693b3a517c66d154527c2";
+      sha256 = "813eabfefc00872793aa67dd7146125dd8c901cbce6ba20b20778aa417514736";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sl/firefox-150.0.3.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "96541bb42b73f27162a85b9318ced66dacee185b2d76831416453859eebd82cb";
+      sha256 = "89f31ce36efc94fdba2437829c2d3142deb58c52f189863ac1a972c1dc96fa3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/son/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/son/firefox-150.0.3.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "84f42c1c8a6b28408dc19b9c8153d1e8b4e2f578d60b5dec175250015ab41dd6";
+      sha256 = "21cdefc0e9ed59b9e38959c2d854db1dd0155a2868a982ea579f995adf565835";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sq/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sq/firefox-150.0.3.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "6ffeb766f19b53763691e902f6a01584720a248b52cbe08bdb530ba7f9c65971";
+      sha256 = "b9a6996b964bc3549978d9e4ff27606d48d5ef3d6f613aaa8e639287c62de50d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sr/firefox-150.0.3.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "ba6d4769fe30ca2c6dafbb9d9acb18defe2c2b7c48bb80a9d7a7579d23b236ff";
+      sha256 = "72965e30194e03d273150ef3cfaf76d2cec6764a09a2e2c0e439089d53d996e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sv-SE/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/sv-SE/firefox-150.0.3.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "9f3b81e42d918cb964c6ecd5887658704d8192fcec57123edea739ae617cd02c";
+      sha256 = "692be357be645a6bfeefd2e602863495beb193205bcf7c22556c62df91c9d6b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/szl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/szl/firefox-150.0.3.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "9deb181dcc5d6bf24c2e14cc690cd867a7c3ffa6589899a7bd98021137c0da36";
+      sha256 = "7ee22dee8d511641992808a49642d6c550070814fe4365bc7775fab12f4bb718";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ta/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ta/firefox-150.0.3.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "00987b9eedef78a5611860970d54c567cf441f333b1fe2d8a279b0babf1cdc85";
+      sha256 = "0f6a8885c331cb628b20432ea71fb7c09f90b9c069a29152d7ba69dcb9d60294";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/te/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/te/firefox-150.0.3.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "68a41103ae728f3bddc4632814fb4e9cc37d338ac171903b8fc51c18e6610d4d";
+      sha256 = "c2919357686479cb86eb1644ff6817c219ccc7f6e429c215e681c023102f5012";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/tg/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/tg/firefox-150.0.3.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "48db88f96b0bd6719005a1e240988955b85489662957f77752e283d8eef8f5ca";
+      sha256 = "7a58b99b0f9caec85c6b5a6288900ea62f18b037af2dee71477d91e105775c2d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/th/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/th/firefox-150.0.3.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "18bb5d344710cf0a66d23fd221c55fab6c80932e4023301dcee928d48362cf91";
+      sha256 = "f20ea4b0bff9cdc210bffe06dfc9efb4cec7ab597a1147507b438a3c96b4e97e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/tl/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/tl/firefox-150.0.3.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "a1a8beaf1a316e38282c0f1478f6b6e82ab84a341a88c0edc8e446f53b201839";
+      sha256 = "cc3b683248ecbff2bb9e77cfc2b70b1c4d1d0f0a365cfd81a1e1485185584053";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/tr/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/tr/firefox-150.0.3.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "1cff2234f98902f95688bbd91411d65fd577164413c6de781d34c2275d74a517";
+      sha256 = "381162cb8eaef72a56adb6ca4b89326a4073c34ddeab88dd45c10c53934f33fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/trs/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/trs/firefox-150.0.3.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "3c07eafec76bf6fd6a4f50476fe81b4eae905175c05365b97107e835c2b2051e";
+      sha256 = "bdc9aef10bbefd59609d6851b2ebd977bcca4118135797f6dd000f3c103e1b06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/uk/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/uk/firefox-150.0.3.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "bd182a49930c4627bd2ca3f83eba539fa176a5061bc7b3187991b7d068b5406c";
+      sha256 = "7b04226407a07e5b5d6edc8690f6921352863b3a7a1f3ba1967a1e09ae2cf863";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ur/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/ur/firefox-150.0.3.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "0554f5d004570663b78e171eb009bbaa94683adec2af2516c2dfa0646737f0d9";
+      sha256 = "96ccb73f09bbca1ce94ebe429faa32f05101381faffcfe9d6ba626bed81addb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/uz/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/uz/firefox-150.0.3.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "efa72ea250f4d8db45e13f6a609c46ee2fa6f86aa13c577292f169ed9c5788eb";
+      sha256 = "fbaad41c98c45387cd7589d47379a0888af4fb4b01deb7331c5628b603db1341";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/vi/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/vi/firefox-150.0.3.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "3d16128d05374def7a12783a323d0ceb7ae0f547c981d81227a951155437a706";
+      sha256 = "d3c0440cd82b2fab56d82caf07cb30860f8bf5f31aba40d822338db9c7703ad2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/wo/firefox-150.0.1.tar.xz";
-      locale = "wo";
-      arch = "linux-aarch64";
-      sha256 = "aef236467b43f37f98e867c4f75ab0da3d7d96149eaf323b8a8c9209a4305b7e";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/xh/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/xh/firefox-150.0.3.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "d6bb489a2d1cacb4ef1f1d43b04ec8c4edc4b4ab1d7bd734824b93279a39f47d";
+      sha256 = "b986d2a7932256045a05bab515b78ac0fdbdfdda5d0ff1a5a05fb3d9cc4445e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/zh-CN/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/zh-CN/firefox-150.0.3.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "055524b16616bc351b18cb9d3307adf1f78887fe3f2e1f686149d04809cdeee7";
+      sha256 = "9a0d3fdf58281e5bffe133e51493cb751b66269b55565e9bb19b1ad1f73210d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/zh-TW/firefox-150.0.1.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/linux-aarch64/zh-TW/firefox-150.0.3.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "7d7b833febb3d1d60d62bf54a26cb6a47406b3bfb1b0f8e72657e220a2335b6c";
+      sha256 = "9cd8e386f22ff6ef51dd7195c65e46a44451532fb1bb6ae28882705005b35f99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ach/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ach/Firefox%20150.0.3.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "c2518f81742075eaf16f2630799397c7627f1e1df8d79f93c81cbbcc33a409a2";
+      sha256 = "e8ae2695a5a924a1b12e494f0443c00039050e290173f6076c905319b5540ed5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/af/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/af/Firefox%20150.0.3.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "e9a78ec3e57ae2c56dca47597a452fb68d8f8f16aa10dbccf1dbb334b6c09064";
+      sha256 = "0e8a5d5958cc30dd6b8f4f5dd442f2ab5b8a940d040f4bcc97ba1691e40fbe68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/an/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/an/Firefox%20150.0.3.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "c883a4c46ddf15d287afe2067dae819071bd3d4ec8f88d01685d3d4903567cd6";
+      sha256 = "cbfecc85abee0af5c14d66a84a26effd83a683ee8644a5219b65230cf6a8d467";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ar/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ar/Firefox%20150.0.3.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "567d0bdd4dec097d078e1d88d04148585bb4d35257a1cce2a47bdeff33e807e3";
+      sha256 = "0c21d9fb70eff0ce10797322d084a3676c029796f162cbd3963fa5c13978b77f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ast/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ast/Firefox%20150.0.3.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "ec991c807d01840f7f9e45701b682158d64850e70328337b8e1e28169d7b3831";
+      sha256 = "8806f5b47079fe1c1c6479e9a31492f3c9061e14ecd3e60b39c633f415b874fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/az/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/az/Firefox%20150.0.3.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "80c669b37157511082d2d08e9280fe0a187868a09ecd1cc98834117c6bf73151";
+      sha256 = "a2acf3511ff915ac00b646158ac8d32060bfaac7e81778ea1eab7b85dffcdd01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/be/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/be/Firefox%20150.0.3.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "815d972f549f82b81159f001fb9a68815256d1517c5104b1707c1220850e3532";
+      sha256 = "890a3eaeea505c47f47708774f07251c9131f4db666df07818adcaa794c9fd2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/bg/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/bg/Firefox%20150.0.3.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "cc03e352f0e17a1788b017b70cf4f473fa4fa0000855ed84c796ac581d8447a2";
+      sha256 = "2d48e85de949f8c838c65f6f2fad1a7c1f46946d21b62aaeab1572ebcb821695";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/bn/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/bn/Firefox%20150.0.3.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "3d6b15cfc2383396b409701b21dc57420fffefa8966d760145cc748d7329f3f7";
+      sha256 = "60b170e50f4744bb0c7c07dd106620f1a9cd83410ea4a2d4834bf1936eca8c7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/bo/Firefox%20150.0.1.dmg";
-      locale = "bo";
-      arch = "mac";
-      sha256 = "e28d2a4485e5a030a89319e6e09fc5d3f8f6957b8eaddd6fcb0b469bb1fb17f5";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/bqi/Firefox%20150.0.1.dmg";
-      locale = "bqi";
-      arch = "mac";
-      sha256 = "10c37d15762fd6850fed848415faad8d53652e0386c78d35d33e0adc2db5f1e0";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/br/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/br/Firefox%20150.0.3.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "265115a1802bf1ad659a38452204125df68fe5d840c5020b1e2a6b9e373ada96";
+      sha256 = "23ab7073bec0f4891e046ea8e57dc229135763dcf1c5f623128d1cdffc05806b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/brx/Firefox%20150.0.1.dmg";
-      locale = "brx";
-      arch = "mac";
-      sha256 = "b9c3b988b55270a39ddce604ede130c3919f09128da5ff5749ccab95806c7d98";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/bs/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/bs/Firefox%20150.0.3.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "91e872c8e38fab0a20defe160d485ba12552403eaf0dfae1d536c35e06a80ecb";
+      sha256 = "99a134fa46e6ee82022baf13314c2d358f9e52fa92afbec21493dce96cd2e0ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ca-valencia/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ca-valencia/Firefox%20150.0.3.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "fad07a890ddcab9835a48cab50df18563ce25250d046ec61a5d09d55a29e9dd9";
+      sha256 = "975f2b2d5476d684bbe8cb93f1277310ab349f9a7bbb0eccf58edd933e09601d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ca/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ca/Firefox%20150.0.3.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "e53369cfcff306e4a4e3343a5982c120108b168c0d80b0ca0915f536fb35cd01";
+      sha256 = "33e99e6eb159a550fdfdf2e44f22976c7b077b11c7241d0833aada3bb72be202";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/cak/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/cak/Firefox%20150.0.3.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "090adb887dd541a165ee8a6a6e4be79ee96eb491e3d96e5504795304b6f5e5ad";
+      sha256 = "2b4ede387d5e9d31295f9245f7f30e688762399e8226af87a5e104402d72376a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ckb/Firefox%20150.0.1.dmg";
-      locale = "ckb";
-      arch = "mac";
-      sha256 = "bec340f210f21848a3c8862500ae349ec65ff3ac62de9ac64607f4c76ce44d66";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/cs/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/cs/Firefox%20150.0.3.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "01079e246026659b3c2da4e1b66141d5c597117f37e2719b409d1f595d7947fd";
+      sha256 = "51036fa2a9304c14eb303925eb2ebc20d5505eb3f34c2d8a76e03bc11ef37359";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/cy/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/cy/Firefox%20150.0.3.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "7ef6d16950f8fad526606e6589bd2cba94c4da692aad3be717b113bb209eb6ec";
+      sha256 = "dac0584eca0c4a994c0b2d9dac5c10f53c2dfd8026bfa84a725bce3933b7c50f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/da/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/da/Firefox%20150.0.3.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "78c6684b85e8b3f4ad6bfc8da763782e06cf1e9018f996ef623c464dd1c02d25";
+      sha256 = "9bab22669f339811aa0516aa268fab6de11898c72e4efedc618f8f7e8d838b28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/de/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/de/Firefox%20150.0.3.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "f0d6f01a6819fc6ec3c7472372c322b387d00eb7ed3408a89d864d1a73d75631";
+      sha256 = "f1b77c24b0770a91cbeb9b85a2d20751c51f356d4c211f980092870f01b10954";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/dsb/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/dsb/Firefox%20150.0.3.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "ad8b5d6bbb429b40761e71dca6636108c38143a5a35abce3399b55179fa0b99c";
+      sha256 = "b93444135677cffac412f12f5ac766317cdda3f5e32a24d4884efc0f86ba887f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/el/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/el/Firefox%20150.0.3.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "218149aecc7f2b0c03b16d115aea8b71ab083c004c8e172189e07002f5c1aea7";
+      sha256 = "af83a167a76091f9b11d4ca7fd1c6ee7a1d88927fb2794a2e835eab138f0b914";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/en-CA/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/en-CA/Firefox%20150.0.3.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "9afc261a0c5e2f9807b9263dbc9a7da516a44e1e259c4a785c8d4df2f424d5f0";
+      sha256 = "ada93df0f999dd630533782672b217746fd078d0f3d11ec4d71258592c132e6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/en-GB/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/en-GB/Firefox%20150.0.3.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "129f84a7f63d0f1774d747fe74203422a83c38350ca915bdc74ddc81df4b22ac";
+      sha256 = "c458dcec2f782b136fb2f8d62ca2b6a4e22c7b3eced14a750be2aff3ea0a9cb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/en-US/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/en-US/Firefox%20150.0.3.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "4221ec4972cb385042354b25940728e5eb7ececce7c95d2ec3f83d2323673d6a";
+      sha256 = "5f8571d35b883c9c210ad4249f25c6a46e7861291a440f65d5249587dd1b9051";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/eo/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/eo/Firefox%20150.0.3.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "a91efa6dc567a9f927fc018d8f35cd28f35938eea18276c036c1304ef768b943";
+      sha256 = "7b4eff49a39756f94df479ff34b3b56d1eff0aa9395ea5f0b40e52308edf2788";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/es-AR/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/es-AR/Firefox%20150.0.3.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "a5b719c37ed2602359f9de55d76afd032d71292ce366e6aee7da34c3089c52b4";
+      sha256 = "f4e9edf4aea02d38471eb82da9d80c63cf208bad8af9a0bef910615e4e629701";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/es-CL/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/es-CL/Firefox%20150.0.3.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "6682776a4062713cc117bd136a0336ddba951d79c53ed994b49d4a80eabfb272";
+      sha256 = "4aa6c514462a56e22c6b426b431de9c32e0349a9670bda4184a84ae621eeb89e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/es-ES/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/es-ES/Firefox%20150.0.3.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "95594f5f6ede6be45cb6b41dbac1637c43efbcefd36b47bd34d350aee1d35fd3";
+      sha256 = "82773c9fd996c73cd6e05680f2cf3ae7c9f12b5516c30cd21225d06f81e8cf67";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/es-MX/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/es-MX/Firefox%20150.0.3.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "98222582878630d280e889403a7f120339c5932904602cd538c758accec2719c";
+      sha256 = "e7f3fa4b2345686320f1435aa3daa4fdb2caf0f4504f3e22f7b8c3f8b516cc83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/et/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/et/Firefox%20150.0.3.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "9036fa35657a551940f2a630be91f954b7c22ea2200b91a3cbc103ae57787a68";
+      sha256 = "6b5b0d5868361bf749566a3ee95f05726b8a9520f3fa8f49f19cb232eac98113";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/eu/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/eu/Firefox%20150.0.3.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "f23ac467f480cc92bd1a32dc0d9385daf7cca1817c05b41a99707f8f6ac27ec4";
+      sha256 = "770930621d030d269d6c63c257df8658d2166492bd919b31b3085a422e27bccc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/fa/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/fa/Firefox%20150.0.3.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "1979583c9084856c9ddb41faf699166dd134549e5a880dc6189b07602540a40c";
+      sha256 = "4914bc4051c3b6f874a776c753286bfb4e40d0745e81e884c6aaab6d1383c98f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ff/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ff/Firefox%20150.0.3.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "a54b68ea9b7e365d66400cfce048fc8967e81dd9ba3f88c9dddbcd0ab8f12263";
+      sha256 = "af896a691d5b553af37ab0f93fe35ec8d6b39ddee02a03f021d103ca8243835c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/fi/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/fi/Firefox%20150.0.3.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "3b744401a99db610e7d656435f584e81a5ef2a460b85c71a559777fbe2c1083d";
+      sha256 = "d8a835962ec3e686a352fbfb1233a16df5cdbdc92b609d4fb3e096186c6c1d39";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/fr/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/fr/Firefox%20150.0.3.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "0ea7b30b41db56ad0faf5167019555d22fd526dc59c2591321398a7c12d9f3ac";
+      sha256 = "72e51bf0646850992ca8c32f6c3e8ce39dcc84c8a22ab4cd7b03d4ac69a58095";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/fur/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/fur/Firefox%20150.0.3.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "3540e96329ef85636112a66a375081f67c67d99243eb7b8606aeb89b45a495a5";
+      sha256 = "27d41d26843037ef5502720800b8c6da817034b95b5f45c875c4bf550834333d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/fy-NL/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/fy-NL/Firefox%20150.0.3.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "176d78af8e7d7d91aef342ee7e49df1806fd60f5cbf21627b6a625583885f9d0";
+      sha256 = "926ee5ce083e36b8a4281a5f7c8701a5a59df81ae5528e1d78d3959f99faa935";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ga-IE/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ga-IE/Firefox%20150.0.3.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "4b268ecc43e3c88fe81f4ee16d186dd91d41a26c79cdb69d0eb42fca20603e6a";
+      sha256 = "7eb2bce5237ca16ef9b5efe779db8ba971b359585dda4aed5c545dd4e9ba6d33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/gd/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/gd/Firefox%20150.0.3.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "d6860f98e4ed711b075d32f21a66dfd60aaa1c5fd25660c862b06691d45f9f73";
+      sha256 = "a9a930725ab54c733c69fa06c225fe5c3777c7bc7d93da7f6a105e942584702b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/gl/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/gl/Firefox%20150.0.3.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "227b89b5785598db1edf8b6099ab92d6bf460725fc93abd7c2afce1155879ef1";
+      sha256 = "37ae24543295bc361bfa0f795362ddc0758f9b55cd82c61654215af1b5d64861";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/gn/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/gn/Firefox%20150.0.3.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "ca7b15b96a45b1209e332f3182e2440088a63d206154542a69b0f94822ce1fe3";
+      sha256 = "b40090fc93099d9d52c23a65b3e9fc5566c29b06cea88029ee6e889622a7933b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/gu-IN/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/gu-IN/Firefox%20150.0.3.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "33ad8602102ba910bb699e008c2b3dbe1fe7dcea8d176aa074be6dc5e4d2b4cb";
+      sha256 = "83da49cd4b1476f4e3ee2219359aa074f9af3dec5a25108aff43db2c333ad6d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/he/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/he/Firefox%20150.0.3.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "e7651ce1935ec3dc560429a8b883f2a181efd4b01d0c91986aeb7ca65f49ec80";
+      sha256 = "cfe9ab63e4804a6812d337dde73a9262794d908810b9ea369f33dadfe9b4a7f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hi-IN/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/hi-IN/Firefox%20150.0.3.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "cb9dbb3ca3a1d7dcb4ba8e425ee8d0445236fc4163f503bfeb8dc000daad407d";
+      sha256 = "ad1b35ed3168b36f5f0f4760f74330e63c6e49efd8a74861f8190d9ce5f6e950";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hr/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/hr/Firefox%20150.0.3.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "f68d0e7950c7ea00b0621951a5e98162c7722b5c4fcf127a53704a989ee8ee93";
+      sha256 = "e02958f7a01985c60594aef5695380ffcda616002cc5b7b018de5ed6ae06a636";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hsb/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/hsb/Firefox%20150.0.3.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "b8f76b886d5678dd0391399cb0da049f5a3615c0621235501ecc3ef11bd2f476";
+      sha256 = "724e2539c3745281b1f192561fec68cf0914dfdc39ababee6822a7515e65146b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hu/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/hu/Firefox%20150.0.3.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "8026c72dbcdd0b81782f05707f43b37a75ee15a60ed1a490d69d7f17d860f44f";
+      sha256 = "d9df70f955e3cf5b4b03103b55bb37643f16f45f97f85cf4899504ecc959556d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hy-AM/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/hy-AM/Firefox%20150.0.3.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "bf7f92dca25bfd91e7b5f4148b8e745dd4b37482bc5ec07a527b18d634359f46";
+      sha256 = "185f9577a3586b41da331e8644f6ee9c6e994351eddf1120bfc252fbb5b00734";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hye/Firefox%20150.0.1.dmg";
-      locale = "hye";
-      arch = "mac";
-      sha256 = "99b8c1127a5473c7aa4788806cce2c8b557158b13c87d66f075b50bb72e8a369";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ia/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ia/Firefox%20150.0.3.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "bd70ef1f71281a9cd9e10a344652403a12d58311ccac0278e48c2323a3c48a29";
+      sha256 = "3110216636adbfc604cf0f5a090f2eb01865950cc28ed8a415c79dc76777e7d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/id/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/id/Firefox%20150.0.3.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "80995a7ee82bf576a850dbdcb79d9950b9cbdd6dc797072646d2913b02292dff";
+      sha256 = "0b7ee8aba93743ef892544438c4ad576d41215b80e555c72803d9ad8510123b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/is/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/is/Firefox%20150.0.3.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "9cce4f5520c014cc6f248abfa99672dc6bc9ffd484e7535fc4c53f8de9e4845a";
+      sha256 = "fe63d0e97bf99d2d6c0a2af0e48b16a80b8c862089f77fbc38604ed03300641a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/it/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/it/Firefox%20150.0.3.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "cfba534a808acb011bbc5d5597fa0faaa13bd5f2c8ebe8777926211cc48a74ae";
+      sha256 = "c32bb7add419622fa307550d18ad0aeeac7a8847df6985d92497b43ed5f15507";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ja-JP-mac/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ja-JP-mac/Firefox%20150.0.3.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "ce9ba0877ca07b14dbc8447637ab5fe543e7352d3eb334180794374326235a5b";
+      sha256 = "901a19dbe4ee46adbba5449945a3a62e6417f2570a95206dbb07f271445cf729";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ka/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ka/Firefox%20150.0.3.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "234e6fec77e8e59c7bc31d2c10fe88ce223ace6ce9f7a2d99334202bcdf1d6e7";
+      sha256 = "9a1dffc9ce781bc55f438ea43821af4c00a9ed92ba0996008aa6f2b180e684a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/kab/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/kab/Firefox%20150.0.3.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "1d98a7597b449c1cf78ead0fd074522a11d31cc400a77c3169a6344178cfbc83";
+      sha256 = "ea417a9de5abf8bbc1837918b9daedde5bcb979f0c70d2254fecaa88e703ed5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/kk/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/kk/Firefox%20150.0.3.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "713b74d9de35b634cfe6786a828f44824b67806e3366117fa4bca0d15b1f99a9";
+      sha256 = "71bdb3b9018c91d7e95b07e31dc7aabbef10e4cd0ca1942ef744f00cd46d08e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/km/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/km/Firefox%20150.0.3.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "60a1ed56bbce21d3e4e8aa6f10f1dd52f49d42dd8882e5564bc38c2f07baa2b5";
+      sha256 = "37ca745cf17225e93e762335941b1d8f4dcf8a451aa35fada56d83536cc6e47c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/kn/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/kn/Firefox%20150.0.3.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "203220d6f154b887abe35353d1c4b257e76f9e07d648091d1d6d07fd9970c5e4";
+      sha256 = "d12f4a7e78443401d49b05126eb7ca68c03a1c4ed0c00a0e4b0c8f8c04fd9391";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ko/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ko/Firefox%20150.0.3.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "42ad6d86cbec0471a71487f1eaa4abd9e652a708d5f372f10838c6f263f5a12d";
+      sha256 = "7cda3e9460d47bb4c157b6b4ef53f6b5cea232c2792afffd8d0e36b59c1e57c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/lij/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/lij/Firefox%20150.0.3.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "c91d3a5d6c6e89865766e3fa6a5f8d266327775e8511620ca94dac482522a60e";
+      sha256 = "5422f51a5601f7c8fe83297718c37047c445ad17e285fb6dde6a90b72f3ea9be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/lo/Firefox%20150.0.1.dmg";
-      locale = "lo";
-      arch = "mac";
-      sha256 = "18e69fb04a70af32460bd0cd16d2f1fa26264adaa75be372625700d92e8ddbac";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/lt/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/lt/Firefox%20150.0.3.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "cba75728c41dce858e6df6f079f930c9545efcffbffa5ed941bffb757db73f36";
+      sha256 = "b3e3d297c92344c887bf5afe44b2bf22329952c9185fd2023245d330741cf985";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ltg/Firefox%20150.0.1.dmg";
-      locale = "ltg";
-      arch = "mac";
-      sha256 = "f59c199a9cae7517b2321f215e8b45acfd21cc31f6aa6013d6322e903228fb92";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/lv/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/lv/Firefox%20150.0.3.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "187119046ddbd6659f5fd6c64c5cd3a1e2ce4d82753c8e11f32c5f2e54b6b566";
+      sha256 = "b01354ae7740de84b79ee856177a13a18fc3ee3d3327e9a618d75ed360dcd14b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/meh/Firefox%20150.0.1.dmg";
-      locale = "meh";
-      arch = "mac";
-      sha256 = "0717720e48246523513df9a7af59080acfe238b04de5284a4ae3536dc66057d6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/mk/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/mk/Firefox%20150.0.3.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "730f901596e01172902e790c01b808dd1c8451e2b32597d12e39201b146e319d";
+      sha256 = "6baf5e0ebb48e3d5132a8dcdc98c3f69825a7bc43761c487fdcc5cb3db0eacf7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ml/Firefox%20150.0.1.dmg";
-      locale = "ml";
-      arch = "mac";
-      sha256 = "5de15615b7ef2d142b16c75034227e8810820cc5e810ea3c2030b3dbeee78df6";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/mr/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/mr/Firefox%20150.0.3.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "0d71ad1a2ca07f2c7448e81dc7d25fad30ef169eaf075f6053099668308c7ad5";
+      sha256 = "7b6b3622edf010b37a063046668bdafd756a6a63243beb3c8923aec2f54cfd0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ms/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ms/Firefox%20150.0.3.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "f96944452b3dfc3444ce52019aa039716e911c4a7432154bca5a9b6fbbddc0b1";
+      sha256 = "22a92621ae75cc55d6e279536fe2c2563f09b27c6656012b075ffdd124be3d2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/my/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/my/Firefox%20150.0.3.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "8ec34d7c59ceb09a85c44e69339c649874cd0c13d3c3fb0ebc3c7f516f32a8f2";
+      sha256 = "85d3b1800e689e59e39613c9bb63114cc8b2df179e60361d6190deb3d65be2ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/nb-NO/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/nb-NO/Firefox%20150.0.3.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "178fed09b47d686a3f1cc8b49a9aeb0716d3a386cf300b096f6ff1259662677f";
+      sha256 = "e663a126591a1f9b47de2f71ec86e94b9e1d0b621db467dec5a8d2152fb9ecb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ne-NP/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ne-NP/Firefox%20150.0.3.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "2fad9a1283c1388bc8409ff09ef51d85f35c3e94e93d4f1209eeeac7ee9dd7c5";
+      sha256 = "402d1401776ccb5db7ec837186cc37424f7f222d84f7ba91bed481ca38a72e0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/nl/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/nl/Firefox%20150.0.3.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "b98841b24abc26bda166f47756c91e18b779ae772dc498d173d0496b07bff636";
+      sha256 = "891bb5f1c7d1ea14bc9f51156749b03eaa94e2875a64c31d61e62007a0ce3609";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/nn-NO/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/nn-NO/Firefox%20150.0.3.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "fee8e673d778c2f5a31422cc24db010a3eef70a56f0281e794fbfd24b52257e4";
+      sha256 = "770e0fabedd7439bb1b826b97e118a9ed64e2f269945661d84e5dbf84f0892af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/oc/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/oc/Firefox%20150.0.3.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "e5fc44dad1c91d43fa110370771602e67729a5968d3dea3e8d14733bf6a95eef";
+      sha256 = "2a23add47b0d2e7350e4a6d04984bdb0b00fafc338121a0e61003f5e319a5faa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/pa-IN/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/pa-IN/Firefox%20150.0.3.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "7b204e5d1ce67ccc4874b8e3612f21de7b2b38ff211ecbff0d0532fa27569879";
+      sha256 = "85a207f03caa2d95bcf830453e8fa5d0f73629843926677c1e8d6186251df52d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/pl/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/pl/Firefox%20150.0.3.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "7dfd2b8f893e320ff60f6c841f39cbfd79e55e551f04338bf1cecbb2f2de3163";
+      sha256 = "961442a2fd5b94fdbfc51b933d61771c4214db204d0e55ef21393bdc62fa22f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/pt-BR/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/pt-BR/Firefox%20150.0.3.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "bf3cd9091da8ca07c81bdf40659d9a1ea36513cceb9dad064fb832fdfaba1afd";
+      sha256 = "ac6be7f9ee80d5875450b4420ed84609359830d400b3011fb24b04d841129709";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/pt-PT/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/pt-PT/Firefox%20150.0.3.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "4854d3b9fbab99e8665e46471b93c670c479feb72610d6464e6fdc045795bce2";
+      sha256 = "97f1b97c11c233a0a3bf2500abf6166c540e1b076642c5a136c057677c01455a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/rm/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/rm/Firefox%20150.0.3.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "73231634123b3c65eac7a58765408b10803f3bcf717feba31113cef3867c65e0";
+      sha256 = "0ce80f7ade8ed4118f84be6091376efb64c37182f1c4804c04bbe0fdd1f62886";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ro/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ro/Firefox%20150.0.3.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "05e53fa5b5e8177c26ee80a1fbda1890b4786ca263112a64059885004021b921";
+      sha256 = "7f743a18dd74829b30bea2dd3628bc0399828eb05bde59b96eef4f7bd57ff5d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ru/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ru/Firefox%20150.0.3.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "d9ecff067f59b72d09a21424fbb47ac1ea7c5cfa28439dd3dc8de13415d2afb0";
+      sha256 = "ac473a9f9a5c20c047adf8d2f3d5a1763e4c50b2741a7b71fa2612b1eec4efbd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sat/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sat/Firefox%20150.0.3.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "d2f2e07a1401197ec19e5cebf0e8ee146429acb41287be6c555b7e20e3ac18ff";
+      sha256 = "cc2980f8672f373cd6696abeaedc7097eff260e854a0e8bce369d6c045120644";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sc/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sc/Firefox%20150.0.3.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "af044d75600b326856de2b96df71f5029534614cb3b348cff831c431151d23d6";
+      sha256 = "039a17f7bb6c873a6a0de6dace38e3df347142197565377f4643ff22661e3ce0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/scn/Firefox%20150.0.1.dmg";
-      locale = "scn";
-      arch = "mac";
-      sha256 = "f31813be578e7ea4ef71ef4db382491b37dbad190d2d6764514acc5edb20988f";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sco/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sco/Firefox%20150.0.3.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "ee43e020caf91f2dfee081ffe041b0931cb8993c6c6d3d9e637001ce98151a76";
+      sha256 = "68730269b06ca731c9d1f9cbc6ab82a91372bc494e0b1023a37d9fa82e11c8e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/si/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/si/Firefox%20150.0.3.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "fe18a56b01250a295e73da07dbd5c4dffcaed63079d24458794c6c318ecc3c71";
+      sha256 = "822777516a694b414a35712bf61f39b101db561ff2f0e448466ff4c0345f0d2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sk/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sk/Firefox%20150.0.3.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "836e6fb298c7652775dbde8b326ca9290c17e4d1ccb8882cec7b099a3b991b86";
+      sha256 = "6863372b22c2d76b01671a6242dafe9647c6d2fbd2c9dcfe54bbe93a6121cff4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/skr/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/skr/Firefox%20150.0.3.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "55f11b8de296808cf29906452074cd077b442fdaf6d6cf83570fbfd9e46a7dab";
+      sha256 = "029aa8558c6f560ce4637c43d7fc086eaaeab986a3e2c92dbc7378a483c36d5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sl/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sl/Firefox%20150.0.3.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "47d9b4c35e5e9652f7f89ee23478cabc3f4c0c2e5240692eaa06ea3082d4a5d2";
+      sha256 = "bab7a494619596c4cda635cea3732380ed2ce34e8fc15f53921f8baa87e4c9cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/son/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/son/Firefox%20150.0.3.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "cdc6253145b79f98c9565c9480b132d00e3040e734ab6bf05535817b0c32e62b";
+      sha256 = "ac913600795043b745984fde40e4d950fd2aeceeb7d4e1d866bd2d7066602de6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sq/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sq/Firefox%20150.0.3.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "51a2e17ce3a891ed97ff2c3d33b860594467282e79191c1811d522513e0a2d6b";
+      sha256 = "c5c9dec59bdc67f0cbe058087e1eae42676ee9957f9719815e061b4daefc2c90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sr/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sr/Firefox%20150.0.3.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "230ca74cefa96cfccb1e827ca95dbe0fbb7e691af2f20f0eea6656dafcedf6b8";
+      sha256 = "1c3080670f7818f2eb608672ed54e65ad779fceffefe752aaa145c370b5cae80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sv-SE/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/sv-SE/Firefox%20150.0.3.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "4a352287203afbf0b48f65178a96c510e4d20e77d82c5e664c7ae4635e380a3c";
+      sha256 = "ea551e72ffb100d4752670749e91140a41ad6dd51a2fb525ae7b77ee147f1cc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/szl/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/szl/Firefox%20150.0.3.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "8cf05c5f74a0223008c816592cf6409ea564addc30536d3cedaf7ef24d2fe036";
+      sha256 = "21f77eb96ae1919fb6962710d1d29a2fb0ffb98c98a9aca1afb2113caee6f099";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ta/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ta/Firefox%20150.0.3.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "0e2c1a570b51a36ed18d24872a2956c73cf7efdb1698436bad78aa2f28cabd8e";
+      sha256 = "3501bd6cb767caca3c1f6a757798a4bc3455581c9dac914f2fa7cc046d6d1585";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/te/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/te/Firefox%20150.0.3.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "2e6d6b13d894096c8b3a9b509954c73fd21781a1d68feaa20915107068a15ccc";
+      sha256 = "bd8218021ffdce5e463fc3ebebf74847b5af2d5e147697342ed8b4a363796fa4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/tg/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/tg/Firefox%20150.0.3.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "f4eeacae46aae68850828458e0e86ffca9bfee716735dabf853acb3d8118f571";
+      sha256 = "dae25caf5ee31d427ebad3770a1bb8d08e0c1006d22c91714913063fa71c52bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/th/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/th/Firefox%20150.0.3.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "8785e060463c7901d96d10bb69383efbd7d288820cccd0b52b24bba2078e9df5";
+      sha256 = "489ff8653146a3402e1c6fb0b8744fc2fa81b3b623b74a60398b7cf6e4e5bd9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/tl/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/tl/Firefox%20150.0.3.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "50bc2996c1a2d0b882b46b0a0ad453ceb514ada7e8f9f17cd4041b3b50ec8e6d";
+      sha256 = "5ba52d4da7ec57dddbc018ea804dda9c3fc8d8fa6a4a2e3a865323eb1b1cb27d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/tr/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/tr/Firefox%20150.0.3.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "fbd033e40a0f870d7a471a56c563323ba56d6136a9594176023f307173ce3635";
+      sha256 = "f42fbfc00a13bdb29e8b0559adf301982b8f2b83ea9f9614b133a199fc17657c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/trs/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/trs/Firefox%20150.0.3.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "8011f29a2b5e610c040cce3ddb7ed57bd8f9f35a121ff51a9e5c4ae6cc42ec2f";
+      sha256 = "e8c9d7e3b9388626d49a0db946ced95976df466767255a3bfadda2e73ef4d254";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/uk/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/uk/Firefox%20150.0.3.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "12dc63014ac7b506ada38021c32fa3f014f3f532c5580df00a521a2e2efd191e";
+      sha256 = "58c5c1bab11a3d7fc71bfd378e550b73af0603de46bfa2321c87f2f7949ed57f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ur/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/ur/Firefox%20150.0.3.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "3d7c494e14425a9988816083fda6de822b74bdf13358278c2fda704855a6a23c";
+      sha256 = "f2eff77673038ca84605b9d97c9e26f47af4f496beec66f78111f937da91db3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/uz/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/uz/Firefox%20150.0.3.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "7d3dcf3ff39d043b700212ab6bcbb10562596fb655b1c1b3949f3d2811159477";
+      sha256 = "bc5dc6aac0072857184a523836625eb719942171f8a66c9e639d116f5b09eab3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/vi/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/vi/Firefox%20150.0.3.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "7335573a841a00ca790854c9fafcf151b813e4d496afec447c23558e5463e2d0";
+      sha256 = "e65af322e7d097b3cd1b82fd5859cc6600a181e1334a3d36f8e7b2ab978b3525";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/wo/Firefox%20150.0.1.dmg";
-      locale = "wo";
-      arch = "mac";
-      sha256 = "0089bf8dcd9bcce824975b6b2d24e17ad6e1881c84248815a99452e8e3e0f24a";
-    }
-    {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/xh/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/xh/Firefox%20150.0.3.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "138cc152b5c1a87e29840222729b505958a4bb5a65659ddf0cbc3e789d0ad7c8";
+      sha256 = "ae8861a01f24f03ec3cd45c300f7a2cd180a2d397b6f84e504ec64a732839d48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/zh-CN/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/zh-CN/Firefox%20150.0.3.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "11b9671aca9071f24c22af18d6dc822c6185829818b27fba28f61df1e59d6d4a";
+      sha256 = "9d87f092b3763947aa2a3ac5921742c8f4fd1e20eda9a297b15593142a7c815c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/zh-TW/Firefox%20150.0.1.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.3/mac/zh-TW/Firefox%20150.0.3.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "7aa5f608da115a55c5589554315710f877c8a289c82e9ff2f460330f9552cfbe";
+      sha256 = "9b920ba0ce9fa04f2be5b4469a69443f1700df3edd13b03447dfa778c07a5d92";
     }
   ];
 }

From 93f389cc383fb7c2e3d62ade97cd5b938c1567c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 16:11:47 +0000
Subject: [PATCH 146/221] kin-openapi: 0.137.0 -> 0.138.0

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

diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix
index b930e49fe48e..d3a3195fd88e 100644
--- a/pkgs/by-name/ki/kin-openapi/package.nix
+++ b/pkgs/by-name/ki/kin-openapi/package.nix
@@ -5,14 +5,14 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "kin-openapi";
-  version = "0.137.0";
+  version = "0.138.0";
   vendorHash = "sha256-6pvpmETeNAbzzuOlZqTyr6udazEElLW8E+HK6eAL8X4=";
 
   src = fetchFromGitHub {
     owner = "getkin";
     repo = "kin-openapi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rkaFpzOzh2YMGsaflKBr2+HiKbgCYl5Q9DnXnbXfmmA=";
+    hash = "sha256-y9zbUxT/UvBS2h2bHh52GLJHBvCrrHN2ubBloJTL+/o=";
   };
 
   checkFlags =

From eea35427f9389da2cdf7e80f8a0aca49c820ce30 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Tue, 12 May 2026 18:16:33 +0200
Subject: [PATCH 147/221] nixos/tests/caddy: bump caddy.withPlugins test
 caddyserver/replace-response dep

---
 nixos/tests/caddy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix
index ea59c1cf49b5..0c5da462c021 100644
--- a/nixos/tests/caddy.nix
+++ b/nixos/tests/caddy.nix
@@ -72,8 +72,8 @@
         specialisation.with-plugins.configuration = {
           services.caddy = {
             package = pkgs.caddy.withPlugins {
-              plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ];
-              hash = "sha256-Quib7+jFf2ElS4yvrJhuLiedX3lBNwxpEDskxxyVu+8=";
+              plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20250618171559-80962887e4c6" ];
+              hash = "sha256-kKWXpxEAn23yud8tcgw7FFOaxLjoodZ/cuM1239TRoY=";
             };
             configFile = pkgs.writeText "Caddyfile" ''
               {

From de3375793a894c48c8cbd512bcee7f96946a837f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 16:40:50 +0000
Subject: [PATCH 148/221] libretro.vba-next: 0-unstable-2026-04-20 ->
 0-unstable-2026-05-12

---
 pkgs/applications/emulators/libretro/cores/vba-next.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/vba-next.nix b/pkgs/applications/emulators/libretro/cores/vba-next.nix
index a0de2732025b..2555f5959b39 100644
--- a/pkgs/applications/emulators/libretro/cores/vba-next.nix
+++ b/pkgs/applications/emulators/libretro/cores/vba-next.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "vba-next";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-05-12";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "vba-next";
-    rev = "82119ba97ee57c738a2eb1dc3a45cd2122ad2232";
-    hash = "sha256-On2O4WBVLmuj5FJZyaYUtgCEl1mEZffqAvGZpKz+Or8=";
+    rev = "f56ea99799b51fb107a4d3afe2a97a1364e8d806";
+    hash = "sha256-gbBurV2N6evLnZqvcxAZ2xfKMsybVeu+Nml0p0APTRE=";
   };
 
   meta = {

From 1a9ec0a3f012a8a90fe679a5fc0a62556cca757d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 16:41:42 +0000
Subject: [PATCH 149/221] vscode-extensions.visualjj.visualjj: 0.28.1 -> 0.28.3

---
 .../vscode/extensions/visualjj.visualjj/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index 0788f9d121e1..f270553ed471 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-xtbI0mqkjF21pL/0R0DReHVMlsf32ys2iprxp6AsTao=";
+          hash = "sha256-YHerrkqMlLLHvbuM1fT6g4nBgO1DIkRBC+5ncw9ZA+I=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-wpmx2RNAmGwwehBI/KpKNN3qxoWYFcESYKRRzc5pK/U=";
+          hash = "sha256-iXRw+07xkSi6Gxhx+iezBaGlAaZM2L0BmzZ5ZfFUEbc=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-zp3V8o9BDV29PA8xSlZ/RglnYkuc1rd+N5CuXIqd4ME=";
+          hash = "sha256-WkDu27TW1C+0UvNvNpWGKUhvqWo9rHMTWI9ro/gOYHs=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-7Scr8lumlZu5M1pGAWfQTMIpBXWU1/yp5kVE3LpFSVM=";
+          hash = "sha256-5RDH+TAfSkEYIleb2gb9vg+akWXp2JDcSUqyHZNJh/M=";
         };
       };
     in
     {
       name = "visualjj";
       publisher = "visualjj";
-      version = "0.28.1";
+      version = "0.28.3";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 0a74b28eac9287682b5a75f0b8282ad827473664 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 12 May 2026 18:55:39 +0200
Subject: [PATCH 150/221] python3Packages.pysma: 1.1.3 -> 1.1.2

Downgrade to fix tests.home-assistant-components.sma.
---
 pkgs/development/python-modules/pysma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix
index bd7f782675d0..7795900f8957 100644
--- a/pkgs/development/python-modules/pysma/default.nix
+++ b/pkgs/development/python-modules/pysma/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pysma";
-  version = "1.1.3";
+  version = "1.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kellerza";
     repo = "pysma";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0+hnsHFTZHyhtLiYe7V2SjmS6powjgER4azcVTUV0+A=";
+    hash = "sha256-w+uOmFJkfT0speP5hCdWVwGUbyNlidwunsx3Z9O3X9Q=";
   };
 
   postPatch = ''

From a4a63cd047c5ce981a99eeb1a2ad38a9d0a7a74d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 17:20:00 +0000
Subject: [PATCH 151/221] checkov: 3.2.527 -> 3.2.528

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

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index c36da5daba50..903c2cc1703e 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -35,14 +35,14 @@ let
 in
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "checkov";
-  version = "3.2.527";
+  version = "3.2.528";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = finalAttrs.version;
-    hash = "sha256-PKG4WzXtocfE9rwg3E77BkWREs7RhAzmdv9mz5VsbLA=";
+    hash = "sha256-bbGB6h9jhd3laeOTaSwZ2o3yu62vLMuCmYhS/qQBkeA=";
   };
 
   pythonRelaxDeps = [

From 77981d0d8e43ee2c652eaf835259665eb88a674d Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Tue, 12 May 2026 19:35:42 +0200
Subject: [PATCH 152/221] niri: install nushell completions

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

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 7d0b43ea2fff..91ee8455fb1c 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -101,6 +101,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellCompletion --cmd $pname \
       --bash <($out/bin/niri completions bash) \
       --fish <($out/bin/niri completions fish) \
+      --nushell <($out/bin/niri completions nushell) \
       --zsh <($out/bin/niri completions zsh)
   '';
 

From 8a430b36a664decb56d7f6ef9b9ca6167be9978e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 17:36:56 +0000
Subject: [PATCH 153/221] python3Packages.google-cloud-vision: 3.13.0 -> 3.14.0

---
 .../python-modules/google-cloud-vision/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index 61a976635b11..5ec1b9321f34 100644
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "google-cloud-vision";
-  version = "3.13.0";
+  version = "3.14.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_vision";
     inherit (finalAttrs) version;
-    hash = "sha256-aA9mjTMYWKM0DqxBtzKQPTDcae0IAg/9HVyjJYC99UY=";
+    hash = "sha256-Ga9pIYkjNYdmrP1lWtY/RQ0WaxSe6O7KrrOg05DEZ0k=";
   };
 
   build-system = [ setuptools ];

From bc5b388c1ff74b1832457077551ea9464d3694ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 11 May 2026 23:42:04 +0000
Subject: [PATCH 154/221] openttd-jgrpp: 0.72.0 -> 0.72.2

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

diff --git a/pkgs/by-name/op/openttd-jgrpp/package.nix b/pkgs/by-name/op/openttd-jgrpp/package.nix
index 6cb0ad949e16..f4eae92c8bcc 100644
--- a/pkgs/by-name/op/openttd-jgrpp/package.nix
+++ b/pkgs/by-name/op/openttd-jgrpp/package.nix
@@ -7,13 +7,13 @@
 
 openttd.overrideAttrs (oldAttrs: rec {
   pname = "openttd-jgrpp";
-  version = "0.72.0";
+  version = "0.72.2";
 
   src = fetchFromGitHub {
     owner = "JGRennison";
     repo = "OpenTTD-patches";
     rev = "jgrpp-${version}";
-    hash = "sha256-bja6SiXnA4hdM/h6dyTMxmuII+waHm3iW3AjP0C3dnU=";
+    hash = "sha256-Ql3W+Xr5zXDW/IBY23X+RMSXieCqn35hYY3jfYGahgs=";
   };
   patches = [ ];
 

From 3790ff0479e6aa5a1a607dcfd699bd69c90bc3bb Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <me@jfly.fyi>
Date: Tue, 12 May 2026 11:02:00 -0700
Subject: [PATCH 155/221] maintainers: update my email address

Goodbye, gmail!
---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2ef9ecd39b5c..c6d9497b620d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12611,7 +12611,7 @@
   };
   jfly = {
     name = "Jeremy Fleischman";
-    email = "jeremyfleischman@gmail.com";
+    email = "me@jfly.fyi";
     github = "jfly";
     githubId = 277474;
     keys = [ { fingerprint = "F1F1 3395 8E8E 9CC4 D9FC  9647 1931 9CD8 416A 642B"; } ];

From 415dbc3303c4d6eb689732bd966192d84e296284 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:16:37 -0600
Subject: [PATCH 156/221] i3lock: migrate to by-name

---
 .../i3/lock.nix => by-name/i3/i3lock/package.nix}      | 10 +++++++---
 pkgs/top-level/all-packages.nix                        |  4 ----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/{applications/window-managers/i3/lock.nix => by-name/i3/i3lock/package.nix} (94%)

diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/by-name/i3/i3lock/package.nix
similarity index 94%
rename from pkgs/applications/window-managers/i3/lock.nix
rename to pkgs/by-name/i3/i3lock/package.nix
index e996b27c4657..bb523a8957d9 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/by-name/i3/i3lock/package.nix
@@ -12,12 +12,16 @@
   pam,
   libx11,
   libev,
-  cairo,
   libxkbcommon,
   libxkbfile,
   libxcb-util,
+  cairo,
 }:
-
+let
+  cairo' = cairo.override {
+    xcbSupport = true;
+  };
+in
 stdenv.mkDerivation rec {
   pname = "i3lock";
   version = "2.15";
@@ -43,7 +47,7 @@ stdenv.mkDerivation rec {
     pam
     libx11
     libev
-    cairo
+    cairo'
     libxkbcommon
     libxkbfile
     libxcb-util
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5675f04cf75c..1315f6b51ac5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9535,10 +9535,6 @@ with pkgs;
 
   i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { };
 
-  i3lock = callPackage ../applications/window-managers/i3/lock.nix {
-    cairo = cairo.override { xcbSupport = true; };
-  };
-
   i3lock-blur = callPackage ../applications/window-managers/i3/lock-blur.nix { };
 
   i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { };

From 8d89587ac3f324bb54bad9f9896b363e4db0a4eb Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:17:53 -0600
Subject: [PATCH 157/221] i3lock: modernize derivation

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

diff --git a/pkgs/by-name/i3/i3lock/package.nix b/pkgs/by-name/i3/i3lock/package.nix
index bb523a8957d9..7410e50fb306 100644
--- a/pkgs/by-name/i3/i3lock/package.nix
+++ b/pkgs/by-name/i3/i3lock/package.nix
@@ -22,15 +22,15 @@ let
     xcbSupport = true;
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "i3lock";
   version = "2.15";
 
   src = fetchFromGitHub {
     owner = "i3";
     repo = "i3lock";
-    rev = version;
-    sha256 = "sha256-OyV6GSLnNV3GUqrfs3OBnIaBvicH2PXgeY4acOk5dR4=";
+    tag = finalAttrs.version;
+    hash = "sha256-OyV6GSLnNV3GUqrfs3OBnIaBvicH2PXgeY4acOk5dR4=";
   };
 
   separateDebugInfo = true;
@@ -69,4 +69,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.all;
   };
 
-}
+})

From d6ae1aeff5da40c68ce25df93ea11d71c5fee43b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:20:19 -0600
Subject: [PATCH 158/221] i3: migrate to by-name

---
 .../i3/default.nix => by-name/i3/i3/package.nix}                | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/default.nix => by-name/i3/i3/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/by-name/i3/i3/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/default.nix
rename to pkgs/by-name/i3/i3/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1315f6b51ac5..f41ea6c65ba7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3 = callPackage ../applications/window-managers/i3 { };
-
   i3-auto-layout = callPackage ../applications/window-managers/i3/auto-layout.nix { };
 
   i3-rounded = callPackage ../applications/window-managers/i3/rounded.nix { };

From 4cbbcc90c4567c0b3075715212d35b85d047c31d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:27:46 -0600
Subject: [PATCH 159/221] i3altlayout: migrate to by-name

---
 .../i3/altlayout.nix => by-name/i3/i3altlayout/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/altlayout.nix => by-name/i3/i3altlayout/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/altlayout.nix b/pkgs/by-name/i3/i3altlayout/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/altlayout.nix
rename to pkgs/by-name/i3/i3altlayout/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f41ea6c65ba7..60589db564c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9509,8 +9509,6 @@ with pkgs;
 
   i3-rounded = callPackage ../applications/window-managers/i3/rounded.nix { };
 
-  i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { };
-
   i3-balance-workspace =
     python3Packages.callPackage ../applications/window-managers/i3/balance-workspace.nix
       { };

From 8f10c1d4c3559a2026d9286ee8cbe2360b634d32 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:29:08 -0600
Subject: [PATCH 160/221] i3altlayout: modernize derivation

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

diff --git a/pkgs/by-name/i3/i3altlayout/package.nix b/pkgs/by-name/i3/i3altlayout/package.nix
index 4e324c8cb7ef..d9af049b0a53 100644
--- a/pkgs/by-name/i3/i3altlayout/package.nix
+++ b/pkgs/by-name/i3/i3altlayout/package.nix
@@ -4,14 +4,14 @@
   fetchPypi,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "i3altlayout";
   version = "0.3";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "1h0phf3s6ljffxw0bs73k041wildaz01h37iv5mxhami41wrh4qf";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-DhOYeSCxKthr2fEMGMBXjUYeCJjj6AV4d05So4eDF8A=";
   };
 
   pythonRemoveDeps = [ "enum-compat" ];
@@ -33,4 +33,4 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
   };
-}
+})

From c01feef67199c9363f449892cce948f5c9177460 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:30:54 -0600
Subject: [PATCH 161/221] i3-auto-layout: migrate to by-name

---
 .../auto-layout.nix => by-name/i3/i3-auto-layout/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/auto-layout.nix => by-name/i3/i3-auto-layout/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/auto-layout.nix b/pkgs/by-name/i3/i3-auto-layout/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/auto-layout.nix
rename to pkgs/by-name/i3/i3-auto-layout/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60589db564c5..35c9f2d61070 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3-auto-layout = callPackage ../applications/window-managers/i3/auto-layout.nix { };
-
   i3-rounded = callPackage ../applications/window-managers/i3/rounded.nix { };
 
   i3-balance-workspace =

From 13b7319dbabc6b48d2e2d5882fdd5ac1c45f77ab Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:31:38 -0600
Subject: [PATCH 162/221] i3-auto-layout: switch to hash

---
 pkgs/by-name/i3/i3-auto-layout/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/i3/i3-auto-layout/package.nix b/pkgs/by-name/i3/i3-auto-layout/package.nix
index 79fa99d77037..754b502d8372 100644
--- a/pkgs/by-name/i3/i3-auto-layout/package.nix
+++ b/pkgs/by-name/i3/i3-auto-layout/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage {
     owner = "chmln";
     repo = "i3-auto-layout";
     rev = "9e41eb3891991c35b7d35c9558e788899519a983";
-    sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs=";
+    hash = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs=";
   };
 
   cargoHash = "sha256-oKpcYhD9QNW+8gFVybDEnz58cZ+2Bf4bwYuflXiJ1jc=";

From 5f6f6af83d994b4c3ba77d09492c2884830ee81d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:33:50 -0600
Subject: [PATCH 163/221] i3-rounded: migrate to by-name

---
 .../i3/rounded.nix => by-name/i3/i3-rounded/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/rounded.nix => by-name/i3/i3-rounded/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/rounded.nix b/pkgs/by-name/i3/i3-rounded/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/rounded.nix
rename to pkgs/by-name/i3/i3-rounded/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35c9f2d61070..60b8aa3ed771 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3-rounded = callPackage ../applications/window-managers/i3/rounded.nix { };
-
   i3-balance-workspace =
     python3Packages.callPackage ../applications/window-managers/i3/balance-workspace.nix
       { };

From 3c20c6ac3459417dfb30d9ec96e1d84312c7c1d6 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:34:40 -0600
Subject: [PATCH 164/221] i3-rounded: switch to hash

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

diff --git a/pkgs/by-name/i3/i3-rounded/package.nix b/pkgs/by-name/i3/i3-rounded/package.nix
index d8acbc93889b..01b0e3e4d5aa 100644
--- a/pkgs/by-name/i3/i3-rounded/package.nix
+++ b/pkgs/by-name/i3/i3-rounded/package.nix
@@ -13,7 +13,7 @@ i3.overrideAttrs (oldAttrs: {
     owner = "LinoBigatti";
     repo = "i3-rounded";
     rev = "524c9f7b50f8c540b2ae3480b242c30d8775f98e";
-    sha256 = "0y7m1s1y8f9vgkp7byi33js8n4rigiykd71s936i5d4rwlzrxiwm";
+    hash = "sha256-lceeP+WZtBLNSDqcNn18MROLtBwj+nXufDs55IMO9Xg=";
   };
 
   buildInputs = oldAttrs.buildInputs ++ [ pcre ];

From b1fb3913107c72eecd97129ffb61a47ee4dc263d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:37:14 -0600
Subject: [PATCH 165/221] i3-balance-workspace: migrate to by-name

---
 .../i3/i3-balance-workspace/package.nix}                   | 7 +++----
 pkgs/top-level/all-packages.nix                            | 4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)
 rename pkgs/{applications/window-managers/i3/balance-workspace.nix => by-name/i3/i3-balance-workspace/package.nix} (83%)

diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/by-name/i3/i3-balance-workspace/package.nix
similarity index 83%
rename from pkgs/applications/window-managers/i3/balance-workspace.nix
rename to pkgs/by-name/i3/i3-balance-workspace/package.nix
index d372bb21c9b1..5654bbf9749b 100644
--- a/pkgs/applications/window-managers/i3/balance-workspace.nix
+++ b/pkgs/by-name/i3/i3-balance-workspace/package.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  buildPythonPackage,
+  python3Packages,
   fetchPypi,
-  i3ipc,
 }:
 
-buildPythonPackage (finalAttrs: {
+python3Packages.buildPythonPackage (finalAttrs: {
   pname = "i3-balance-workspace";
   version = "1.8.6";
   format = "setuptools";
@@ -15,7 +14,7 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0=";
   };
 
-  propagatedBuildInputs = [ i3ipc ];
+  propagatedBuildInputs = [ python3Packages.i3ipc ];
 
   doCheck = false; # project has no test
   pythonImportsCheck = [ "i3_balance_workspace" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60b8aa3ed771..c9fafdf995ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,10 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3-balance-workspace =
-    python3Packages.callPackage ../applications/window-managers/i3/balance-workspace.nix
-      { };
-
   i3-cycle-focus = callPackage ../applications/window-managers/i3/cycle-focus.nix { };
 
   i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { };

From 1dcff1ff72ea18bf7fe797e7e88b03dab42310c4 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:41:33 -0600
Subject: [PATCH 166/221] i3-balance-workspace: modernize derivation

---
 pkgs/by-name/i3/i3-balance-workspace/package.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/i3/i3-balance-workspace/package.nix b/pkgs/by-name/i3/i3-balance-workspace/package.nix
index 5654bbf9749b..59c89a6124c2 100644
--- a/pkgs/by-name/i3/i3-balance-workspace/package.nix
+++ b/pkgs/by-name/i3/i3-balance-workspace/package.nix
@@ -7,14 +7,26 @@
 python3Packages.buildPythonPackage (finalAttrs: {
   pname = "i3-balance-workspace";
   version = "1.8.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
     hash = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0=";
   };
 
-  propagatedBuildInputs = [ python3Packages.i3ipc ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' \
+      --replace-fail 'poetry>=' 'poetry-core>='
+  '';
+
+  build-system = [
+    python3Packages.poetry-core
+  ];
+
+  dependencies = [
+    python3Packages.i3ipc
+  ];
 
   doCheck = false; # project has no test
   pythonImportsCheck = [ "i3_balance_workspace" ];

From 740bbde05d5a4aef9af6e90ab39fa5456bdeec85 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:45:58 -0600
Subject: [PATCH 167/221] i3-resurrect: migrate to by-name

---
 .../i3/i3-resurrect/package.nix}              | 19 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 7 insertions(+), 14 deletions(-)
 rename pkgs/{applications/window-managers/i3/i3-resurrect.nix => by-name/i3/i3-resurrect/package.nix} (75%)

diff --git a/pkgs/applications/window-managers/i3/i3-resurrect.nix b/pkgs/by-name/i3/i3-resurrect/package.nix
similarity index 75%
rename from pkgs/applications/window-managers/i3/i3-resurrect.nix
rename to pkgs/by-name/i3/i3-resurrect/package.nix
index 1cfb8a616574..3966dce0fec5 100644
--- a/pkgs/applications/window-managers/i3/i3-resurrect.nix
+++ b/pkgs/by-name/i3/i3-resurrect/package.nix
@@ -1,17 +1,12 @@
 {
   lib,
-  buildPythonApplication,
-  click,
-  i3ipc,
-  psutil,
-  natsort,
+  python3Packages,
   fetchPypi,
   xprop,
   xdotool,
-  importlib-metadata,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "i3-resurrect";
   version = "1.4.5";
   format = "setuptools";
@@ -22,13 +17,13 @@ buildPythonApplication rec {
   };
 
   propagatedBuildInputs = [
-    click
-    psutil
+    python3Packages.click
+    python3Packages.psutil
     xprop
-    natsort
-    i3ipc
+    python3Packages.natsort
+    python3Packages.i3ipc
     xdotool
-    importlib-metadata
+    python3Packages.importlib-metadata
   ];
   doCheck = false; # no tests
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9fafdf995ed..eb808e63e450 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9513,8 +9513,6 @@ with pkgs;
 
   i3-ratiosplit = callPackage ../applications/window-managers/i3/i3-ratiosplit.nix { };
 
-  i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { };
-
   i3-swallow = python3Packages.callPackage ../applications/window-managers/i3/swallow.nix { };
 
   i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };

From f0cfc2426ea1a32a8f49a3b0b26cc6a8e757c3b2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:48:57 -0600
Subject: [PATCH 168/221] i3-resurrect: modernize derivation

---
 pkgs/by-name/i3/i3-resurrect/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/i3/i3-resurrect/package.nix b/pkgs/by-name/i3/i3-resurrect/package.nix
index 3966dce0fec5..7c2baf3df792 100644
--- a/pkgs/by-name/i3/i3-resurrect/package.nix
+++ b/pkgs/by-name/i3/i3-resurrect/package.nix
@@ -6,17 +6,21 @@
   xdotool,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "i3-resurrect";
   version = "1.4.5";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-13FKRvEE4vHq5G51G1UyBnfNiWeS9Q/SYCG16E1Sn4c=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies = [
     python3Packages.click
     python3Packages.psutil
     xprop
@@ -35,4 +39,4 @@ python3Packages.buildPythonApplication rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ magnetophon ];
   };
-}
+})

From 4aa9fd30ad52b721ad4688eae5080787cd9b5de1 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:51:51 -0600
Subject: [PATCH 169/221] i3-swallow: migrate to by-name

---
 .../i3/i3-swallow/package.nix}                   | 16 ++++++----------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 6 insertions(+), 12 deletions(-)
 rename pkgs/{applications/window-managers/i3/swallow.nix => by-name/i3/i3-swallow/package.nix} (80%)

diff --git a/pkgs/applications/window-managers/i3/swallow.nix b/pkgs/by-name/i3/i3-swallow/package.nix
similarity index 80%
rename from pkgs/applications/window-managers/i3/swallow.nix
rename to pkgs/by-name/i3/i3-swallow/package.nix
index 104e5e002810..567690b6237f 100644
--- a/pkgs/applications/window-managers/i3/swallow.nix
+++ b/pkgs/by-name/i3/i3-swallow/package.nix
@@ -1,14 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  poetry-core,
-  i3ipc,
-  xlib,
-  six,
 }:
 
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "i3-swallow";
   version = "unstable-2022-02-19";
 
@@ -22,13 +18,13 @@ buildPythonApplication {
   };
 
   nativeBuildInputs = [
-    poetry-core
+    python3Packages.poetry-core
   ];
 
   propagatedBuildInputs = [
-    i3ipc
-    xlib
-    six
+    python3Packages.i3ipc
+    python3Packages.xlib
+    python3Packages.six
   ];
 
   # No tests available
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb808e63e450..6ff9a7f5da8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9513,8 +9513,6 @@ with pkgs;
 
   i3-ratiosplit = callPackage ../applications/window-managers/i3/i3-ratiosplit.nix { };
 
-  i3-swallow = python3Packages.callPackage ../applications/window-managers/i3/swallow.nix { };
-
   i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
 
   i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { };

From 05620e89fcb8099bd523607567d66ada831ccf17 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:52:47 -0600
Subject: [PATCH 170/221] i3-swallow: switch to hash

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

diff --git a/pkgs/by-name/i3/i3-swallow/package.nix b/pkgs/by-name/i3/i3-swallow/package.nix
index 567690b6237f..c36c2cd2a01e 100644
--- a/pkgs/by-name/i3/i3-swallow/package.nix
+++ b/pkgs/by-name/i3/i3-swallow/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication {
     owner = "jamesofarrell";
     repo = "i3-swallow";
     rev = "6fbc04645c483fe733de56b56743e453693d4c78";
-    sha256 = "1l3x8mixwq4n0lnyp0wz5vijgnypamq6lqjazcd2ywl2jv8d6fif";
+    hash = "sha256-LjrT0JaCci8a+0pianBV19sn4y6fg+stBZZg3mNFfdA=";
   };
 
   nativeBuildInputs = [

From a172736a2e34c5550d0d651dde071e2b5d804892 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:54:17 -0600
Subject: [PATCH 171/221] i3-cycle-focus: migrate to by-name

---
 .../cycle-focus.nix => by-name/i3/i3-cycle-focus/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/cycle-focus.nix => by-name/i3/i3-cycle-focus/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/cycle-focus.nix b/pkgs/by-name/i3/i3-cycle-focus/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/cycle-focus.nix
rename to pkgs/by-name/i3/i3-cycle-focus/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ff9a7f5da8f..90e5728bc10d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3-cycle-focus = callPackage ../applications/window-managers/i3/cycle-focus.nix { };
-
   i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { };
 
   i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { };

From 2f42a8c42d2c0a992c8c7998c162588ef1cb8846 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:55:44 -0600
Subject: [PATCH 172/221] i3-easyfocus: migrate to by-name

---
 .../i3/easyfocus.nix => by-name/i3/i3-easyfocus/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/easyfocus.nix => by-name/i3/i3-easyfocus/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/by-name/i3/i3-easyfocus/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/easyfocus.nix
rename to pkgs/by-name/i3/i3-easyfocus/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90e5728bc10d..7d1162170635 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { };
-
   i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { };
 
   i3-ratiosplit = callPackage ../applications/window-managers/i3/i3-ratiosplit.nix { };

From fbd72b7af66ad6b6a9bed947f7a02b2e3562c312 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:56:24 -0600
Subject: [PATCH 173/221] i3-easyfocus: switch to hash

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

diff --git a/pkgs/by-name/i3/i3-easyfocus/package.nix b/pkgs/by-name/i3/i3-easyfocus/package.nix
index 7689be9806e0..76504ef027a8 100644
--- a/pkgs/by-name/i3/i3-easyfocus/package.nix
+++ b/pkgs/by-name/i3/i3-easyfocus/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     owner = "cornerman";
     repo = "i3-easyfocus";
     rev = "fffb468f7274f9d7c9b92867c8cb9314ec6cf81a";
-    sha256 = "1db23vzzmp0hnfss1fkd80za6d2pajx7hdwikw50pk95jq0w8wfm";
+    hash = "sha256-1XHEAZYlzQsKn5E3eLpUVzSjPkBtuqC1sxDc+v8eYrU=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From d1abab4558a4b9aa0eba8a8d22541312746b21e5 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:57:38 -0600
Subject: [PATCH 174/221] i3-layout-manager: migrate to by-name

---
 .../i3/i3-layout-manager/package.nix}                           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/layout-manager.nix => by-name/i3/i3-layout-manager/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/by-name/i3/i3-layout-manager/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/layout-manager.nix
rename to pkgs/by-name/i3/i3-layout-manager/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d1162170635..b03ebd4caa8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { };
-
   i3-ratiosplit = callPackage ../applications/window-managers/i3/i3-ratiosplit.nix { };
 
   i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };

From 1fdb1eefcbb53c1476da131d8f2ffc1e62502afd Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:58:19 -0600
Subject: [PATCH 175/221] i3-layout-manager: switch to hash

---
 pkgs/by-name/i3/i3-layout-manager/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/i3/i3-layout-manager/package.nix b/pkgs/by-name/i3/i3-layout-manager/package.nix
index a52de5e6bb54..09ada08d335e 100644
--- a/pkgs/by-name/i3/i3-layout-manager/package.nix
+++ b/pkgs/by-name/i3/i3-layout-manager/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     owner = "klaxalk";
     repo = "i3-layout-manager";
     rev = "df54826bba351d8bcd7ebeaf26c07c713af7912c";
-    sha256 = "0ccvr43yp26fnh5d82cw7jcfq2sbxzzmdx2cp15bmxr8ixr8knc3";
+    hash = "sha256-g9mJco8o97pKuEz0Vv/vSwvsmDycCdQKtM6I6wfJmzE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ad995aa53a190ef50621bfa04f267d4eb20ecbce Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 09:59:34 -0600
Subject: [PATCH 176/221] i3-ratiosplit: migrate to by-name

---
 .../i3-ratiosplit.nix => by-name/i3/i3-ratiosplit/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/i3-ratiosplit.nix => by-name/i3/i3-ratiosplit/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/by-name/i3/i3-ratiosplit/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/i3-ratiosplit.nix
rename to pkgs/by-name/i3/i3-ratiosplit/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b03ebd4caa8b..eafa9564c838 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3-ratiosplit = callPackage ../applications/window-managers/i3/i3-ratiosplit.nix { };
-
   i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
 
   i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { };

From 5a69db0ba6f2ecd7aadeec89aa1966580c94b418 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:00:24 -0600
Subject: [PATCH 177/221] i3-ratiosplit: modernize derivation

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

diff --git a/pkgs/by-name/i3/i3-ratiosplit/package.nix b/pkgs/by-name/i3/i3-ratiosplit/package.nix
index 8ff464a70ce3..f4b23b38eddb 100644
--- a/pkgs/by-name/i3/i3-ratiosplit/package.nix
+++ b/pkgs/by-name/i3/i3-ratiosplit/package.nix
@@ -4,15 +4,15 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "i3-ratiosplit";
   version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "333fred";
     repo = "i3-ratiosplit";
-    rev = "v${version}";
-    sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-46/ioZdKVFkLhSkpcqHB7GGNSF5S+jBaolEwMX/J1Xk=";
   };
 
   cargoHash = "sha256-no5fJ5nlwyS/PVi9J5Ek3c3Rp7A3MflpReo9kwJrj6U=";
@@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ svrana ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 5019086477528bbd90e777c6eb35a916d2ce9300 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:01:45 -0600
Subject: [PATCH 178/221] i3blocks: migrate to by-name

---
 .../i3/blocks.nix => by-name/i3/i3blocks/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/blocks.nix => by-name/i3/i3blocks/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/by-name/i3/i3blocks/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/blocks.nix
rename to pkgs/by-name/i3/i3blocks/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eafa9564c838..4fc53566faea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
-
   i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { };
 
   i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { };

From 703715839051c2607a9569acd0445eecb0b9e8e8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:02:41 -0600
Subject: [PATCH 179/221] i3blocks: modernize derivation

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

diff --git a/pkgs/by-name/i3/i3blocks/package.nix b/pkgs/by-name/i3/i3blocks/package.nix
index a9ecb366e11a..e8201faf6bac 100644
--- a/pkgs/by-name/i3/i3blocks/package.nix
+++ b/pkgs/by-name/i3/i3blocks/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     owner = "vivien";
     repo = "i3blocks";
     rev = "3417602a2d8322bc866861297f535e1ef80b8cb0";
-    sha256 = "0v8mwnm8qzpv6xnqvrk43s4b9iyld4naqzbaxk4ldq1qkhai0wsv";
+    hash = "sha256-W3MQFZw44EbJ7Gp9rCxp1Me0iB5k5o1tN/t+jKrlFW0=";
   };
 
   patches = [
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     (fetchpatch {
       # https://github.com/vivien/i3blocks/pull/405
       url = "https://github.com/edef1c/i3blocks/commit/d57b32f9a364aeaf36869efdd54240433c737e57.patch";
-      sha256 = "102xb0ax0hmg82dz2gzfag470dkckzf2yizai0izacvrz0d3ngj1";
+      hash = "sha256-QT47Gvh5M/UjiOpHL9yfbDZwyFPuP/GbQK9C0BVYXYA=";
     })
   ];
 

From 5800b6947f888b4091dfe3a26c608e691099e894 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:03:50 -0600
Subject: [PATCH 180/221] i3blocks-gaps: migrate to by-name

---
 .../i3/blocks-gaps.nix => by-name/i3/i3blocks-gaps/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/blocks-gaps.nix => by-name/i3/i3blocks-gaps/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/by-name/i3/i3blocks-gaps/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/blocks-gaps.nix
rename to pkgs/by-name/i3/i3blocks-gaps/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fc53566faea..59cf0da47f4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { };
-
   i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { };
 
   i3lock-blur = callPackage ../applications/window-managers/i3/lock-blur.nix { };

From ec2aff21c23eaa04fc5ca59dded602cc56fcd090 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:04:44 -0600
Subject: [PATCH 181/221] i3blocks-gaps: modernize derivation

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

diff --git a/pkgs/by-name/i3/i3blocks-gaps/package.nix b/pkgs/by-name/i3/i3blocks-gaps/package.nix
index 347242655347..b25227aab0aa 100644
--- a/pkgs/by-name/i3/i3blocks-gaps/package.nix
+++ b/pkgs/by-name/i3/i3blocks-gaps/package.nix
@@ -31,7 +31,7 @@ let
   contains_any = l1: l2: 0 < lib.length (lib.intersectLists l1 l2);
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "i3blocks-gaps";
   version = "1.4";
 
@@ -39,13 +39,13 @@ stdenv.mkDerivation rec {
     owner = "Airblader";
     repo = "i3blocks-gaps";
     rev = "4cfdf93c75f729a2c96d471004d31734e923812f";
-    sha256 = "0v9307ij8xzwdaxay3r75sd2cp453s3qb6q7dy9fks2p6wwqpazi";
+    hash = "sha256-8auLOTdX6OmSbwebhYcehVwmmi4nD6+6avx3JOMBI20=";
   };
 
   makeFlags = [ "all" ];
   installFlags = [
     "PREFIX=\${out}"
-    "VERSION=${version}"
+    "VERSION=${finalAttrs.version}"
   ];
 
   buildInputs = lib.optional (contains_any scripts perlscripts) perl;
@@ -81,4 +81,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ carlsverre ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 479a4ff2607986f6c1d34f664987a171889d9f03 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:06:14 -0600
Subject: [PATCH 182/221] i3ipc-glib: migrate to by-name

---
 .../i3/i3ipc-glib.nix => by-name/i3/i3ipc-glib/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/i3ipc-glib.nix => by-name/i3/i3ipc-glib/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/by-name/i3/i3ipc-glib/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/i3ipc-glib.nix
rename to pkgs/by-name/i3/i3ipc-glib/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59cf0da47f4e..f5d34c499d56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { };
-
   i3lock-blur = callPackage ../applications/window-managers/i3/lock-blur.nix { };
 
   i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { };

From a93b7dad47623357f3116787546e86eb91ff3f95 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:07:15 -0600
Subject: [PATCH 183/221] i3ipc-glib: modernize derivation

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

diff --git a/pkgs/by-name/i3/i3ipc-glib/package.nix b/pkgs/by-name/i3/i3ipc-glib/package.nix
index 9eaf306be52d..3c949cc344c4 100644
--- a/pkgs/by-name/i3/i3ipc-glib/package.nix
+++ b/pkgs/by-name/i3/i3ipc-glib/package.nix
@@ -12,15 +12,15 @@
   gobject-introspection,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "i3ipc-glib";
   version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "i3ipc-glib";
-    rev = "v${version}";
-    sha256 = "01fzvrbnzcwx0vxw29igfpza9zwzp2s7msmzb92v01z0rz0y5m0p";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-F9Tiwc/gB7BFWr/qerS4n/+k/nUvJsH7Bp2zb1fe3wU=";
   };
 
   strictDeps = true;
@@ -49,4 +49,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
   };
-}
+})

From c94c0b142e4a35f9039a9e1e4bb8dcfbe2693be3 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:08:43 -0600
Subject: [PATCH 184/221] i3lock-blur: migrate to by-name

---
 .../i3/lock-blur.nix => by-name/i3/i3lock-blur/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/lock-blur.nix => by-name/i3/i3lock-blur/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/by-name/i3/i3lock-blur/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/lock-blur.nix
rename to pkgs/by-name/i3/i3lock-blur/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5d34c499d56..4c8c3200e689 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3lock-blur = callPackage ../applications/window-managers/i3/lock-blur.nix { };
-
   i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { };
 
   i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { };

From 5f952285923fc83327cf06e53c2b3b4e5fd4881d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:10:16 -0600
Subject: [PATCH 185/221] i3lock-blur: switch to tag and hash

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

diff --git a/pkgs/by-name/i3/i3lock-blur/package.nix b/pkgs/by-name/i3/i3lock-blur/package.nix
index d0890f0b6a7c..1972ce8ad715 100644
--- a/pkgs/by-name/i3/i3lock-blur/package.nix
+++ b/pkgs/by-name/i3/i3lock-blur/package.nix
@@ -14,8 +14,8 @@ i3lock-color.overrideAttrs (oldAttrs: rec {
   src = fetchFromGitHub {
     owner = "karulont";
     repo = "i3lock-blur";
-    rev = version;
-    sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0=";
+    tag = version;
+    hash = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0=";
   };
 
   patches = [
@@ -24,7 +24,7 @@ i3lock-color.overrideAttrs (oldAttrs: rec {
     (fetchpatch {
       name = "fno-common.patch";
       url = "https://github.com/karulont/i3lock-blur/commit/ec8fe0e7f7d78bf445602ed517efd5c324bb32f7.patch";
-      sha256 = "sha256-0hXUr+ZEB1tpI3xw80/hGzKyeGuna4CQmEvK6t0VBqU=";
+      hash = "sha256-0hXUr+ZEB1tpI3xw80/hGzKyeGuna4CQmEvK6t0VBqU=";
     })
   ];
 

From 7aa7abbc3135db1827adaa7933eb78e628f76309 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:11:25 -0600
Subject: [PATCH 186/221] i3lock-color: migrate to by-name

---
 .../i3/lock-color.nix => by-name/i3/i3lock-color/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/lock-color.nix => by-name/i3/i3lock-color/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/by-name/i3/i3lock-color/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/lock-color.nix
rename to pkgs/by-name/i3/i3lock-color/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c8c3200e689..cc55b72aab80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { };
-
   i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { };
 
   i3lock-fancy-rapid = callPackage ../applications/window-managers/i3/lock-fancy-rapid.nix { };

From 1bd7b4d8048101ad7262ee1745a814a4be1da838 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:12:44 -0600
Subject: [PATCH 187/221] i3lock-color: modernize derivation

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

diff --git a/pkgs/by-name/i3/i3lock-color/package.nix b/pkgs/by-name/i3/i3lock-color/package.nix
index 4de1997717c3..5c87ce58ce26 100644
--- a/pkgs/by-name/i3/i3lock-color/package.nix
+++ b/pkgs/by-name/i3/i3lock-color/package.nix
@@ -18,15 +18,15 @@
   libxcb-util,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "2.13.c.5";
   pname = "i3lock-color";
 
   src = fetchFromGitHub {
     owner = "PandorasFox";
     repo = "i3lock-color";
-    rev = version;
-    sha256 = "sha256-fuLeglRif2bruyQRqiL3nm3q6qxoHcPdVdL+QjGBR/k=";
+    tag = finalAttrs.version;
+    hash = "sha256-fuLeglRif2bruyQRqiL3nm3q6qxoHcPdVdL+QjGBR/k=";
   };
 
   nativeBuildInputs = [
@@ -94,4 +94,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})

From 99b3b04f38331be1aa8a54c90d7038a6a04ae05a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:13:55 -0600
Subject: [PATCH 188/221] i3lock-fancy: migrate to by-name

---
 .../i3/lock-fancy.nix => by-name/i3/i3lock-fancy/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/lock-fancy.nix => by-name/i3/i3lock-fancy/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/by-name/i3/i3lock-fancy/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/lock-fancy.nix
rename to pkgs/by-name/i3/i3lock-fancy/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc55b72aab80..f431d0b17fd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { };
-
   i3lock-fancy-rapid = callPackage ../applications/window-managers/i3/lock-fancy-rapid.nix { };
 
   i3status = callPackage ../applications/window-managers/i3/status.nix { };

From a521968c49932574ddb419d69f47ad85611acd9e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:14:54 -0600
Subject: [PATCH 189/221] i3lock-fancy-rapid: migrate to by-name

---
 .../i3/i3lock-fancy-rapid/package.nix}                          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/lock-fancy-rapid.nix => by-name/i3/i3lock-fancy-rapid/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/by-name/i3/i3lock-fancy-rapid/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/lock-fancy-rapid.nix
rename to pkgs/by-name/i3/i3lock-fancy-rapid/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f431d0b17fd4..6a8822057915 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3lock-fancy-rapid = callPackage ../applications/window-managers/i3/lock-fancy-rapid.nix { };
-
   i3status = callPackage ../applications/window-managers/i3/status.nix { };
 
   i3wsr = callPackage ../applications/window-managers/i3/wsr.nix { };

From 80e40178662f626183316e1b337434d0090d0b18 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:16:10 -0600
Subject: [PATCH 190/221] i3status: migrate to by-name

---
 .../i3/status.nix => by-name/i3/i3status/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/status.nix => by-name/i3/i3status/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/by-name/i3/i3status/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/status.nix
rename to pkgs/by-name/i3/i3status/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a8822057915..29161c368e8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3status = callPackage ../applications/window-managers/i3/status.nix { };
-
   i3wsr = callPackage ../applications/window-managers/i3/wsr.nix { };
 
   i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };

From 068f03ef6f7cbbf8daad7b688fc3fa2288747143 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:17:06 -0600
Subject: [PATCH 191/221] i3status: modernize derivation

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

diff --git a/pkgs/by-name/i3/i3status/package.nix b/pkgs/by-name/i3/i3status/package.nix
index 48522e770e78..5d8b0fb26a1c 100644
--- a/pkgs/by-name/i3/i3status/package.nix
+++ b/pkgs/by-name/i3/i3status/package.nix
@@ -17,13 +17,13 @@
   docbook_xsl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "i3status";
   version = "2.15";
 
   src = fetchurl {
-    url = "https://i3wm.org/i3status/i3status-${version}.tar.xz";
-    sha256 = "sha256-bGf1LK5PE533ZK0cxzZWK+D5d1B5G8IStT80wG6vIgU=";
+    url = "https://i3wm.org/i3status/i3status-${finalAttrs.version}.tar.xz";
+    hash = "sha256-bGf1LK5PE533ZK0cxzZWK+D5d1B5G8IStT80wG6vIgU=";
   };
 
   separateDebugInfo = true;
@@ -54,4 +54,4 @@ stdenv.mkDerivation rec {
     mainProgram = "i3status";
   };
 
-}
+})

From ff6ccf3c08e28ec1cbbc848b67c27c15582616b9 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:18:00 -0600
Subject: [PATCH 192/221] i3wsr: migrate to by-name

---
 .../window-managers/i3/wsr.nix => by-name/i3/i3wsr/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/wsr.nix => by-name/i3/i3wsr/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/by-name/i3/i3wsr/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/wsr.nix
rename to pkgs/by-name/i3/i3wsr/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29161c368e8f..1ae73fd0c291 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3wsr = callPackage ../applications/window-managers/i3/wsr.nix { };
-
   i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
 
   workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };

From b28fb6c5eb9bfeb0c40bb091db0ab5eac95eae1d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:18:46 -0600
Subject: [PATCH 193/221] i3wsr: modernize derivation

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

diff --git a/pkgs/by-name/i3/i3wsr/package.nix b/pkgs/by-name/i3/i3wsr/package.nix
index 0a8dfd4949ce..8ecbbfc428f7 100644
--- a/pkgs/by-name/i3/i3wsr/package.nix
+++ b/pkgs/by-name/i3/i3wsr/package.nix
@@ -6,14 +6,14 @@
   python3,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "i3wsr";
   version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "roosta";
     repo = "i3wsr";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-8cQM2M9XjS4FSSX1/WHqmTP842Ahd1XoaqOWSGSEE0s=";
   };
 
@@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sebbadk ];
   };
-}
+})

From 13918645bab4d856ca06013701a1c8896157d324 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:19:59 -0600
Subject: [PATCH 194/221] i3-wk-switch: migrate to by-name

---
 .../i3/wk-switch.nix => by-name/i3/i3-wk-switch/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/wk-switch.nix => by-name/i3/i3-wk-switch/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/by-name/i3/i3-wk-switch/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/wk-switch.nix
rename to pkgs/by-name/i3/i3-wk-switch/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ae73fd0c291..2cffaaeac17a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
-
   workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
 
   wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };

From 98e343d84e922aca1d1f26af74e6d2d7cddf97c2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:20:46 -0600
Subject: [PATCH 195/221] i3-wk-switch: switch to hash

---
 pkgs/by-name/i3/i3-wk-switch/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/i3/i3-wk-switch/package.nix b/pkgs/by-name/i3/i3-wk-switch/package.nix
index 41a9523303bb..60ae67e9bf4c 100644
--- a/pkgs/by-name/i3/i3-wk-switch/package.nix
+++ b/pkgs/by-name/i3/i3-wk-switch/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication {
     owner = "tmfink";
     repo = "i3-wk-switch";
     rev = "a618cb8f52120aa8d533bb7c0c8de3ff13b3dc06";
-    sha256 = "0ci0w5igjk5xa8x4rx17cpgmdkamwjmavxhp0vp6213cl93ybjhz";
+    hash = "sha256-H8rlR6JsBGHuBhf2rarkVc1W32Un9Ew6Ur1M+WLhIDI=";
   };
 
   propagatedBuildInputs = with python3Packages; [ i3ipc ];

From 4659541e91f0c2c67526bb7d59e052d9aa61be0d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:24:59 -0600
Subject: [PATCH 196/221] workstyle: migrate to by-name

---
 .../i3/workstyle.nix => by-name/wo/workstyle/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/workstyle.nix => by-name/wo/workstyle/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/workstyle.nix b/pkgs/by-name/wo/workstyle/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/workstyle.nix
rename to pkgs/by-name/wo/workstyle/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cffaaeac17a..fadf807cd137 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
-
   wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };
 
   ikiwiki = callPackage ../applications/misc/ikiwiki {

From dae2141fe833a80d4bde67bb61ea74eb65e98725 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:25:48 -0600
Subject: [PATCH 197/221] workstyle: switch to hash

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

diff --git a/pkgs/by-name/wo/workstyle/package.nix b/pkgs/by-name/wo/workstyle/package.nix
index bd519d92f5b1..27ca6ad8e051 100644
--- a/pkgs/by-name/wo/workstyle/package.nix
+++ b/pkgs/by-name/wo/workstyle/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage {
     owner = "pierrechevalier83";
     repo = "workstyle";
     rev = "8bde72d9a9dd67e0fc7c0545faca53df23ed3753";
-    sha256 = "sha256-yhnt7edhgVy/cZ6FpF6AZWPoeMeEKTXP+87no2KeIYU=";
+    hash = "sha256-yhnt7edhgVy/cZ6FpF6AZWPoeMeEKTXP+87no2KeIYU=";
   };
 
   cargoHash = "sha256-es8kS1w71TuQ1pKb4/wXtpukWEBqUJUA+GX3uXOYbtU=";

From 859d686ef778376de9a32b26aa2531ac9366a7c5 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:27:14 -0600
Subject: [PATCH 198/221] wmfocus: migrate to by-name

---
 .../i3/wmfocus.nix => by-name/wm/wmfocus/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/i3/wmfocus.nix => by-name/wm/wmfocus/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/by-name/wm/wmfocus/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/i3/wmfocus.nix
rename to pkgs/by-name/wm/wmfocus/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fadf807cd137..1a61bae6dc97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9505,8 +9505,6 @@ with pkgs;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };
-
   ikiwiki = callPackage ../applications/misc/ikiwiki {
     inherit
       (perlPackages.override {

From ee92e34e1cc2a8f7514d705e88932c0b074f0154 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 18 Feb 2026 10:27:51 -0600
Subject: [PATCH 199/221] wmfocus: modernize derivation

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

diff --git a/pkgs/by-name/wm/wmfocus/package.nix b/pkgs/by-name/wm/wmfocus/package.nix
index 3f4740a37df2..82c44e5ca616 100644
--- a/pkgs/by-name/wm/wmfocus/package.nix
+++ b/pkgs/by-name/wm/wmfocus/package.nix
@@ -10,15 +10,15 @@
   libxkbcommon,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wmfocus";
   version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "wmfocus";
-    rev = "v${version}";
-    sha256 = "sha256-94MgE2j8HaS8IyzHEDtoqTls2A8xD96v2iAFx9XfMcw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-94MgE2j8HaS8IyzHEDtoqTls2A8xD96v2iAFx9XfMcw=";
   };
 
   cargoHash = "sha256-tYzJS/ApjGuvNnGuBEVr54AGcEmDhG9HtirZvtmNslY=";
@@ -47,4 +47,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
-}
+})

From d2dcfa496385b3a8c044c9f714713e7eebb7aea7 Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@nibelheim.ch>
Date: Tue, 12 May 2026 20:29:46 +0200
Subject: [PATCH 200/221] python3Packages.l18n: fix changelog URL

---
 pkgs/development/python-modules/l18n/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/l18n/default.nix b/pkgs/development/python-modules/l18n/default.nix
index ca26a9a254d9..d34287dd96d7 100644
--- a/pkgs/development/python-modules/l18n/default.nix
+++ b/pkgs/development/python-modules/l18n/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Locale internationalization package";
     homepage = "https://github.com/tkhyn/l18n";
-    changelog = "https://github.com/tkhyn/l18n/blob/${finalAttrs.version}/CHANGES.rst";
+    changelog = "https://github.com/tkhyn/l18n/blob/v${finalAttrs.version}.0/CHANGES.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sephi ];
   };

From 2972c758e12c5b7b8ab4aadfb8cadef651817e57 Mon Sep 17 00:00:00 2001
From: Sylvain Fankhauser <sephi@nibelheim.ch>
Date: Tue, 12 May 2026 20:30:09 +0200
Subject: [PATCH 201/221] python3Packages.django-rest-registration: fix
 changelog URL

---
 .../python-modules/django-rest-registration/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix
index fe93f7ee8476..e08e9c668063 100644
--- a/pkgs/development/python-modules/django-rest-registration/default.nix
+++ b/pkgs/development/python-modules/django-rest-registration/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   meta = {
     description = "User-related REST API based on the awesome Django REST Framework";
     homepage = "https://github.com/apragacz/django-rest-registration/";
-    changelog = "https://github.com/apragacz/django-rest-registration/releases/tag/${version}";
+    changelog = "https://github.com/apragacz/django-rest-registration/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sephi ];
   };

From 27d89ff6072de383922e0c20639c7e8c659ea688 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 18:41:42 +0000
Subject: [PATCH 202/221] snx-rs: 6.0.4 -> 6.0.5

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

diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index 78db8786a60f..fd0885aaac58 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -15,13 +15,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "snx-rs";
-  version = "6.0.4";
+  version = "6.0.5";
 
   src = fetchFromGitHub {
     owner = "ancwrd1";
     repo = "snx-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5kb/3S9KxLBMVDJ1hB7CnHhnYfY484J+5OQ3y6LgIZY=";
+    hash = "sha256-ueuIOAw+dhw9Mt3xIlzlUmQuir9FogOtboEgsATNwmQ=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
 
-  cargoHash = "sha256-o+s4DJiSBx8NnKHWuclWPNEb4Ci4KgEFnzaLUcJ2ooI=";
+  cargoHash = "sha256-dCi6ctdjM63Uhny2ppo/ymVAF9KeeRNitZWDQKEFLiw=";
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";

From 2cbbe681b2900d2092524d530bb8b4f7218b2783 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <ielminky@gmail.com>
Date: Tue, 12 May 2026 14:02:44 -0500
Subject: [PATCH 203/221] tlp-pd: fix typo in package description

---
 pkgs/by-name/tl/tlp-pd/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tl/tlp-pd/package.nix b/pkgs/by-name/tl/tlp-pd/package.nix
index 239a467ecd0c..c24d878bd11d 100644
--- a/pkgs/by-name/tl/tlp-pd/package.nix
+++ b/pkgs/by-name/tl/tlp-pd/package.nix
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication {
       maintainers
       license
       ;
-    description = "Power-rofiles-daemon like DBus interface for TLP";
+    description = "Power-profiles-daemon like DBus interface for TLP";
     mainProgram = "tlp-pd";
   };
 }

From edd4dbda10e74435e4b97766fa1c396f04c58f2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 19:04:43 +0000
Subject: [PATCH 204/221] libretro.swanstation: 0-unstable-2026-04-10 ->
 0-unstable-2026-05-11

---
 pkgs/applications/emulators/libretro/cores/swanstation.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/swanstation.nix b/pkgs/applications/emulators/libretro/cores/swanstation.nix
index 2125111b2a05..9c3b64a9fb6b 100644
--- a/pkgs/applications/emulators/libretro/cores/swanstation.nix
+++ b/pkgs/applications/emulators/libretro/cores/swanstation.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "swanstation";
-  version = "0-unstable-2026-04-10";
+  version = "0-unstable-2026-05-11";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "swanstation";
-    rev = "0c263202fe29689113c3db63c8cd3fcacfc6ff37";
-    hash = "sha256-u+ZryM8CY4TTJ7YQdHMNREMbQ6gEd2Mz9h5s0CY4nEY=";
+    rev = "0f7757b3196ab472c3a8b279206b3ea19a3e5f2d";
+    hash = "sha256-5R+K0NpLdjajT6LV0os569vrgqRCtfXDqMnhM8z7dmk=";
   };
 
   extraNativeBuildInputs = [ cmake ];

From bc768f1c8786e6b205036f78b0e0fa4d39751ea7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 19:17:18 +0000
Subject: [PATCH 205/221] librewolf-unwrapped: 150.0.2 -> 150.0.3

---
 pkgs/by-name/li/librewolf-unwrapped/src.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json
index 5016d5a46ca5..9a43743f60aa 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/src.json
+++ b/pkgs/by-name/li/librewolf-unwrapped/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "150.0.2-1",
+  "packageVersion": "150.0.3-1",
   "source": {
-    "rev": "150.0.2-1",
-    "hash": "sha256-eEdLG9hBTRH8UIoclGJaJ4rNcTDrXbeUWZPM+Y6WXTw="
+    "rev": "150.0.3-1",
+    "hash": "sha256-ScwnfmK2zUFQLoy1Z9P9xQ2iTss2ufbzji/IHJSri9U="
   },
   "firefox": {
-    "version": "150.0.2",
-    "hash": "sha512-4i/Gb3+uub70A20KkK9MJ9q8RaPcWccpBTa/5Gx2JNcziNKbNqiZnjZAZfoxpfoWdZZjIimwr5vBuvQTX6KaTQ=="
+    "version": "150.0.3",
+    "hash": "sha512-hFLaYSAPjuZnkNP/8jDKhLKskpGvK1fgGEhsUPk4xTxvtJQ/5s/h6ZuXg0ZvsAv3B/oAYpN1OsaYYY/B47cKSg=="
   }
 }

From c3d7eb8466993163fbd7224e3841b3b03327bde8 Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Tue, 12 May 2026 21:21:36 +0200
Subject: [PATCH 206/221] pwvucontrol: 0.5.1 -> 0.5.2

---
 pkgs/by-name/pw/pwvucontrol/package.nix | 29 +++++--------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix
index f0807791f312..4ccd1c1a2554 100644
--- a/pkgs/by-name/pw/pwvucontrol/package.nix
+++ b/pkgs/by-name/pw/pwvucontrol/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   fetchFromGitLab,
   fetchpatch,
+  blueprint-compiler,
   cargo,
   desktop-file-utils,
   meson,
@@ -22,39 +23,20 @@
   wireplumber,
 }:
 
-let
-  wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec {
-    version = "0.4.17";
-    src = fetchFromGitLab {
-      domain = "gitlab.freedesktop.org";
-      owner = "pipewire";
-      repo = "wireplumber";
-      tag = version;
-      hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";
-    };
-
-    patches = [
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/f4f495ee212c46611303dec9cd18996830d7f721.patch";
-        hash = "sha256-dxVlXFGyNvWKZBrZniFatPPnK+38pFGig7LGAsc6Ydc=";
-      })
-    ];
-  });
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pwvucontrol";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "saivert";
     repo = "pwvucontrol";
     tag = finalAttrs.version;
-    hash = "sha256-21TBVDzjrBzNIPkAURGs2ngI8Vj6o/RL3Ael4wwE2Lk=";
+    hash = "sha256-3H0qLhnhD/CVjKcx8UISFD4tSgH9O3V2uyNcgYug6Ug=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-FrPpLbfqM/DtjYu20pwr1AMUHaAuTEt60I3JlFZO4RI=";
+    hash = "sha256-k3a1I+M+rxXvABlgpsw6tFhTIgaxpsCUDwhuFQj6Nhc=";
   };
 
   postPatch = ''
@@ -64,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeBuildInputs = [
+    blueprint-compiler
     cargo
     desktop-file-utils
     meson
@@ -83,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     libadwaita
     pango
     pipewire
-    wireplumber_0_4
+    wireplumber
   ];
 
   # For https://github.com/saivert/pwvucontrol/blob/7bf43c746cd49fffbfb244ac4474742c6b3737a9/src/meson.build#L45-L46

From 34e2bac90db2fdc592460e4fa099d8caaf6a0b72 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 19:54:09 +0000
Subject: [PATCH 207/221] interlude: 0.7.28.1 -> 0.7.28.2

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

diff --git a/pkgs/by-name/in/interlude/package.nix b/pkgs/by-name/in/interlude/package.nix
index e2272f859556..e4ce5241e2b3 100644
--- a/pkgs/by-name/in/interlude/package.nix
+++ b/pkgs/by-name/in/interlude/package.nix
@@ -15,7 +15,7 @@
 }:
 
 let
-  version = "0.7.28.1";
+  version = "0.7.28.2";
 in
 buildDotnetModule {
   pname = "interlude";
@@ -26,7 +26,7 @@ buildDotnetModule {
     repo = "YAVSRG";
     tag = "interlude-v${version}";
     fetchSubmodules = true;
-    hash = "sha256-0Qbnywbq4cs/WPhvCou31FFKdqjRhZ4Aww06D1h5Nx4=";
+    hash = "sha256-39GhnQcp5yaHC2fGnXkjny7e7QphBYih+PUuj3GR6qA=";
   };
 
   patches = [

From 6035459c0a15d68669102c10132bf7662e3c9da5 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 12 May 2026 21:55:51 +0200
Subject: [PATCH 208/221] chromium,chromedriver: 148.0.7778.96 ->
 148.0.7778.167

https://chromereleases.googleblog.com/2026/05/stable-channel-update-for-desktop_12.html
---
 .../networking/browsers/chromium/info.json    | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 33ed202662ed..b01d05397b8e 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "148.0.7778.96",
+    "version": "148.0.7778.167",
     "chromedriver": {
-      "version": "147.0.7727.138",
-      "hash_darwin": "sha256-d2dEPcR2mlfkL6XGhzMsgH/OwAI+yLXdS0dF4luPRfM=",
-      "hash_darwin_aarch64": "sha256-6rguKqpJJd058DQbiLVKVd/t+E7yYe1FHHB6zlwD6bU="
+      "version": "148.0.7778.168",
+      "hash_darwin": "sha256-F24gaQI0JZkStM71KJDEn8EKBTw1UifMxYXDdUIVup4=",
+      "hash_darwin_aarch64": "sha256-WpAiIz3nXxJLkxAP5JSn6rSxDW0vvl7EHeJA5MD+nss="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "8625e066febc721e015ea99842da12901eb7ed73",
-        "hash": "sha256-coeBYfNPtiRRPuqoBRaxkTQI/a2pYNLI1slUdU1dZAc=",
+        "rev": "65db666ac2cf205fcc36db8bb5b9cd87f94808ac",
+        "hash": "sha256-Vda6y35lHYP3xK9FT5FdsnfTtL0MiY2m/auSq6NyL0U=",
         "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": "cc0e3572e8789f4a184dd9714a04b3d98ae81015",
-        "hash": "sha256-3KVTEBcnQTn99ccdKzylzUvua2jlS4g8/nfIDdLk6ug="
+        "rev": "6c71c70ec7e838c5f1712974086c8bc33d07de14",
+        "hash": "sha256-35Zu8jSopO47pH1rNLtSq5I8QRsOkMMvTgtmD13Yw/Y="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -342,8 +342,8 @@
       },
       "src/third_party/harfbuzz/src": {
         "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "4fc96139259ebc35f40118e0382ac8037d928e5c",
-        "hash": "sha256-/RT2OPWFiVwFqmNS4o+gE0JrcVO1cQDkCkgrSEe7BzE="
+        "rev": "f027b8e9039f73bf803eae684fee2eb2d30e4180",
+        "hash": "sha256-HWb3QbPl+RE2oI/Jwv5BjKwv9UnJ8VcJvk+uGy9cAqM="
       },
       "src/third_party/ink/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
@@ -662,8 +662,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "afe8b760ada5128164f9826866b4381a3463df41",
-        "hash": "sha256-HsKHffZWTls362kjokxzdhaxb/xJD1g70VHGk9l6GVM="
+        "rev": "a2888b27a98e4ff30085d4d2dba8a1a99baf6dfb",
+        "hash": "sha256-eOjFuMmXr9YtZ0e4yDB8JMjTrNWEg5OlTkAMGuHZIWE="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -797,8 +797,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "9600e77d854090669817d22aa2fc941ee92aaacd",
-        "hash": "sha256-jTJv53qt971Va5q6MaULysYiChBVmsFYxG9fzkcE0ak="
+        "rev": "9a7f650bcd14f241d20f88f4e1ea3b7300de72ac",
+        "hash": "sha256-k5cHE4XURJQrPURmXk4MMNV5k8+ryKfjmsVTzARRro4="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -822,8 +822,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "ddc9a95905de5268332a8f0216dc2bc67d26e829",
-        "hash": "sha256-x2FGL3J+JaWO1m6jBrcayR7Vlz90fYEAuufm4PULYyM="
+        "rev": "e38030f4228c8d1405fe105fc5feaa5173559e25",
+        "hash": "sha256-VsJpsCfDGF6rlfYQXccgF+F/pBhY/ybUa9N5HnHJ2lU="
       }
     }
   },

From 67d127c7214a32727f6620e49a81a1481c97f632 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 12 May 2026 22:21:47 +0200
Subject: [PATCH 209/221] pnpm: 11.1.0 -> 11.1.1

https://github.com/pnpm/pnpm/releases/tag/v11.1.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 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 c1423124fc24..42f43ad121f8 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -26,8 +26,8 @@ let
       hash = "sha256-jnDdxmSbGLw9iVzzqQjAKR6kw4A5rYcixH4Bja8enPw=";
     };
     "11" = {
-      version = "11.1.0";
-      hash = "sha256-VzyCrTVuiwl+bKxIG3OB+d7tM6MYr38xGYSFjr4fl+8=";
+      version = "11.1.1";
+      hash = "sha256-BbKC0GMyKVxzbwsgyL3xhTJb8bymgske2BFUo8aFHMA=";
     };
   };
 

From 342203f139529d3154d819687a4c074ef6965ea0 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 12 May 2026 22:45:19 +0200
Subject: [PATCH 210/221] tests.pnpm.pnpm_11: fix binary

During refactoring, we forgot to update the lib path in the wrapper.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/test/pnpm/pnpm_11/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/test/pnpm/pnpm_11/default.nix b/pkgs/test/pnpm/pnpm_11/default.nix
index bf3ab4d4f551..fed05255ff0b 100644
--- a/pkgs/test/pnpm/pnpm_11/default.nix
+++ b/pkgs/test/pnpm/pnpm_11/default.nix
@@ -44,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     install -Dm644 -t $out/lib/pnpm-11-test dist/index.js
 
-    makeWrapper ${lib.getExe nodejs} $out/bin/pnpm11test \
-      --add-flags "$out/lib/pnpm11test"
+    makeWrapper ${lib.getExe nodejs} $out/bin/pnpm-11-test \
+      --add-flags "$out/lib/pnpm-11-test"
 
     runHook postInstall
   '';
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     license = lib.licenses.mit;
-    mainProgram = "pnpm11test";
+    mainProgram = "pnpm-11-test";
     inherit (pnpm.meta) maintainers;
   };
 })

From 260a16f4e61f654cbb7a12ffa770cdf41b2326d4 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 12 May 2026 17:15:07 -0400
Subject: [PATCH 211/221] google-chrome: 148.0.7778.96 -> 148.0.7778.167

Announcement: https://chromereleases.googleblog.com/2026/05/stable-channel-update-for-desktop_12.html
---
 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 a8cc4aaf026e..6b446a00ec00 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -184,11 +184,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "148.0.7778.96";
+    version = "148.0.7778.167";
 
     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-Rmowgy0t/GJkiu28ZkXdzi5dzFxpFpzhcbZgsdFKl0c=";
+      hash = "sha256-1k9PrK1mpUJFJ6RbC3ZEN0CqOLX4JbGpmpXQrDpZTVU=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -302,11 +302,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "148.0.7778.97";
+    version = "148.0.7778.168";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/fqffxmazeqztj7lx2lxedj2iwy_148.0.7778.97/GoogleChrome-148.0.7778.97.dmg";
-      hash = "sha256-lfmEmoovaTcgyvetQnXnlE9dOLI7FRvPu6f6Fcpc7JA=";
+      url = "http://dl.google.com/release2/chrome/l7nnht2cublegpab37bdleb52y_148.0.7778.168/GoogleChrome-148.0.7778.168.dmg";
+      hash = "sha256-HaextZ70Os3EN5mguSmKp0GD0LAy1kE4dWUYwOA+JOs=";
     };
 
     dontPatch = true;

From 66670c3d29c426cd5efbcd50bf81dde10f46ac4e Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 30 Apr 2026 20:40:26 -0700
Subject: [PATCH 212/221] adslib: 0-unstable-2021-11-07 ->
 0-unstable-2026-04-27

---
 pkgs/by-name/ad/adslib/package.nix | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ad/adslib/package.nix b/pkgs/by-name/ad/adslib/package.nix
index f29815505912..72f9602714ac 100644
--- a/pkgs/by-name/ad/adslib/package.nix
+++ b/pkgs/by-name/ad/adslib/package.nix
@@ -2,23 +2,33 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
   unstableGitUpdater,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "adslib";
-  version = "0-unstable-2021-11-07";
+  version = "0-unstable-2026-04-27";
 
   src = fetchFromGitHub {
     owner = "stlehmann";
     repo = "ADS";
-    rev = "a894d4512a51f3ada026efbf9553e75ba9351e2e";
-    sha256 = "SEh4yneTM1dfbWRdWlb5gP/uSeoOeE3g7g/rJWSTba8=";
+    rev = "77953d58f2690436e82db9954e2e55878c5edaa4";
+    hash = "sha256-UDPuzqD1krEZa7436k1NvE0lJUmNYG4kiP5fstoRDMc=";
   };
 
-  installPhase = ''
-    mkdir -p $out/lib
-    cp adslib.so $out/lib/adslib.so
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  postInstall = ''
+    # Downstream consumers (e.g. pyads) load the shared library as
+    # `adslib.so` rather than the meson default `libadslib.so`.
+    ln -s libadslib.so $out/lib/adslib.so
   '';
 
   passthru.updateScript = unstableGitUpdater { };
@@ -28,5 +38,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/stlehmann/ADS";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jamiemagee ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 52c8e469c10ac95cc367b3b6cadc42ef19b8c6ee Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 11 May 2026 10:07:53 -0700
Subject: [PATCH 213/221] python3Packages.pyads: disable flaky network tests

Both tests bind UDP 48899 in a daemon thread without SO_REUSEADDR,
so they race each other and sometimes segfault Python on shutdown.
---
 pkgs/development/python-modules/pyads/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/pyads/default.nix b/pkgs/development/python-modules/pyads/default.nix
index 6b1e06cf6669..bf6f8dedc8b1 100644
--- a/pkgs/development/python-modules/pyads/default.nix
+++ b/pkgs/development/python-modules/pyads/default.nix
@@ -44,6 +44,12 @@ buildPythonPackage rec {
   # Test suite has port reuse races and UDP timing issues on darwin
   doCheck = !stdenv.hostPlatform.isDarwin;
 
+  disabledTests = [
+    # Race over UDP 48899 (no SO_REUSEADDR), occasionally segfaulting on shutdown
+    "test_correct_route"
+    "test_get_ams"
+  ];
+
   pythonImportsCheck = [ "pyads" ];
 
   passthru.updateScript = nix-update-script {

From 106d4990ed4560bf7e7ae6193cb525454d109924 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 12 May 2026 17:32:04 -0500
Subject: [PATCH 214/221] vimPlugins.inlay-hints-nvim: fix plugin url

Not correct url for plugin.
---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index cf926280f12d..58dbf412445c 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -552,7 +552,7 @@ https://github.com/Darazaki/indent-o-matic/,,
 https://github.com/arsham/indent-tools.nvim/,,
 https://github.com/Yggdroot/indentLine/,,
 https://github.com/ciaranm/inkpot/,,
-https://github.com/MysticalDevil/inlay-hints/,,
+https://github.com/MysticalDevil/inlay-hints.nvim/,,
 https://github.com/jbyuki/instant.nvim/,,
 https://github.com/pta2002/intellitab.nvim/,,
 https://github.com/parsonsmatt/intero-neovim/,,

From b3c55bbc9a9796b66111b1291d96aa1aa9b3c99b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 12 May 2026 17:33:36 -0500
Subject: [PATCH 215/221] vimPlugins.vim-csharp: drop plugin

Repository deleted, getting 404 from github.
---
 pkgs/applications/editors/vim/plugins/aliases.nix  |  1 +
 .../applications/editors/vim/plugins/generated.nix | 14 --------------
 .../editors/vim/plugins/vim-plugin-names           |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 91c2efe05914..7dc05270b5c0 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -69,6 +69,7 @@ mapAliases (
     sparkup = throw "'vimPlugins.sparkup' was removed: the upstream repository got deleted"; # Added 2025-08-06
     syntax-tree-surfer = throw "'vimPlugins.syntax-tree-surfer' has been archived"; # Added 2025-12-18
     todo-nvim = throw "'vimPlugins.todo-nvim' has been removed: abandoned by upstream"; # Added 2023-08-23
+    vim-csharp = throw "'vimPlugins.vim-csharp' has been removed: repository deleted"; # Added 2026-05-12
     vim-sourcetrail = throw "'vimPlugins.vim-sourcetrail' has been removed: abandoned by upstream"; # Added 2022-08-14
     # keep-sorted end
   }
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 9bbcc30397d1..88d4c171e8f1 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -19891,20 +19891,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  vim-csharp = buildVimPlugin {
-    pname = "vim-csharp";
-    version = "0-unstable-2017-03-29";
-    src = fetchFromGitHub {
-      owner = "OrangeT";
-      repo = "vim-csharp";
-      rev = "b5982fc69bba7d507638a308d6875b031054280d";
-      hash = "sha256-ndFo3mG0UoMK3KyPoHj1L0+6p5aHG5hnJsuMtrEfTps=";
-    };
-    meta.homepage = "https://github.com/OrangeT/vim-csharp/";
-    meta.license = unfree;
-    meta.hydraPlatforms = [ ];
-  };
-
   vim-css-color = buildVimPlugin {
     pname = "vim-css-color";
     version = "0-unstable-2024-10-18";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 58dbf412445c..54d0408a05b6 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1418,7 +1418,6 @@ https://github.com/octol/vim-cpp-enhanced-highlight/,,
 https://github.com/mhinz/vim-crates/,,
 https://github.com/vim-crystal/vim-crystal/,,
 https://github.com/rbong/vim-crystalline/,,
-https://github.com/OrangeT/vim-csharp/,,
 https://github.com/ap/vim-css-color/,,
 https://github.com/cue-lang/vim-cue/,,
 https://github.com/itchyny/vim-cursorword/,,

From f0ed4101bdd2a2fcabfff70aca6c0b497663c16b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 12 May 2026 17:35:48 -0500
Subject: [PATCH 216/221] vimPlugins: update on 2026-05-12

---
 .../editors/vim/plugins/generated.nix         | 736 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |   1 +
 2 files changed, 369 insertions(+), 368 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 88d4c171e8f1..162c63400842 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -334,12 +334,12 @@ final: prev: {
 
   NrrwRgn = buildVimPlugin {
     pname = "NrrwRgn";
-    version = "0.34-unstable-2025-11-05";
+    version = "0.34-unstable-2026-05-07";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "NrrwRgn";
-      rev = "6a3f40bff37fcff7d4245932b47118f071b925f9";
-      hash = "sha256-MMoadYv3a+V3oNVI3C0FlzQxlPDWG3L8yLsjFrnkhdE=";
+      rev = "5c49cfe52eee3912fa72b1d4f838b6bf9686972a";
+      hash = "sha256-amf9Xve9/eOYnbewQMAA4qWR1ffo+UgTz3RvFHAO5f0=";
     };
     meta.homepage = "https://github.com/chrisbra/NrrwRgn/";
     meta.license = unfree;
@@ -446,12 +446,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "0-unstable-2026-04-30";
+    version = "0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "6db1246640e9e1bdf8a1d1f6d27a940fc0a572d5";
-      hash = "sha256-atJxcg6SOH/YAgnPQ6ITzPLQUkNqQQ0zz9NMH2o4m0U=";
+      rev = "afbdf2ae4391bf8639eaf9b0a5296aa4869a2b7f";
+      hash = "sha256-XOvnccf9KFE4WMwsTMGsLaNN5yMy6pMw3xoEZka94Ww=";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -868,12 +868,12 @@ final: prev: {
 
   ale = buildVimPlugin {
     pname = "ale";
-    version = "4.0.0-unstable-2026-04-15";
+    version = "4.0.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "c59c0d1a573a7b2fe491f78af4f2033bde454753";
-      hash = "sha256-ylXXgohtwdA3SBssckB9zrDhjXQK9OPFwt69n0LXYg8=";
+      rev = "78122497f57d17257c77301a08ddb7562f625f7e";
+      hash = "sha256-HKaQminhMI6H1/sDj/5sh2xlCoZtVL4XJVinMNxKcAo=";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
     meta.license = getLicenseFromSpdxId "BSD-2-Clause";
@@ -1050,12 +1050,12 @@ final: prev: {
 
   artio-nvim = buildVimPlugin {
     pname = "artio.nvim";
-    version = "0-unstable-2026-05-03";
+    version = "0-unstable-2026-05-04";
     src = fetchFromGitHub {
       owner = "comfysage";
       repo = "artio.nvim";
-      rev = "cd9ab579578b92b0a790e67202a6336058c53411";
-      hash = "sha256-kDhVBU8ErDw9iO2C2Ums0FAIq2In0Ly1k53KQrsBKKY=";
+      rev = "0b08d6862afe685fd78963808d022d7c15c89546";
+      hash = "sha256-SrYZPFBQVJgm0X/CzyOOTfDwgNBIrjH+jlW6K8aE2Ec=";
     };
     meta.homepage = "https://github.com/comfysage/artio.nvim/";
     meta.license = getLicenseFromSpdxId "EUPL-1.2";
@@ -1386,12 +1386,12 @@ final: prev: {
 
   auto-session = buildVimPlugin {
     pname = "auto-session";
-    version = "2.5.1-unstable-2026-02-15";
+    version = "2.5.1-unstable-2026-05-05";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "62437532b38495551410b3f377bcf4aaac574ebe";
-      hash = "sha256-VboD/4FNA/LVad0Nu/ul43pcUMnwpNpP0cAhs14u3dI=";
+      rev = "daa7c996a0395e26342934843938647d0f1e87f4";
+      hash = "sha256-Dy538JjSm47paDiXbPw+gM+UiPQlM4dM7bcRWzYY9w8=";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -1722,12 +1722,12 @@ final: prev: {
 
   bitbake = buildVimPlugin {
     pname = "bitbake";
-    version = "4.0.35";
+    version = "6.0";
     src = fetchFromGitHub {
       owner = "openembedded";
       repo = "bitbake";
-      tag = "yocto-4.0.35";
-      hash = "sha256-Dm+k84uBWAbHIRc2Wqqqk9f4V0J7Cl67TrShWBb1tiY=";
+      tag = "yocto-6.0";
+      hash = "sha256-RyMss2lWM04eFanbZNerlgRE971q7yKxQjPuN02D2IU=";
     };
     meta.homepage = "https://github.com/openembedded/bitbake/";
     meta.license = unfree;
@@ -1820,12 +1820,12 @@ final: prev: {
 
   blink-cmp-env = buildVimPlugin {
     pname = "blink-cmp-env";
-    version = "0-unstable-2025-09-13";
+    version = "0-unstable-2026-05-05";
     src = fetchFromGitHub {
       owner = "bydlw98";
       repo = "blink-cmp-env";
-      rev = "99af62c1f9aa46005e8f50ad4ccee581946546ca";
-      hash = "sha256-DEzOzlwmvWmkR9VBF2jsgeA/bCjjgIiqY46GrcBGTfE=";
+      rev = "6b147eca6fa5975d29f5508aff24e9a9acb6a1f5";
+      hash = "sha256-yzfHLMp3szMTfTq7j/BlKF/1zjLHLLvmUnGe0hIV5Hk=";
     };
     meta.homepage = "https://github.com/bydlw98/blink-cmp-env/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -3442,12 +3442,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "0.0.82-unstable-2026-04-30";
+    version = "0.0.82-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "e682a2e0cef815b49b3bb79a0c6d0a430c8116c8";
-      hash = "sha256-dSylKvIZhZjM/5ORCrs3+yROiIIg3fTGnchFK2i2bJY=";
+      rev = "269f4465f304f7f2412b9cc46fbdc98667b84546";
+      hash = "sha256-3YaXdNL7Kh2aVZAU1hVtdWfMLB12NGrknts6OUiTtYg=";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.license = unfree;
@@ -3526,12 +3526,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "19.12.0";
+    version = "19.13.0";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      tag = "v19.12.0";
-      hash = "sha256-SKqRMFG5xiJHhMCexOtQGAJRFYRgcfuInxTJvXhGhhI=";
+      tag = "v19.13.0";
+      hash = "sha256-9jSFvxX9m1+pFNY7YNRPz4Emm1HzNW/MjvR9BNDZpAo=";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -3638,12 +3638,12 @@ final: prev: {
 
   colorful-menu-nvim = buildVimPlugin {
     pname = "colorful-menu.nvim";
-    version = "0-unstable-2025-11-25";
+    version = "0-unstable-2026-05-06";
     src = fetchFromGitHub {
       owner = "xzbdmw";
       repo = "colorful-menu.nvim";
-      rev = "b51a659459df8d078201aefc995db8175ed55e84";
-      hash = "sha256-hra7QFKWsIqtAWYNDqPv3tJUAsZfVmGTY3AQjeWvxaM=";
+      rev = "13f9b7eaa9cd2901b4f8915cfb2483c3be4c8c20";
+      hash = "sha256-RPYTEtJ3pazPJjIby+WQOHVAa1BE58d9/EOu8XQnUNk=";
     };
     meta.homepage = "https://github.com/xzbdmw/colorful-menu.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -4017,12 +4017,12 @@ final: prev: {
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2.0.2";
+    version = "2.0.3";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      tag = "v2.0.2";
-      hash = "sha256-9e5nJI+ugkolwdzQ4/KT6Gz1rpSbOSnLfdUWT9LDJg0=";
+      tag = "v2.0.3";
+      hash = "sha256-sYcKs46PF+j9wvP+UQ+asGUNgZHD5JLnq9KQOube0mA=";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -5349,12 +5349,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "0-unstable-2026-04-29";
+    version = "0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "cccd08c1e86f4952cbab1e27a2bd54c7251b28de";
-      hash = "sha256-YiI+tSLCKQR1oTzUXHp7B82nFc2/0x+5pDc0AzkG/m0=";
+      rev = "153be96f0b28090ae5f046dffda189221a387083";
+      hash = "sha256-gQnO/bPH5FdOIPvet3WUAWrgAnOuxRQUtP+X4qfl8tM=";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -5631,11 +5631,11 @@ final: prev: {
 
   evergarden-nvim = buildVimPlugin {
     pname = "evergarden-nvim";
-    version = "0-unstable-2026-04-25";
+    version = "0-unstable-2026-05-11";
     src = fetchgit {
       url = "https://codeberg.org/evergarden/nvim";
-      rev = "762a37afe2e242144355fafe385d638ec347ec48";
-      hash = "sha256-q8nQ+F2OKL7AV92hUhHgesXMDrJakBGkLI17YvkVRa0=";
+      rev = "71be008947c25115d96b8effdd62e87fcb059fcc";
+      hash = "sha256-eLFB4fTLpsO08kyiPG1B3uOchEIlVzIxpmdWw151KkQ=";
     };
     meta.homepage = "https://codeberg.org/evergarden/nvim";
     meta.license = unfree;
@@ -5854,12 +5854,12 @@ final: prev: {
 
   firenvim = buildVimPlugin {
     pname = "firenvim";
-    version = "0.2.16-unstable-2026-05-02";
+    version = "0.2.17";
     src = fetchFromGitHub {
       owner = "glacambre";
       repo = "firenvim";
-      rev = "f84ab3f707a237d915f6a2e2d597708e66e3e66f";
-      hash = "sha256-EN3AsrTZ6yT2nJBAbQYqtu4oXqKrboP35YOwE0bYnVc=";
+      tag = "0.2.17";
+      hash = "sha256-lz104GH53X82zvZQDKuZm03QXlCP61aswnyWVfFAz4A=";
     };
     meta.homepage = "https://github.com/glacambre/firenvim/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -6037,12 +6037,12 @@ final: prev: {
 
   flutter-tools-nvim = buildVimPlugin {
     pname = "flutter-tools.nvim";
-    version = "2.2.0";
+    version = "3.0.0";
     src = fetchFromGitHub {
       owner = "nvim-flutter";
       repo = "flutter-tools.nvim";
-      tag = "v2.2.0";
-      hash = "sha256-deLOga7lpWbhjDuww0HhKWCvtPA17dgFtF5ZoYCDvLw=";
+      tag = "v3.0.0";
+      hash = "sha256-qr8k29l4VNdsr2ApXqFd3jGxCFqf4a4QKNYVAJkaxHQ=";
     };
     meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -6681,12 +6681,12 @@ final: prev: {
 
   go-nvim = buildVimPlugin {
     pname = "go.nvim";
-    version = "0.11-unstable-2026-04-13";
+    version = "0.11-unstable-2026-05-06";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "ed77921e3f0bdf9e52cf9fab2e0f4c69ef2a7e04";
-      hash = "sha256-4uH9Hdynja+ulXPmZq4uvrTceQUeF65VarxHXJ+ZUsM=";
+      rev = "5c741a26f5df77c95d42d8f48e7008aea10e5f4f";
+      hash = "sha256-Xap+L2uXcwtnbFDBB416cV6vVI8dtvsmXE/05gH/kbI=";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -7115,12 +7115,12 @@ final: prev: {
 
   haskell-snippets-nvim = buildVimPlugin {
     pname = "haskell-snippets.nvim";
-    version = "1.5.0-unstable-2026-04-21";
+    version = "1.5.0-unstable-2026-05-11";
     src = fetchFromGitHub {
       owner = "mrcjkb";
       repo = "haskell-snippets.nvim";
-      rev = "11868addce601fdeed56097d48ff42abeec3dfe8";
-      hash = "sha256-Y4ZNYNb7shMQ8lTAx2/8De9KgbYq8Pf+6yQhHX6a4Ck=";
+      rev = "f7482c1097007e8bac0502c0644e375a12ae72ba";
+      hash = "sha256-BygC8L0Jau5/7ljHfD9LJO18jhXvIq1SSvtyb7bNv40=";
     };
     meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/";
     meta.license = getLicenseFromSpdxId "GPL-2.0-only";
@@ -7312,12 +7312,12 @@ final: prev: {
 
   hlchunk-nvim = buildVimPlugin {
     pname = "hlchunk.nvim";
-    version = "1.3.0-unstable-2025-12-15";
+    version = "1.3.0-unstable-2026-05-07";
     src = fetchFromGitHub {
       owner = "shellRaining";
       repo = "hlchunk.nvim";
-      rev = "3bc2bd7aef28fbed6643534a0fdd0f19966544bc";
-      hash = "sha256-3B9j0O6sUXeOXxYmDlJb/nywHq6Q2kmbG3LkfLEaQt8=";
+      rev = "06f51922ca43d5cdacf96725c106405fe064c59e";
+      hash = "sha256-ETsuiYjTR4JF/4RVqRXJHLtcoalEaFinHxxD4Ww34xU=";
     };
     meta.homepage = "https://github.com/shellRaining/hlchunk.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -7452,12 +7452,12 @@ final: prev: {
 
   hunk-nvim = buildVimPlugin {
     pname = "hunk.nvim";
-    version = "1.9.0-unstable-2026-03-20";
+    version = "1.10.0";
     src = fetchFromGitHub {
       owner = "julienvincent";
       repo = "hunk.nvim";
-      rev = "a73c34934e87af4f2e615fea3a57ee28b2dceec8";
-      hash = "sha256-Zw+dudVej4hvT+S9Jk2IMuCWzU3b4z90fmfKDmcujug=";
+      tag = "v1.10.0";
+      hash = "sha256-HcQNn1qsY9seuyLjX1Z9FCSRs3cdoxYDL3lZIOjwwog=";
     };
     meta.homepage = "https://github.com/julienvincent/hunk.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -7767,7 +7767,7 @@ final: prev: {
       tag = "v0.0.7";
       hash = "sha256-136r1/SjBHcrKZZcFHZK7rFTcJHAReZqIzUrKsZStc4=";
     };
-    meta.homepage = "https://github.com/MysticalDevil/inlay-hints.nvim";
+    meta.homepage = "https://github.com/MysticalDevil/inlay-hints.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
@@ -7970,12 +7970,12 @@ final: prev: {
 
   jedi-vim = buildVimPlugin {
     pname = "jedi-vim";
-    version = "0.11.2-unstable-2026-02-10";
+    version = "0.11.2-unstable-2026-05-04";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "89a2122ab0ad30ebe258d8276bf584511fe27129";
-      hash = "sha256-GimiIMoxo/krAJptSnnQ2PqlyOZqfYLNagnrHs/zzqs=";
+      rev = "a33071af6b3cf2399bc4631e0aa265901e1cf99e";
+      hash = "sha256-Tg+JHiOneIqfVKJa8VfIbB1aNAYlJGNoiY/+7qgAYf8=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/davidhalter/jedi-vim/";
@@ -8138,12 +8138,12 @@ final: prev: {
 
   kanagawa-nvim = buildVimPlugin {
     pname = "kanagawa.nvim";
-    version = "0-unstable-2026-04-20";
+    version = "0-unstable-2026-05-10";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "8ad3b4cdcc804b332c32db8f9743667e1bb82b99";
-      hash = "sha256-vAq9ZiG3s4x/xFSKt9/o40pptj2y7S8DQqs1dJEdhVU=";
+      rev = "bb85e4bfc8d89b0e62c8fa53ccdd13d12e2f77b3";
+      hash = "sha256-fMP4NUCKD1ZcNkaHy6SuNm020ECXpBOihGv2n1wyTN4=";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -8517,11 +8517,11 @@ final: prev: {
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "0-unstable-2026-05-02";
+    version = "0-unstable-2026-05-09";
     src = fetchgit {
       url = "https://codeberg.org/andyg/leap.nvim/";
-      rev = "5ad712bbc927c09b6b6ebd3df414669bb80b6c77";
-      hash = "sha256-z8KC4POErCnUExNN/TmI+g+etBCbeuB2x4wIPz6Th/Y=";
+      rev = "940bc5e716a8cde63bd47e1b13f30fd9075ec0c8";
+      hash = "sha256-bwyZzOq0OGYMqJks3ijEWD3wgdbTNhUwNT96tWUNXK4=";
     };
     meta.homepage = "https://codeberg.org/andyg/leap.nvim/";
     meta.license = unfree;
@@ -8950,12 +8950,12 @@ final: prev: {
 
   llama-vim = buildVimPlugin {
     pname = "llama.vim";
-    version = "0-unstable-2026-04-02";
+    version = "0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "ggml-org";
       repo = "llama.vim";
-      rev = "cfb472aa94e08e982e0ae395bbf01f2cc8a3c6b7";
-      hash = "sha256-aYX33Btw00YQqvxgPdA6xifrOpeo7c+pBeKIB7po2qQ=";
+      rev = "0e26efd52491bc83f81991c4f09252f688b9746e";
+      hash = "sha256-Gfhj8fTFdHgny3meBakVVIrxu9KOUau8FMQ+iTDnRtA=";
     };
     meta.homepage = "https://github.com/ggml-org/llama.vim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -8992,12 +8992,12 @@ final: prev: {
 
   lsp-format-modifications-nvim = buildVimPlugin {
     pname = "lsp-format-modifications.nvim";
-    version = "0-unstable-2025-07-05";
+    version = "0-unstable-2026-05-09";
     src = fetchFromGitHub {
       owner = "joechrisellis";
       repo = "lsp-format-modifications.nvim";
-      rev = "fd2b0de0afa42bea1d310af8337a4a95ebd27260";
-      hash = "sha256-/x76tWGtSkDmbYyMZbVlzagqQnqumHyJqWHL2syDqvI=";
+      rev = "1b307ec983f5e312d2ad9ff22b5e8084afea848f";
+      hash = "sha256-3qwxYVhz2iA5+jePXvP5NNYz3GF5qgrY/IEU/kbpxAY=";
     };
     meta.homepage = "https://github.com/joechrisellis/lsp-format-modifications.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9034,12 +9034,12 @@ final: prev: {
 
   lsp-overloads-nvim = buildVimPlugin {
     pname = "lsp-overloads.nvim";
-    version = "1.5.0-unstable-2025-10-17";
+    version = "2.0.2-unstable-2026-05-10";
     src = fetchFromGitHub {
       owner = "Issafalcon";
       repo = "lsp-overloads.nvim";
-      rev = "187912c9da30c2b4a1e8f2d3e3bc5dc899f91ea0";
-      hash = "sha256-ZrtbUT6Q+KkIJTP1YJDCy1Fxy3Mmun2hXTVQ9V36kRQ=";
+      rev = "4a9277c52455785096ddc4df13208c67fd696343";
+      hash = "sha256-eVgWK7kxu8nrALPKpZrmrEhsXMzqLmx9RvcsUXDFODg=";
     };
     meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9117,12 +9117,12 @@ final: prev: {
 
   lsp_signature-nvim = buildVimPlugin {
     pname = "lsp_signature.nvim";
-    version = "0.3.1-unstable-2026-04-07";
+    version = "0.3.1-unstable-2026-05-05";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "lsp_signature.nvim";
-      rev = "a65b38f260cc3470a05b4afb84c8d868617d476d";
-      hash = "sha256-yKw5UmqLgllDszVcdwuUrYd8K7Ih7RfWn5H+6Yk3n8E=";
+      rev = "f40bcf203812beaf26766ec0bc169a7f429fd730";
+      hash = "sha256-Mq3UFwEJhdJ71xO6A8Yv3YAjIxilNJgV/d9voiRkIHE=";
     };
     meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -9173,12 +9173,12 @@ final: prev: {
 
   lspsaga-nvim = buildVimPlugin {
     pname = "lspsaga.nvim";
-    version = "0-unstable-2026-04-21";
+    version = "0-unstable-2026-05-04";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "lspsaga.nvim";
-      rev = "c532fb86c3d211c5829ad58d2a0783012739bb65";
-      hash = "sha256-oFzbEkY/WKT7jbwGxeKnbQXgnY8kSmH/UsjljXozBWU=";
+      rev = "e6c04f88836d79f2fd7e46fd170e7ee986c789d4";
+      hash = "sha256-aDf2JgqfxegMwzK8updAsyrwxU7HnSPtJQKzEDSTy14=";
     };
     meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9327,12 +9327,12 @@ final: prev: {
 
   mark-radar-nvim = buildVimPlugin {
     pname = "mark-radar.nvim";
-    version = "0-unstable-2026-04-17";
+    version = "0-unstable-2026-05-06";
     src = fetchFromGitHub {
       owner = "winston0410";
       repo = "mark-radar.nvim";
-      rev = "e0311901367e01382d5251fc0b881c6d4df1ee1a";
-      hash = "sha256-1rkEC4+EQSG5wmos2Pvw9GYU7HTiysL85AhBxoyXmKc=";
+      rev = "946ec6f8a8c914c9ae9fa682214479509fe1e155";
+      hash = "sha256-0/ac8kz0qQVJLQdXhl6r6gHze4o9XAFuM1v7ksxzlLA=";
     };
     meta.homepage = "https://github.com/winston0410/mark-radar.nvim/";
     meta.license = unfree;
@@ -9454,12 +9454,12 @@ final: prev: {
 
   mason-nvim = buildVimPlugin {
     pname = "mason.nvim";
-    version = "2.2.1-unstable-2026-04-27";
+    version = "2.2.1-unstable-2026-05-07";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason.nvim";
-      rev = "cb8445f8ce85d957416c106b780efd51c6298f89";
-      hash = "sha256-36u0h+nepjUub1tz5Cfw7GAUL14aMCg4hGFK5w3ZZBw=";
+      rev = "e54f5bf5f12c560da31c17eee5b3e1bd369f3ff9";
+      hash = "sha256-rWo4W+rF7PYAHbqAaa6YSITFO2sTCiBn/ydIElkJAFw=";
     };
     meta.homepage = "https://github.com/mason-org/mason.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -9664,12 +9664,12 @@ final: prev: {
 
   mini-ai = buildVimPlugin {
     pname = "mini.ai";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.ai";
-      rev = "43eb2074843950a3a25aae56a5f41362ec043bfa";
-      hash = "sha256-vrCIUPR3+oHpXyaYI4qEXcOvQQaE9lexWqB0XGalHYY=";
+      rev = "a783ce6e1a5b3bc90519f20b51f4a5f6702734af";
+      hash = "sha256-mxc3ZO9vwJd7GvwOFmiFUYtMaYj8uMje3eQSSgJwdwQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.ai/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9678,12 +9678,12 @@ final: prev: {
 
   mini-align = buildVimPlugin {
     pname = "mini.align";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.align";
-      rev = "6f3c69cd57134ad8fbf1e85dcdc90cb37a8c75c8";
-      hash = "sha256-7VwbEcd+PEgPXMRhFG9zCijMsqhpQWtzA1LAs0kBx9k=";
+      rev = "c701192658ddac4e3b20956a964c2b03157b5e51";
+      hash = "sha256-d1SvjsINdmxJqkXHZEjlTj9GNiq+QytOXSVjYr7jZm4=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.align/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9692,12 +9692,12 @@ final: prev: {
 
   mini-animate = buildVimPlugin {
     pname = "mini.animate";
-    version = "0.17.0-unstable-2026-04-14";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.animate";
-      rev = "72e04cf86ccbcd50efb53c2b87397386195bc3a7";
-      hash = "sha256-VlsDJtRqQCreS4WGVTnTddpl7GPMTkKIhRA/YauaBhQ=";
+      rev = "eee9056eecd12933dfb09b710b7f32c10200e9ea";
+      hash = "sha256-bYAIaRB2KpSwTyWVVvK7Yu+1sLPqQ7wMdfI860bGano=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.animate/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9706,12 +9706,12 @@ final: prev: {
 
   mini-base16 = buildVimPlugin {
     pname = "mini.base16";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.base16";
-      rev = "800f107b27a00978b0dadd672d6da21a5b12fa9a";
-      hash = "sha256-wGKFapSEWc7MUWGboe9lLTuTwgNB5whTNg6ZNGLiPwQ=";
+      rev = "f2b4697eb678c396052f7fd3599c142292ad94c3";
+      hash = "sha256-7wcobm8MLCuj+wmhZiIxAXSfZd5rgHMyFuyzrwAYVdA=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.base16/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9720,12 +9720,12 @@ final: prev: {
 
   mini-basics = buildVimPlugin {
     pname = "mini.basics";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.basics";
-      rev = "30b9d5c026965bbf6cfedc0d30ee66273f6c4084";
-      hash = "sha256-lx+5plFDSB4ot8abgYR3fHlJzTHwDQQpUlC9DRP4V68=";
+      rev = "9ad4ffe62474f5f82c88d3b745f47581c51ba592";
+      hash = "sha256-kU3qtxfx0aFc0PwGXOZAc//xT7iVFfWSVCF/rxTrNtw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.basics/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9734,12 +9734,12 @@ final: prev: {
 
   mini-bracketed = buildVimPlugin {
     pname = "mini.bracketed";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bracketed";
-      rev = "efb969a6a9583a5d48bfbe36363769351e38f967";
-      hash = "sha256-nyD3/+UJXWQ+zhhNUiKKfQgHBZpH8TKkr/T1Mftz7nU=";
+      rev = "d94d51dcee625723aaaf8d38174b48522eaf9131";
+      hash = "sha256-6HD3eYKkRYsS+evLvfptMOczC3ljrf5PurIwx9tZp1U=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bracketed/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9748,12 +9748,12 @@ final: prev: {
 
   mini-bufremove = buildVimPlugin {
     pname = "mini.bufremove";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bufremove";
-      rev = "8603490905fdfa31943cf2ede7ef4475e3dbac9a";
-      hash = "sha256-dNpmKx48LDoXbXcV8deAl7QbUoC42ufKXgW+CKmNKLA=";
+      rev = "4cfbb201b2760da79ca6e1a00e9f67cbc99cbb8f";
+      hash = "sha256-TVae69MHavTTgBCWpIbQk0L3EgLlRQgqXZlotSbG8bk=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bufremove/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9762,12 +9762,12 @@ final: prev: {
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "0.17.0-unstable-2026-04-14";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.clue";
-      rev = "43bd6cf1c3ccdea46d403c32dbc4629fa6afa09d";
-      hash = "sha256-0OJMRCtGG2I3CmohQXcm92bXAi5QGZ1Klp/GQhOvyyk=";
+      rev = "f6978fb031023ee0b0aeb2abdb44abb87577bf38";
+      hash = "sha256-xayesclebU/xcaFSrsfsnQabs54hUWFwrrqZeNq0OiQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.clue/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9776,12 +9776,12 @@ final: prev: {
 
   mini-cmdline = buildVimPlugin {
     pname = "mini.cmdline";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.cmdline";
-      rev = "abae396a175779dcbfe1500231f9bb48cda557c1";
-      hash = "sha256-TjArbkIwP5iPrHEx8x6bGJQEPnNQNXb+Nr9ujSQJ5tM=";
+      rev = "26f5ad15fc28058c111be450ae5aadf800257306";
+      hash = "sha256-P+mYcqUUZD6BwZGQbYI9kV/FAS4+H4ysCdDOvu65UQQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cmdline/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9790,12 +9790,12 @@ final: prev: {
 
   mini-colors = buildVimPlugin {
     pname = "mini.colors";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.colors";
-      rev = "58a827e0996a5c47158284259c4d7b3202d97f62";
-      hash = "sha256-dxw3mIsC4zrFvS156Q18V5Lhim/LpdBb29LLs4OqWL4=";
+      rev = "c40f49f3d41a3207f1b8f854919837c34acdc0c5";
+      hash = "sha256-dcsAoj9r02YuWC0gz1BtjSVguQNxyD85Q4mEp3cDsSk=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.colors/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9804,12 +9804,12 @@ final: prev: {
 
   mini-comment = buildVimPlugin {
     pname = "mini.comment";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.comment";
-      rev = "8e5ff3ed3cc0e8f216617aae01020c00c20f7a87";
-      hash = "sha256-ADlpVkkUSyWY8dQLiGRIIBGqwMuwGhe97wJ/wGqZ/UQ=";
+      rev = "fc87ba6554f182161d9a4bab5017c575571f000f";
+      hash = "sha256-kNELUIgJxiEJHj+evZt0aG4+Nvzdow1NpZOI2M2xTaU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.comment/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9818,12 +9818,12 @@ final: prev: {
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "0.17.0-unstable-2026-04-21";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.completion";
-      rev = "667d94669be66043123cac44e7c5d65a31657732";
-      hash = "sha256-Y2cYv06QUvKWRoF/05+ajJ41z/4D6QZAuxjNCFAtu5E=";
+      rev = "6937ff1d7bf47ab58046c6685cc9057aa481ecb2";
+      hash = "sha256-BGt2olKT81WxH4Rikidfq5MsuNBzoAKDROedPLWb+mw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.completion/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9832,12 +9832,12 @@ final: prev: {
 
   mini-cursorword = buildVimPlugin {
     pname = "mini.cursorword";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.cursorword";
-      rev = "a7e606208197ca5d1c5288750d5163429b4c74da";
-      hash = "sha256-swg5gxbUVY5Zkf6MThUP53aIg2NdSsEgmaFpoHwygSw=";
+      rev = "52eacb10266b8ce07c052e3c80a706d29eb74006";
+      hash = "sha256-pOur/hyoaHR8d+4p1zLiLFSoGfOHkd4l4SVJg7LrDAw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cursorword/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9846,12 +9846,12 @@ final: prev: {
 
   mini-deps = buildVimPlugin {
     pname = "mini.deps";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.deps";
-      rev = "d2c375398ca88d4fdf553e1c4441a865673d09f7";
-      hash = "sha256-V1cDkMnFf81BPwRjRQC/wAmfTQjsxckhAobM6X9jZeg=";
+      rev = "88f8bfa418dedc0c91cc21959cd460813b510327";
+      hash = "sha256-WMEjJtGz3kxQ0EAzyNXe/ecEDaO/TZypRPgnqM0Tc6s=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.deps/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9860,12 +9860,12 @@ final: prev: {
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "0.17.0-unstable-2026-05-01";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.diff";
-      rev = "0ee0459152b141c0e1b0931eb6949105be4850a9";
-      hash = "sha256-tklLHHH7DUFLDYk2gACSzII9IyDlDqUjegfqatC2xEA=";
+      rev = "117c301374ab8546891e2b34f63885ea83527432";
+      hash = "sha256-GKZFkFhHNWAirFFKaHm4JuEao7iZeiJm33lFjjNdK6Q=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.diff/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9874,12 +9874,12 @@ final: prev: {
 
   mini-doc = buildVimPlugin {
     pname = "mini.doc";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.doc";
-      rev = "7688a470921ec04c3dbbbe7d38d1c75e7d0a7bcb";
-      hash = "sha256-bw3nejD8F5149CXLg88LqNUuHf4o46kAifQG6WRyzLc=";
+      rev = "bc3a3ecfd38cbda6752cbe4559aca225085dd90e";
+      hash = "sha256-Qv7mbu/X6UoPG66oMR3TMcyWSAnc1AZUrhCGLd58M6w=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.doc/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9888,12 +9888,12 @@ final: prev: {
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "0.17.0-unstable-2026-04-07";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.extra";
-      rev = "bc4e872500fd6d2ce252604e0ffa100f64f02280";
-      hash = "sha256-+SlfaXZaTjTdPJik2SDTnfb+IFri2rG+DIv59dADi2w=";
+      rev = "cf027da13fd217cfe3af6ef978d0e947c7ee0f7a";
+      hash = "sha256-LSbcIx/1GtTDWhZGKzFPOdiDp2qglcI+1ymn9k2dAio=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.extra/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9902,12 +9902,12 @@ final: prev: {
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "0.17.0-unstable-2026-04-25";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.files";
-      rev = "3e247eb12ca8c05622ceb8745f9004f761b22ef8";
-      hash = "sha256-/8Hnup7ufmjKnXWOC4HmAeRedXLzVJmfWrFikYZLA6s=";
+      rev = "f9f0ccbef0fd24eaddc8675accca83fa1f310c3f";
+      hash = "sha256-CoaEUky+atHwBGGXdR8yNlPKjsR79iHHdMZzSpzIXqc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.files/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9916,12 +9916,12 @@ final: prev: {
 
   mini-fuzzy = buildVimPlugin {
     pname = "mini.fuzzy";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.fuzzy";
-      rev = "4c0a54f83a27e99b67d06e9a74b3483c8ffe264c";
-      hash = "sha256-dnhT17eTP/jSjdFl1TIFRcozt1w+jieE7tTDwvV5BGQ=";
+      rev = "2c0e7809e0c51dccb335d01f02d4f6b2b4d6fcdc";
+      hash = "sha256-AX/Di9KfRryWthGs1kIObxlR9vG9/YAXylWyPGxe+js=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.fuzzy/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9930,12 +9930,12 @@ final: prev: {
 
   mini-git = buildVimPlugin {
     pname = "mini-git";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini-git";
-      rev = "a007cc40a4585c4f54787ddcf07295c2689daeb4";
-      hash = "sha256-1qexFbUk/Tyv5MbaZdmhOU6xFBIHbFaoqtzGNP7SPQ0=";
+      rev = "7c81d173462042cd3a3571643bce03a6c255fd41";
+      hash = "sha256-hII9oQKitOzpycdgP41c4INZUJ1kEtwUtf8SlfFDlZU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini-git/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9944,12 +9944,12 @@ final: prev: {
 
   mini-hipatterns = buildVimPlugin {
     pname = "mini.hipatterns";
-    version = "0.17.0-unstable-2026-04-17";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hipatterns";
-      rev = "9eff319bbe66adfaf781a0d0e174baa08ba94909";
-      hash = "sha256-As3KIoOPhm/KAVOp0Gw1hPIOB7sI47nu2am+4gpPyo4=";
+      rev = "35b632f6c138d720f29de87476361af44bed2198";
+      hash = "sha256-dFvp0lOon65ti+hlq/B2P8LGjyNmYUYuueTA2e7ccZY=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9958,12 +9958,12 @@ final: prev: {
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hues";
-      rev = "943c966c5c165f4401164d72a6a221197fe124a4";
-      hash = "sha256-CQLsJl3EUw71eAzd4Af0dnqfGbgEmmsWJRhwnuB+HJQ=";
+      rev = "9a5e1c16cf9c09211d3cb2c5294e492ccc5dfef5";
+      hash = "sha256-iLuACIkXyLwhfmw87BxPcbFnEKkdwoBCEVUcn5MeSvU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hues/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9972,12 +9972,12 @@ final: prev: {
 
   mini-icons = buildVimPlugin {
     pname = "mini.icons";
-    version = "0.17.0-unstable-2026-04-14";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.icons";
-      rev = "bac6317300e205335df425296570d84322730067";
-      hash = "sha256-/arujhZe9m9VB5nZ0xzCZjkxu4ai9Rfit7y6RwrLf7s=";
+      rev = "9c7b1b90b15bdd69c52f6e31889dbc9987c30ec4";
+      hash = "sha256-DW6CZJXkQJgzH0RpYXHDQ+fGYJKAlodpofVXLTTzoEs=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.icons/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -9986,12 +9986,12 @@ final: prev: {
 
   mini-indentscope = buildVimPlugin {
     pname = "mini.indentscope";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.indentscope";
-      rev = "e0601f75aa5137a5a13bb92a988c9a300f5bd3de";
-      hash = "sha256-kbydWyaslRWTvKJMsuiMgIQi/FroPhBUke4DeRWLmQI=";
+      rev = "ace9b4e503cb095b9a3f6442c909d117c4aa8d0e";
+      hash = "sha256-VS0/P9xstXtG35BQ3B0AfCFD5yTaJixe9igCZNLZfZU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.indentscope/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10000,12 +10000,12 @@ final: prev: {
 
   mini-jump = buildVimPlugin {
     pname = "mini.jump";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump";
-      rev = "9e94f41a3ebcd5f5771d36fdedb18fde9d28da76";
-      hash = "sha256-sJS5JSM7TRRcKaabxKokBsuRKrVoxypvi1adQ9h9Jvc=";
+      rev = "d6ea5afbda111f63d2214536037afd698b95b832";
+      hash = "sha256-D7CGGx5bdRPr71ufh1JtpGgnPmbLZyxN+6oJOmg88KY=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10014,12 +10014,12 @@ final: prev: {
 
   mini-jump2d = buildVimPlugin {
     pname = "mini.jump2d";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump2d";
-      rev = "c0df3170873b712b61951781aeee9942a92ba1f1";
-      hash = "sha256-4ugbxE0U7mlakpHWx3zAvTlk58UCAX4RNhrGeLz4fz8=";
+      rev = "67686a3329f599eb2f2fa369e89f0ccba5435929";
+      hash = "sha256-Q9HMloYGrExf53j42dS5aOFtHh209WmnY+I0kJRtr3c=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump2d/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10028,12 +10028,12 @@ final: prev: {
 
   mini-keymap = buildVimPlugin {
     pname = "mini.keymap";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.keymap";
-      rev = "dc3b688b26a810f519cdd0572a27587a138ced78";
-      hash = "sha256-hL6fsUxmRzie3iZpbMOQ/C/iQzpJiHNB9HfsrgVTF4o=";
+      rev = "14f4cf1058bd3458d4cccd6a4587b6ebb1d43385";
+      hash = "sha256-jDrh4BE5U4+ADmMtZpUiY4azxG/8H7ntz54VW6mLh3g=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.keymap/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10042,12 +10042,12 @@ final: prev: {
 
   mini-map = buildVimPlugin {
     pname = "mini.map";
-    version = "0.17.0-unstable-2026-04-14";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.map";
-      rev = "aa87dcc4b2640a128cf2f2a7400d60a9d8c21d6c";
-      hash = "sha256-aQ7212R5WhrGtlMzOoTeUBVSUEoKATESVrDY1m0henQ=";
+      rev = "fcb6162297028b2d11802b0850fbbb9c5a036aa6";
+      hash = "sha256-quzuuS67n8J2hGFkpxDU6ZZxjEz3KegP1b2FjQ7xL7g=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.map/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10056,12 +10056,12 @@ final: prev: {
 
   mini-misc = buildVimPlugin {
     pname = "mini.misc";
-    version = "0.17.0-unstable-2026-04-09";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.misc";
-      rev = "c72c90e083bcf24bfb2827d63b4752e414023f3e";
-      hash = "sha256-51eLYthhCerqi0RWWhfzGCIDp4VC+i0ZpZV9UYIuSDM=";
+      rev = "37b585358662a90c360060da6c5e61810524542e";
+      hash = "sha256-eAg/5aLDVH/IUJYoNDjd/AaHPZcVVaDjbUF2aH0EOgU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.misc/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10070,12 +10070,12 @@ final: prev: {
 
   mini-move = buildVimPlugin {
     pname = "mini.move";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.move";
-      rev = "74d140143b1bb905c3d0aebcfc2f216fd237080e";
-      hash = "sha256-+OTW77wcX1I2Ua5W6O7tX/4J22RLTxZ2YviV1Atr7OI=";
+      rev = "a776027e68fe763987a0132d59877d651a7c0130";
+      hash = "sha256-f+MHsSCR9Y2gVV7X/o+HIVzbwZZVG7eL7Q9XILbqAsc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.move/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10084,12 +10084,12 @@ final: prev: {
 
   mini-notify = buildVimPlugin {
     pname = "mini.notify";
-    version = "0.17.0-unstable-2026-04-14";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.notify";
-      rev = "9e68ab0a54f90567b4fec2de22c851dba8480439";
-      hash = "sha256-j9sUgw7yaGFBgdpRxLZOhXMUp7YlleMDpo97lHjKpYQ=";
+      rev = "ef35a3ec68399398f097d0c1736c343a45cb7406";
+      hash = "sha256-rqi7dDE9GWCZEz2/jf9PDMNbkspnjdZAks+6KH58azM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.notify/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10098,12 +10098,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "0.17.0-unstable-2026-05-01";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "0f339bf5c93f392dc5d2417d47d7b9edc5f96fe8";
-      hash = "sha256-EEh/r+u+fzVLIF8cosgrovNNDvpzGa3OQXb5w2Uqv4E=";
+      rev = "17c448b0f3f29c0857a3436fc64e1d7cb9267ec3";
+      hash = "sha256-AjAgXk818MQFGHJd1cCflt6Skpi1W9JSfM0cygcgp1Y=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10112,12 +10112,12 @@ final: prev: {
 
   mini-operators = buildVimPlugin {
     pname = "mini.operators";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.operators";
-      rev = "fccb5e3ef0cc319b217ed9c7db1a4672dd6b766c";
-      hash = "sha256-qMdxVUKjVX1+gPvf4VI1+qgykOZejzsVsXGR4PFu8J0=";
+      rev = "76e7c5b672147956fa188bf8649ce0b1c8ea4a48";
+      hash = "sha256-kfSxabV61gF4KumxMxdocUwaaktlThiGbABx7mQb8WM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.operators/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10126,12 +10126,12 @@ final: prev: {
 
   mini-pairs = buildVimPlugin {
     pname = "mini.pairs";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pairs";
-      rev = "42387c7fe68fc0b6e95eaf37f1bb76e7bffaa0d9";
-      hash = "sha256-ewUVK+bPzzB8NySrm7iTyNJ4se71YBediFWpUFJCNfs=";
+      rev = "30cf2f01c4aaa2033db67376b9924fa2442c05d6";
+      hash = "sha256-rLl7zM97oyi/M4jsq/Zvl9u7Z3enLvNzByyhT4xaCg8=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pairs/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10140,12 +10140,12 @@ final: prev: {
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "0.17.0-unstable-2026-04-09";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pick";
-      rev = "437d44eb57312f23e6b931704694fc294922cd88";
-      hash = "sha256-aRxyI1k0+d4xMhSL9w2rofY4jinJwmfZ2WalQ6wNHiQ=";
+      rev = "975e398570dd15696575c5374f94e78fd29a7a69";
+      hash = "sha256-3aCzRoPdvo+IFx0PQxCVQv2j3oU/JoiBVCei70bXtUk=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pick/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10154,12 +10154,12 @@ final: prev: {
 
   mini-sessions = buildVimPlugin {
     pname = "mini.sessions";
-    version = "0.17.0-unstable-2026-04-16";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.sessions";
-      rev = "c96a1d1284b37ba2431092981a9d58f8c71a4fc3";
-      hash = "sha256-y/aHihPEBQazmeQVj/5kAlbeapBACERk2jUnBQNS3SM=";
+      rev = "e59286b20fbf61171039ddfebc736cf9562e75d5";
+      hash = "sha256-rULcDHhAcZDQzX6KJ+PoZncNqGnU1t4iSBpUiGBHZ+g=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.sessions/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10168,12 +10168,12 @@ final: prev: {
 
   mini-snippets = buildVimPlugin {
     pname = "mini.snippets";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.snippets";
-      rev = "8e3acd41bd7ee8f89967c83bacc93871b98a14aa";
-      hash = "sha256-4putVLcfKrbOqpD9L/fLpKGES0ZCOmGXt3mxRfptYx8=";
+      rev = "5330cc759cc7f67ad6cc885ad509e3d989a5904e";
+      hash = "sha256-q3YL/uUSzgDHQQHMMHWhLj8kcz6DsMfWYPal+RrAYa4=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.snippets/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10182,12 +10182,12 @@ final: prev: {
 
   mini-splitjoin = buildVimPlugin {
     pname = "mini.splitjoin";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.splitjoin";
-      rev = "8bd5a3d581b9f3dd3bc91fe495e210b8b0ee981d";
-      hash = "sha256-wgXJc58gco5mNYJpjmOZEirYo7xFSY0k8pCKAbmQbOQ=";
+      rev = "146aef247d9bfc58bab20dd921ba6b75ac4b8cf9";
+      hash = "sha256-lW9RY8ky7WBL8H5joXiOubOhJjiMGrmRmR/4e59s2g4=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.splitjoin/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10196,12 +10196,12 @@ final: prev: {
 
   mini-starter = buildVimPlugin {
     pname = "mini.starter";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.starter";
-      rev = "7bdc9decc8b623f245c1e42a64bc41e61d574c5e";
-      hash = "sha256-9blx4VllXj9jNMd5LjXZoebtjgFDnrycTJu/S/ezpp4=";
+      rev = "35b018a035794e341ac01cb2091bbd71b3f823d0";
+      hash = "sha256-ZvWrNiYUTBp2KWkMns1Jpr44RanTO9jd857xfI3KOpQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.starter/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10210,12 +10210,12 @@ final: prev: {
 
   mini-statusline = buildVimPlugin {
     pname = "mini.statusline";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.statusline";
-      rev = "b456bfe845e475e9cec065b7a9a1ef657ad2f41b";
-      hash = "sha256-RHMbkng5tQclXQ6qzpjgeV8NMUL4TkF1wMzrR+UdExU=";
+      rev = "e9e5c147385e5e0310ab79162dd08d0465e96d83";
+      hash = "sha256-k9qyBfaI9Dc2dcjOuWAvh7w9RUxxg9zXnYUJp5llZkI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.statusline/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10224,12 +10224,12 @@ final: prev: {
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.surround";
-      rev = "2715e04bea3ec9244f15b421dc5b18c0fe326210";
-      hash = "sha256-H+VXj4N/7dTTcLx2uzu7TD7IJeQbR9TcgoEmS/fHloI=";
+      rev = "990ce30f724d08e79670107de6b915a3f1bb9a9b";
+      hash = "sha256-gF4ZMo5cW7VYBa2XFFVxhrRzV097ix0evsC1+3jkP7k=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.surround/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10238,12 +10238,12 @@ final: prev: {
 
   mini-tabline = buildVimPlugin {
     pname = "mini.tabline";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.tabline";
-      rev = "169af955ad2ed0ffcc3d2c83e850bcc7eaac2f0e";
-      hash = "sha256-Oqq4Q/+ykxY8d7Cxz3tlM7pmq1a3jJD8/v6ZGWJaEoQ=";
+      rev = "5c32522e128ba02e78d091ab2d5c6972f673c440";
+      hash = "sha256-bosGFg0zMTXjBQvUzrjw5INQnD/Mz4X4FJKwU9VzRj8=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.tabline/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10252,12 +10252,12 @@ final: prev: {
 
   mini-trailspace = buildVimPlugin {
     pname = "mini.trailspace";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.trailspace";
-      rev = "b362246495d18c29b4545a8f1c47f627f8011b7c";
-      hash = "sha256-5c8X1+zxYBJtoQ3rvZ2hyELVce1ojBN/talNaPRrYxc=";
+      rev = "ae2fd422564c6e781caf6545355ca6051e20fa26";
+      hash = "sha256-Bmq8hrAFTPLPZnlhPTwYq1osYmE0wcRuSw35qWrINe0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.trailspace/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10266,12 +10266,12 @@ final: prev: {
 
   mini-visits = buildVimPlugin {
     pname = "mini.visits";
-    version = "0.17.0-unstable-2026-04-03";
+    version = "0.17.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.visits";
-      rev = "dc91169809deec9612b684f22f617619f5b3279b";
-      hash = "sha256-p2samqxhCQdp2imNejVjk1XoWDDFHsZOwQUTsYYS6WI=";
+      rev = "0e4b914220e816ffa926398817fb54b58c6a12eb";
+      hash = "sha256-/udHGi4g3b0ZKqaQHWal/jjoE43QdghH4YszMy2cduM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.visits/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10336,12 +10336,12 @@ final: prev: {
 
   mkdx = buildVimPlugin {
     pname = "mkdx";
-    version = "1.10.0-unstable-2023-10-16";
+    version = "1.10.0-unstable-2026-05-10";
     src = fetchFromGitHub {
       owner = "SidOfc";
       repo = "mkdx";
-      rev = "ee667cad506954b706c3fa972fbaaad46b1bf028";
-      hash = "sha256-Mpze6Quz5KNQF+/59JYQCZVJgRGFzTOvC1U+6g9kh/o=";
+      rev = "1448d3ae95b20349b2fc47c446530bbe65d50bec";
+      hash = "sha256-6uR3yIRxfHoQYHhhmfOy0V1VeUz3eGe9aHx3CkSRQXQ=";
     };
     meta.homepage = "https://github.com/SidOfc/mkdx/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10434,12 +10434,12 @@ final: prev: {
 
   monokai-pro-nvim = buildVimPlugin {
     pname = "monokai-pro.nvim";
-    version = "2.1.1";
+    version = "2.1.4";
     src = fetchFromGitHub {
       owner = "loctvl842";
       repo = "monokai-pro.nvim";
-      tag = "v2.1.1";
-      hash = "sha256-G8qGIUD2NivfJw016bKk67VEJzOitUZIk8o8k2WTt5w=";
+      tag = "v2.1.4";
+      hash = "sha256-JAf9fh67kNOpjCk3hKW5+JuA3FVoFGyqlKZSFJJB6FY=";
     };
     meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -10854,12 +10854,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-05-02";
+    version = "1.4.0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "e87f70ccf9472ba20f6196a1a6ee16c41b5f9f71";
-      hash = "sha256-eogkDPUksTC/Mf8bMtBHmitu45W+ZeKuHXG95Mf1FtE=";
+      rev = "978a10c6e26d2a566a2e491d6a2a298568af8b74";
+      hash = "sha256-lIy0WwPprPyZKHYiX6ZhXJTtQ8cJBQIpVMm8Nr9GSeM=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -10938,12 +10938,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "3.0.0-unstable-2026-04-29";
+    version = "3.0.0-unstable-2026-05-07";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "88000e7e60177558d1b428a0d561c92e5d81341e";
-      hash = "sha256-g8L1o0qf8COCuvA6tD2zGwhNm1dyxdzHD5fg7THnOe0=";
+      rev = "395ac481e197784e410b59b987fadaf9e7481df1";
+      hash = "sha256-sioCf8OgFMnB64oWjROoVyive6Quj2OaSJLeGrd48vg=";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -11669,12 +11669,12 @@ final: prev: {
 
   netrw-nvim = buildVimPlugin {
     pname = "netrw.nvim";
-    version = "0-unstable-2024-07-23";
+    version = "0-unstable-2026-05-05";
     src = fetchFromGitHub {
       owner = "prichrd";
       repo = "netrw.nvim";
-      rev = "90501c62b9b816ed3ed1e912ae9db9af5671a1b2";
-      hash = "sha256-tEO+omzlaC0uFkIHebeqnGtiPbDelRTBJONEnTy0F9U=";
+      rev = "3f643df59951d9adc4cf348cefe435fcdb5a3671";
+      hash = "sha256-Sc02VHx9U8lW5YWG7GkvmYwvZL9WBlsnYdmSPZnulVk=";
     };
     meta.homepage = "https://github.com/prichrd/netrw.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -11836,12 +11836,12 @@ final: prev: {
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "0-unstable-2026-05-01";
+    version = "0-unstable-2026-05-08";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "b95d69d5b58ce3abd98b8e71b7d7499c6687b5bf";
-      hash = "sha256-sD7T81WrwLQhAxJMrqIeWF5I4JLzxKzY05oVmTOyZe8=";
+      rev = "1ae83a5be572fd5e8c1547b5c4c582ce1a14c017";
+      hash = "sha256-R2Kl6s7JRoOa2C6/FFcfqOdTtHG3OhOhRuduLOfCBPY=";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -11920,12 +11920,12 @@ final: prev: {
 
   none-ls-nvim = buildVimPlugin {
     pname = "none-ls.nvim";
-    version = "0-unstable-2026-04-29";
+    version = "0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "none-ls.nvim";
-      rev = "241ff8214b4ec051eb51e74a61ff729c0271b429";
-      hash = "sha256-tplnARSDuc9dkaai6/rm2kS+5jTWmVQXWvJ+Ij9HmQs=";
+      rev = "f9d557ac7cd28a3a993b5ea49716498bd540b01f";
+      hash = "sha256-gMncplPHwy6MgQQRU/Niqh4YR3vfas34Ehz6p1PUOBQ=";
     };
     meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
     meta.license = getLicenseFromSpdxId "Unlicense";
@@ -12046,12 +12046,12 @@ final: prev: {
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "0-unstable-2026-01-24";
+    version = "0-unstable-2026-05-10";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "cb75908a86720172594b30de147272c1b3a7f452";
-      hash = "sha256-zy1fzwGKAZNDaceoPEyXUgVd7WAT3VnHTCytBh9+m98=";
+      rev = "3e67e9d5325fd47fdbc90ca00a147db2f3525754";
+      hash = "sha256-bl2erzyZCZp9seb4E7o/SFsBUHwocVOmQNv0mbO5yR0=";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -12116,12 +12116,12 @@ final: prev: {
 
   nvim-autopairs = buildVimPlugin {
     pname = "nvim-autopairs";
-    version = "0.10.0-unstable-2026-01-30";
+    version = "0.10.0-unstable-2026-05-08";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-autopairs";
-      rev = "59bce2eef357189c3305e25bc6dd2d138c1683f5";
-      hash = "sha256-0IqXpxKCzqVz6i9QajPYJ0FdfReHQBhehrvN89/8n6U=";
+      rev = "7b9923abad60b903ece7c52940e1321d39eccc79";
+      hash = "sha256-klOJgBPw8oGDnF9wKIpGDzuBY+tH1acRyvZSPR4wrjw=";
     };
     meta.homepage = "https://github.com/windwp/nvim-autopairs/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12492,12 +12492,12 @@ final: prev: {
 
   nvim-docs-view = buildVimPlugin {
     pname = "nvim-docs-view";
-    version = "0-unstable-2025-08-12";
+    version = "0-unstable-2026-05-08";
     src = fetchFromGitHub {
       owner = "amrbashir";
       repo = "nvim-docs-view";
-      rev = "a5256fd30417f58804691df174bc76a8c8f8163a";
-      hash = "sha256-YIf7JxM3lVe1HiEEfxlj8gIM7nIL4yef38HC/wUITAY=";
+      rev = "9a262fa7e181e924d355e8725c68c48f076138b1";
+      hash = "sha256-zsrrsTIpjRqDS/NXQH7TA6CjZj3PK8kstD9EB4omSGw=";
     };
     meta.homepage = "https://github.com/amrbashir/nvim-docs-view/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12562,12 +12562,12 @@ final: prev: {
 
   nvim-gdb = buildVimPlugin {
     pname = "nvim-gdb";
-    version = "0-unstable-2025-12-31";
+    version = "0-unstable-2026-05-08";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "b644f07c54608cc913c1d9e14954f15dcb7331a9";
-      hash = "sha256-4l7C1uv84CCbw5uEyVBGs8XEvMnW5+M9zGar8lWRVwM=";
+      rev = "3ea9e52a7be60373a127be9dcc94773bc1d6e25c";
+      hash = "sha256-y8dxr4xAOX7+PKCd2h3iMlmWZtmBr9Wp6ecjAYFtunc=";
     };
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -12604,15 +12604,15 @@ final: prev: {
 
   nvim-highlight-colors = buildVimPlugin {
     pname = "nvim-highlight-colors";
-    version = "0-unstable-2026-01-26";
+    version = "0-unstable-2026-05-05";
     src = fetchFromGitHub {
       owner = "brenoprata10";
       repo = "nvim-highlight-colors";
-      rev = "e2cb22089cc2358b2b995c09578224f142de6039";
-      hash = "sha256-LrY61knLKAn36+RnMddAzxf/wYtdnLxnnQhtHB3mQwc=";
+      rev = "e4c7af0211866162d999ce0bdd6a029302e19139";
+      hash = "sha256-4tkehMJpMs/CrQrCFqy+4G9uQei9mAoQlwvxuYtu7z8=";
     };
     meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
-    meta.license = unfree;
+    meta.license = getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12937,12 +12937,12 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2.8.0";
+    version = "2.9.0";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      tag = "v2.8.0";
-      hash = "sha256-boQBpuqeGLQV0Vnx+9zecxPEHRVnJMAWVmSld6msS7E=";
+      tag = "v2.9.0";
+      hash = "sha256-FuajmzcxEFxl4ZDJIJk23x2k0cqq/YRhRzzGvdVwN9M=";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -13539,12 +13539,12 @@ final: prev: {
 
   nvim-treesitter-context = buildVimPlugin {
     pname = "nvim-treesitter-context";
-    version = "1.0.0-unstable-2026-04-02";
+    version = "1.0.0-unstable-2026-05-06";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "b0c45cefe2c8f7b55fc46f34e563bc428ef99636";
-      hash = "sha256-K4o+iJY8+D0PRvRvXuBqX2q3fwxizAPp/FFpm0O0I9E=";
+      rev = "b311b30818951d01f7b4bf650521b868b3fece16";
+      hash = "sha256-2FkJvQMN0ktaNiyVLjcUUBvQNW9VHY6X4FscI1U3QhY=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -13931,12 +13931,12 @@ final: prev: {
 
   obsidian-nvim = buildVimPlugin {
     pname = "obsidian.nvim";
-    version = "3.16.2-unstable-2026-04-22";
+    version = "3.16.3";
     src = fetchFromGitHub {
       owner = "obsidian-nvim";
       repo = "obsidian.nvim";
-      rev = "af9857e4993e0adddb897f09c2805b44a0d913ea";
-      hash = "sha256-zajt8vt/bLMCqgSgjMj/MiUFTU3TNAnr25YM+J+qg2M=";
+      tag = "v3.16.3";
+      hash = "sha256-tJ5pGZ8LK4qDOg+amllidyGHZM20SN458tBJxkzB5K0=";
     };
     meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -13987,12 +13987,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "0-unstable-2026-04-24";
+    version = "0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "34e67cc2d247e9b9271e2b54baeb6d4f6d1035bb";
-      hash = "sha256-rwOQs1l7j+GvbaJ1Vj42HE+lWcZrFKfTqDcvuACCDgE=";
+      rev = "21637048c22f47809d896dace7b2b72b6c724692";
+      hash = "sha256-kjm3jVmJwiC3RyvdtXW+kUO7zy48BrohfC+BzjsjTQE=";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14043,12 +14043,12 @@ final: prev: {
 
   oklch-color-picker-nvim = buildVimPlugin {
     pname = "oklch-color-picker.nvim";
-    version = "4.1.1";
+    version = "4.1.2";
     src = fetchFromGitHub {
       owner = "eero-lehtinen";
       repo = "oklch-color-picker.nvim";
-      tag = "v4.1.1";
-      hash = "sha256-zAPPMQyG8ys4ezoMDZYZzbiHc20TZrFjAiIwsIiIQN0=";
+      tag = "v4.1.2";
+      hash = "sha256-KEmKDWKQC87rAghhOxbJN4umZvBSx0Um0ur3GdMZFhU=";
     };
     meta.homepage = "https://github.com/eero-lehtinen/oklch-color-picker.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14239,12 +14239,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "0.8.1";
+    version = "0.8.2";
     src = fetchFromGitHub {
       owner = "nickjvandyke";
       repo = "opencode.nvim";
-      tag = "v0.8.1";
-      hash = "sha256-Td1tmniHQfzvMCiKY1VbRqv6YDIPMkgFS27duLoQgP8=";
+      tag = "v0.8.2";
+      hash = "sha256-V67sPj/ybMZ89pt5Trng+4OWYk6aqsWJDxmH/puWB78=";
     };
     meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14674,12 +14674,12 @@ final: prev: {
 
   pi-nvim = buildVimPlugin {
     pname = "pi.nvim";
-    version = "0-unstable-2026-04-29";
+    version = "0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "pablopunk";
       repo = "pi.nvim";
-      rev = "6e86a704ed6ff488fda78b64f4e564d6ee620785";
-      hash = "sha256-o5S7x1VWWQ2BnhthbVMndC2w4fnjc1h41gP/HUv4TV4=";
+      rev = "1922e69569fe8ca8219d7934201f00cd38a30565";
+      hash = "sha256-bS+x0jbzhj3FghGSuwfvn34ty3U8RpN1x3AwQdadS1o=";
     };
     meta.homepage = "https://github.com/pablopunk/pi.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14815,12 +14815,12 @@ final: prev: {
 
   precognition-nvim = buildVimPlugin {
     pname = "precognition.nvim";
-    version = "1.2.0";
+    version = "1.3.0";
     src = fetchFromGitHub {
       owner = "tris203";
       repo = "precognition.nvim";
-      tag = "v1.2.0";
-      hash = "sha256-AcBZ3by3ONZBDuY2jpfDZSutwotlh+YHA7SgCJEmrzo=";
+      tag = "v1.3.0";
+      hash = "sha256-EIc/Z7ifZk7L+X6/VrqckyZnvhOSdtVcQG8uJzAycXg=";
     };
     meta.homepage = "https://github.com/tris203/precognition.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -14899,12 +14899,12 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "3.3.1-1";
+    version = "3.5.0-1";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      tag = "v3.3.1-1";
-      hash = "sha256-AT1Yfw6QyL+GKNicItK1oD1mQyCqH8CyyIm9LQtG0Ic=";
+      tag = "v3.5.0-1";
+      hash = "sha256-lmnduaG6jmsLPQYyhAG/MnRwVfSJ3VOjNtas0d+ry4w=";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -15277,12 +15277,12 @@ final: prev: {
 
   refactoring-nvim = buildVimPlugin {
     pname = "refactoring.nvim";
-    version = "0-unstable-2026-04-30";
+    version = "0-unstable-2026-05-06";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "f75049d4564d96f66dc3cd79207d0ad6ea42c668";
-      hash = "sha256-Y0nVzrJTbtT5Su2LUVaYtFrxiIAW4tj+9HLDH9R0LQ4=";
+      rev = "29bada48407a9e00d670207d00bbdc0c46c5dc58";
+      hash = "sha256-d/browY8XA8JXDSVI0MVyCVrQc8ENaGDHEFjj6UYDho=";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15361,12 +15361,12 @@ final: prev: {
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "8.12.0-unstable-2026-04-26";
+    version = "8.12.0-unstable-2026-05-07";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "3f3eea97b80839f629c951ca660ffd125bfa5b34";
-      hash = "sha256-dh4gBQVRTa1DgOvKN8NFMQ9e1E8rbrkTvlJH9nN9S6Y=";
+      rev = "629eb9533ec989d9d5c6cab8f3ad5372422c24e0";
+      hash = "sha256-IBqQmerjJz9g0QR/Elym7WsNuk1scLaeI9isvjcCFqw=";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -15950,12 +15950,12 @@ final: prev: {
 
   slimv = buildVimPlugin {
     pname = "slimv";
-    version = "0.9.13-unstable-2025-10-11";
+    version = "0.9.13-unstable-2026-05-09";
     src = fetchFromGitHub {
       owner = "kovisoft";
       repo = "slimv";
-      rev = "dfa79147c1be5694475f1240d57c7052b72b53a4";
-      hash = "sha256-l5T09tuB/LJWWvBo+gywyd7qVmFomDcoxrJHOd3WSEM=";
+      rev = "3ae4748296b2a0d852e396add5d88c91e2207f81";
+      hash = "sha256-//rcErhVL4tjuU+9X3SeQ2XILvqfc3pX+0t5QOCJlb8=";
     };
     meta.homepage = "https://github.com/kovisoft/slimv/";
     meta.license = unfree;
@@ -15978,12 +15978,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2.1.0-unstable-2026-05-01";
+    version = "2.1.0-unstable-2026-05-08";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "80be31a3d2e37d32bd37794da72a4f69fce7a85f";
-      hash = "sha256-k9xmK4nf8I+zpo3XONdPnprp2mGXzrbqrZHchhlUKDs=";
+      rev = "9053ebd394c38fe55fd2f4710daec27411c34fb9";
+      hash = "sha256-u8tmjUEo8XK4DxGAxM9GSACqs+/hJ+ZjIeRTUNcN05o=";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -16118,12 +16118,12 @@ final: prev: {
 
   solarized-osaka-nvim = buildVimPlugin {
     pname = "solarized-osaka.nvim";
-    version = "0-unstable-2026-04-21";
+    version = "0-unstable-2026-05-08";
     src = fetchFromGitHub {
       owner = "craftzdog";
       repo = "solarized-osaka.nvim";
-      rev = "a261ee90fb3e5e82660567e4874d384e996afa4f";
-      hash = "sha256-b8gZM9/HFi4q+mWpEijO8fCBuu1eslGSNPgZOyjXMmc=";
+      rev = "f675d9a5c58f3b0d6158d665a623f81a62e7bdaf";
+      hash = "sha256-haf2hbhE54NAeouBWXFdZPTHSV9IU78BfUL7W4kw0Q8=";
     };
     meta.homepage = "https://github.com/craftzdog/solarized-osaka.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -16356,12 +16356,12 @@ final: prev: {
 
   srcery-vim = buildVimPlugin {
     pname = "srcery-vim";
-    version = "2.1.0-unstable-2026-04-18";
+    version = "3.0.0";
     src = fetchFromGitHub {
       owner = "srcery-colors";
       repo = "srcery-vim";
-      rev = "ca521d76f968713dabfe29b7f13d57fc257da43e";
-      hash = "sha256-3Flf84WAZkzvWNPXKfB/Fruk0EWQrf8JrZGBo4Fqbig=";
+      tag = "v3.0.0";
+      hash = "sha256-hkv+Bf/k65elRPdtkJh0JdBGPNAlKET3FCp0a9l3N7Q=";
     };
     meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
     meta.license = unfree;
@@ -16468,12 +16468,12 @@ final: prev: {
 
   startup-nvim = buildVimPlugin {
     pname = "startup.nvim";
-    version = "0.1-beta-unstable-2024-10-30";
+    version = "0.1-beta-unstable-2026-05-10";
     src = fetchFromGitHub {
       owner = "max397574";
       repo = "startup.nvim";
-      rev = "9ca3b9a55f2f2196ef90b39a52029b46fdde5226";
-      hash = "sha256-AXJv5l5Y5ihvV4byNJHDLsomvNVLnyYoJgK6XFm3oT4=";
+      rev = "cd5fe95f61fdf6ef7db3732be79126032ab1dd3e";
+      hash = "sha256-vwLvzQiQctkFitOPcg/bjKKGInU5AIfrpjI/e26ZBSA=";
     };
     meta.homepage = "https://github.com/max397574/startup.nvim/";
     meta.license = getLicenseFromSpdxId "GPL-2.0-only";
@@ -17087,12 +17087,12 @@ final: prev: {
 
   telescope-frecency-nvim = buildVimPlugin {
     pname = "telescope-frecency.nvim";
-    version = "1.2.2-unstable-2025-11-08";
+    version = "1.2.2-unstable-2026-05-10";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-frecency.nvim";
-      rev = "fc6418bf663a182b72427487246b870f2ddbbbe2";
-      hash = "sha256-iTSDtPxjNWPl5kMw1KSkbKtx2fIJJSs7P/NJkkkgd8g=";
+      rev = "ab7b69366f46a8749e3c3ec21ba0cbc59a440ddd";
+      hash = "sha256-FVo2odnwxImjSd+mYciHznwrRwY8W80mn4lJtQKAEZE=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -17101,12 +17101,12 @@ final: prev: {
 
   telescope-fzf-native-nvim = buildVimPlugin {
     pname = "telescope-fzf-native.nvim";
-    version = "0-unstable-2025-11-07";
+    version = "0-unstable-2026-05-06";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-fzf-native.nvim";
-      rev = "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c";
-      hash = "sha256-ChEM4jJonAE4qXd/dgTu2mdlpNBj5rEdpA8TgR38oRM=";
+      rev = "b25b749b9db64d375d782094e2b9dce53ad53a40";
+      hash = "sha256-FMzAAkS/TgdINK/YuadHXikFcTYtgYeXcEL0jDvWKzk=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -17677,12 +17677,12 @@ final: prev: {
 
   tinted-nvim = buildVimPlugin {
     pname = "tinted-nvim";
-    version = "1.0.0-unstable-2026-05-03";
+    version = "1.0.0-unstable-2026-05-04";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-nvim";
-      rev = "22edae966ea05d0e17960bca2b5486a734755deb";
-      hash = "sha256-ybHUc906wupVaDSwsWIytYff1k8GxPavJhLyyAzjqLk=";
+      rev = "c0fca5c6123e2f6fb4db9a433cd01f2ce8085a57";
+      hash = "sha256-Ofo4OoukZJmv3G/OxFIFYNQdvNvmOiH1SVb2PQ0FrqQ=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -17691,12 +17691,12 @@ final: prev: {
 
   tinted-vim = buildVimPlugin {
     pname = "tinted-vim";
-    version = "01-unstable-2026-05-03";
+    version = "01-unstable-2026-05-04";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-vim";
-      rev = "8ea8d0db8b1a64e3353f899627ffa5d094564f76";
-      hash = "sha256-5enGpXxkHb2HcQxMKeTsGBMqOHnaik1i7eEAg6A9YBk=";
+      rev = "c086276f0227f41d17b68b1fe2e378b3b113401d";
+      hash = "sha256-qfG5xFnAZd3o1kGL8xQPAkqHHvx+twJMkwCrL2Wdkrg=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-vim/";
     meta.license = unfree;
@@ -17959,12 +17959,12 @@ final: prev: {
 
   treesitter-modules-nvim = buildVimPlugin {
     pname = "treesitter-modules.nvim";
-    version = "0-unstable-2026-04-05";
+    version = "0-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "treesitter-modules.nvim";
-      rev = "dbded29dade0ff4435642530ec2b5a81730f8e1a";
-      hash = "sha256-y6X7TvWgPqP6S0DTkx53eMhS0veUQwKGVcr8y+FPgSY=";
+      rev = "290eec96bfc43ed28264661dd30e894a60c4b99c";
+      hash = "sha256-3pSVcSJDNIEt6JwCBmgzGDFk1DdPuhN5XQNi59L+YmQ=";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/treesitter-modules.nvim/";
     meta.license = getLicenseFromSpdxId "Apache-2.0";
@@ -17987,12 +17987,12 @@ final: prev: {
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "0-unstable-2026-04-29";
+    version = "0-unstable-2026-05-08";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "ba74c5ec8bd128297170476d56389125ecb23799";
-      hash = "sha256-bbvJ1Ym1bf4SKdn9KjXo3NXwQ9u+ksT8nZkC63iYR2s=";
+      rev = "fcaa112f8c3dfba3a91c52a5a95701a7917f61e3";
+      hash = "sha256-5s3P1xekniVgtEfAwuxbOwGsSi90UuutctVLgXC/C0g=";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -18325,12 +18325,12 @@ final: prev: {
 
   ultisnips = buildVimPlugin {
     pname = "ultisnips";
-    version = "3.2-unstable-2026-04-25";
+    version = "4.0";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
-      rev = "0223456b89f7f797c5424ddef07cfc28b5cd86a5";
-      hash = "sha256-m33oxuCVimpC0GQ0unsqm7Hy7UcTE6a2ONu6h80gqEI=";
+      tag = "4.0";
+      hash = "sha256-NeHaNtNU6/j9gufl/LKwIs7dvP0ld2SGxT2qPQYc7Cg=";
     };
     meta.homepage = "https://github.com/SirVer/ultisnips/";
     meta.license = getLicenseFromSpdxId "GPL-3.0-only";
@@ -18591,12 +18591,12 @@ final: prev: {
 
   vifm-vim = buildVimPlugin {
     pname = "vifm.vim";
-    version = "0.14-unstable-2026-04-11";
+    version = "0.14-unstable-2026-05-09";
     src = fetchFromGitHub {
       owner = "vifm";
       repo = "vifm.vim";
-      rev = "72b77e55eaddd3cabaa2b9018c8c83a268398666";
-      hash = "sha256-i3FhzaSTWSUMtvqhDHfGKqdHo/u9u2fGHwvmKq5P470=";
+      rev = "3742c5f90635650de12859aa880c7a763766cf85";
+      hash = "sha256-sWHf3OpdFvT1EerLKXFT5IZPeLzZSjczkZ/OohXjQhg=";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
     meta.license = unfree;
@@ -18815,12 +18815,12 @@ final: prev: {
 
   vim-addon-manager = buildVimPlugin {
     pname = "vim-addon-manager";
-    version = "0-unstable-2024-08-29";
+    version = "0-unstable-2026-05-09";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-manager";
-      rev = "585197500a4920c031467196e41335ca997aca6d";
-      hash = "sha256-rwr4LLEN3BZd83xXaIDnqEu2KTQ5P24bVgjWCDFQtLw=";
+      rev = "514ac63c8d8dfc15e2e8ea399650fa46a84c3c38";
+      hash = "sha256-qMb81wgK/AqaENXGznFZM2YCEqFo7sMQ1UwhHUdI058=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/";
     meta.license = unfree;
@@ -20453,12 +20453,12 @@ final: prev: {
 
   vim-fern = buildVimPlugin {
     pname = "vim-fern";
-    version = "1.58.0-unstable-2026-03-20";
+    version = "1.58.0-unstable-2026-05-04";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-fern";
-      rev = "a96f8c6c52746346fe568e3711792c1e9268cf91";
-      hash = "sha256-2XkM4Niq8FLxr/gNOBWaleggtgeb+SVIQZeLDtintR4=";
+      rev = "b4520a50d8df51969838d35eb07f797e2785b234";
+      hash = "sha256-p8FFz5pOl3XZe56UNPvcqcIBvTFAfV08EwHiCQ+tTVY=";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-fern/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -20565,12 +20565,12 @@ final: prev: {
 
   vim-floaterm = buildVimPlugin {
     pname = "vim-floaterm";
-    version = "0-unstable-2026-02-10";
+    version = "0-unstable-2026-05-07";
     src = fetchFromGitHub {
       owner = "voldikss";
       repo = "vim-floaterm";
-      rev = "0ab5eb8135dc884bc543a819ac7033c15e72a76b";
-      hash = "sha256-A4SpMFB1thUhF4N5I7N+HnycE/OXQQbJVMr4wo0gKUc=";
+      rev = "bb4ba7952e906408e1f83b215f55ffe57efcade6";
+      hash = "sha256-JEd8XR1LsY7Xb32dx+TSa961sxSfF+OHewBxiCSFRYs=";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -21659,12 +21659,12 @@ final: prev: {
 
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "0-unstable-2025-12-10";
+    version = "0-unstable-2026-05-10";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "11b0f3177e2854cafa0c4baef5329e7d0f0dccbd";
-      hash = "sha256-nCW8+x64GiJkbKshi3RhfRQoceTV5QPXs0mculC8xhM=";
+      rev = "6034ccf6a4682c91f90f38fae4c882068e6723fe";
+      hash = "sha256-3ytgSsTvtmq9jC2qyeBzKLK+x0UppyVODggcspDX7ZE=";
     };
     meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -23451,12 +23451,12 @@ final: prev: {
 
   vim-sexp = buildVimPlugin {
     pname = "vim-sexp";
-    version = "0-unstable-2026-05-02";
+    version = "0-unstable-2026-05-10";
     src = fetchFromGitHub {
       owner = "guns";
       repo = "vim-sexp";
-      rev = "c6e7180781c5603f5ea0e2305adb0c117e4f8284";
-      hash = "sha256-tjiTW3l7KfBzUR3Zg/tq6I3JNWaZVhdmywZaq2lrMrU=";
+      rev = "0284743c84bebaf04b4862743f692718a3774d30";
+      hash = "sha256-h2xeox9wJoHpYQtbegCPYxqfLDdA8Qo7g27NoLf4IEY=";
     };
     meta.homepage = "https://github.com/guns/vim-sexp/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -24093,12 +24093,12 @@ final: prev: {
 
   vim-test = buildVimPlugin {
     pname = "vim-test";
-    version = "3.1.0";
+    version = "3.3.0";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      tag = "v3.1.0";
-      hash = "sha256-vPACu8GlWxFITasOyWE9E87qqXLxG5WMn8h2XKNGD0I=";
+      tag = "v3.3.0";
+      hash = "sha256-hJhHgblykGXvE9xuM2qbZhm9aKzCNgXf+yeXDiLKXps=";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25018,12 +25018,12 @@ final: prev: {
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2.17-unstable-2026-05-01";
+    version = "2.17-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "97e11bd4f56d46a87f8593d6ccb27820e19c4ab0";
-      hash = "sha256-LsWTI/JElapBImGB6nUUtZT5EpG7djaRniKq/oSFpJM=";
+      rev = "182ad387e3f3107699483606c9a2b6648f8437b2";
+      hash = "sha256-dvrSe4dxbGl+rGScQDBK0tQUz4Pr37E3V326XcFGSQg=";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25270,12 +25270,12 @@ final: prev: {
 
   whichpy-nvim = buildVimPlugin {
     pname = "whichpy.nvim";
-    version = "0-unstable-2026-03-14";
+    version = "0-unstable-2026-05-09";
     src = fetchFromGitHub {
       owner = "neolooong";
       repo = "whichpy.nvim";
-      rev = "5c317eab2c5af5f2d109c041f835763f9bf647e5";
-      hash = "sha256-zrVRRa868Sq0V8THxq9609FDr2w3n6btISFClE1J30c=";
+      rev = "96bc91d36d52fd64f1e5ab358c1b85f313c11628";
+      hash = "sha256-a4TqZ7wW5quTvZ1TgTdpzm4K2hM6+fsvLZgVzl8USfU=";
     };
     meta.homepage = "https://github.com/neolooong/whichpy.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25480,12 +25480,12 @@ final: prev: {
 
   wrapping-nvim = buildVimPlugin {
     pname = "wrapping.nvim";
-    version = "2.1.3-unstable-2026-04-02";
+    version = "2.1.3-unstable-2026-05-11";
     src = fetchFromGitHub {
       owner = "andrewferrier";
       repo = "wrapping.nvim";
-      rev = "ef6daf9fcceac8e7a99a155bf7b153488aefdd61";
-      hash = "sha256-TKkeg5NGH4wvDIISn21MLkxaHr4ZK1jhifSgk3a2Vak=";
+      rev = "3ecfb37cdc189a4e32d646e1c2ae0f46b9d62740";
+      hash = "sha256-IIAYVs6Yesd/dny9F4uOF01JyRznZxu/cOE0qEpK6B0=";
     };
     meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25663,12 +25663,12 @@ final: prev: {
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "13.1.5-unstable-2026-05-03";
+    version = "13.1.5-unstable-2026-05-12";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "d6ffa819eac0acc071664aa3d8a10c02f66ee0b6";
-      hash = "sha256-b6MTvvRfne6RDCIAoXCU+eKp0UjM8zDg+zIxNUca4Zk=";
+      rev = "25f370e6e84ca7ebca5927ec66cd93e2fa16fd3d";
+      hash = "sha256-togJQq+HhpkqZJD4GZ9F9NNjulur+sbcUB3PulmQvLU=";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25789,12 +25789,12 @@ final: prev: {
 
   zenbones-nvim = buildVimPlugin {
     pname = "zenbones.nvim";
-    version = "4.11.0";
+    version = "4.12.0";
     src = fetchFromGitHub {
       owner = "zenbones-theme";
       repo = "zenbones.nvim";
-      tag = "v4.11.0";
-      hash = "sha256-2fecMaB/59a/a0tUpDhipyGgwUliNf73SNTKQp3Bhck=";
+      tag = "v4.12.0";
+      hash = "sha256-Bh+OW1qyOYSgl3WbYnQ3HLem+AKChqwGYfn04ifyfAw=";
     };
     meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/";
     meta.license = getLicenseFromSpdxId "MIT";
@@ -25803,12 +25803,12 @@ final: prev: {
 
   zenburn = buildVimPlugin {
     pname = "zenburn";
-    version = "2.29-unstable-2026-03-22";
+    version = "2.29-unstable-2026-05-05";
     src = fetchFromGitHub {
       owner = "jnurmine";
       repo = "zenburn";
-      rev = "35fffad3d8fa79d7f3ff0ea7a472a3b62444979b";
-      hash = "sha256-QKp5EyVNFMfwCIs4lzUjpIngWzTsUAW4k5vYcQmJG6o=";
+      rev = "9d7988abf0d2654f837fcd288145afd5f316b70c";
+      hash = "sha256-WeTYdJNiD9/BSqbdnsQzmRX70XP6Op4kydnCCPKfpKk=";
     };
     meta.homepage = "https://github.com/jnurmine/zenburn/";
     meta.license = unfree;
@@ -25831,11 +25831,11 @@ final: prev: {
 
   zig-vim = buildVimPlugin {
     pname = "zig.vim";
-    version = "0-unstable-2026-05-02";
+    version = "0-unstable-2026-05-06";
     src = fetchgit {
       url = "https://codeberg.org/ziglang/zig.vim/";
-      rev = "73f6856496aee1d94884f072dfad18df7977d4e3";
-      hash = "sha256-I+nPSItC/0M8QTs1mVX7F+KjtezYpq9GFpUdsFl6bTE=";
+      rev = "29f7a9b8a4e33f936b803de0b713683ad687a6c3";
+      hash = "sha256-nIek0mbJ869dWuX3LAeSHJay86zE4lupXQTeYhLzth8=";
     };
     meta.homepage = "https://codeberg.org/ziglang/zig.vim/";
     meta.license = unfree;
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 93f6531126f2..8267f61f94fb 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1352,6 +1352,7 @@ assertNoAdditions {
       # Pickers, can use telescope, fzf-lua, or snacks
       fzf-lua
       telescope-nvim
+      neotest
     ];
   };
 

From 66bee715929bb4a91c70018db32f42071d0cc0b1 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 12 May 2026 17:37:24 -0500
Subject: [PATCH 217/221] vimPlugins: resolve github repository redirects

---
 pkgs/applications/editors/vim/plugins/generated.nix    | 4 ++--
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 162c63400842..1c59c0d43a67 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -22907,12 +22907,12 @@ final: prev: {
     pname = "vim-polyglot";
     version = "4.17.1-unstable-2025-08-27";
     src = fetchFromGitHub {
-      owner = "sheerun";
+      owner = "vim-polyglot";
       repo = "vim-polyglot";
       rev = "f061eddb7cdcc614c8406847b2bfb53099832a4e";
       hash = "sha256-GcJRChc2cVXz6U1q4z3RmWnlpGllD4KiQ66U3uA/dg8=";
     };
-    meta.homepage = "https://github.com/sheerun/vim-polyglot/";
+    meta.homepage = "https://github.com/vim-polyglot/vim-polyglot/";
     meta.license = unfree;
     meta.hydraPlatforms = [ ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 54d0408a05b6..bd1a34991b13 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1633,7 +1633,7 @@ https://github.com/justinj/vim-pico8-syntax/,,
 https://github.com/junegunn/vim-plug/,,
 https://github.com/powerman/vim-plugin-AnsiEsc/,,
 https://github.com/hasundue/vim-pluto/,,
-https://github.com/sheerun/vim-polyglot/,,
+https://github.com/vim-polyglot/vim-polyglot/,,
 https://github.com/jmcomets/vim-pony/,,
 https://github.com/haya14busa/vim-poweryank/,,
 https://github.com/prettier/vim-prettier/,,

From 0420f3c0601c63f42ba91433166496cb266351c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 12 May 2026 23:24:28 +0000
Subject: [PATCH 218/221] home-assistant-custom-components.daikin_onecta: 4.5.1
 -> 4.6.0

---
 .../custom-components/daikin_onecta/package.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
index 2a64e89217f0..f8c287c4297d 100644
--- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "jwillemsen";
   domain = "daikin_onecta";
-  version = "4.5.1";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "jwillemsen";
     repo = "daikin_onecta";
     tag = "v${version}";
-    hash = "sha256-7icy9MAeVPrA2j+d/kJvZTv1LE5BPzWfjHDMC4iKxTk=";
+    hash = "sha256-7X/I52jvcKtaLU01sa+oZ7n9wIJ9qNemiBUgEj5lRNQ=";
   };
 
   meta = {

From 7e72041072e7308c24496419c73733274c373e8d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 13 May 2026 02:18:30 +0200
Subject: [PATCH 219/221] python3Packages.pydantic-graph: 1.90.0 -> 1.94.0

https://github.com/pydantic/pydantic-ai/compare/v1.90.0...v1.94.0
---
 pkgs/development/python-modules/pydantic-graph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix
index 628748fda8eb..a57132bf811d 100644
--- a/pkgs/development/python-modules/pydantic-graph/default.nix
+++ b/pkgs/development/python-modules/pydantic-graph/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-graph";
-  version = "1.90.0";
+  version = "1.94.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+yFaSnMfgaTzhvQmFRiYoOnAf60JW45c7QsOrxRIElw=";
+    hash = "sha256-7bFlAJiJVxZWNcP/LbLQO97KRXIcG3xy12m1HEji1Rs=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_graph";

From 774ddf8f5001ae104fc5d823a857327405dfaafc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 13 May 2026 02:18:35 +0200
Subject: [PATCH 220/221] python3Packages.genai-prices: 0.0.57 -> 0.0.59

https://github.com/pydantic/genai-prices/compare/v0.0.57...v0.0.59
---
 pkgs/development/python-modules/genai-prices/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/genai-prices/default.nix b/pkgs/development/python-modules/genai-prices/default.nix
index 0169ef60cdf8..d3702f0c0403 100644
--- a/pkgs/development/python-modules/genai-prices/default.nix
+++ b/pkgs/development/python-modules/genai-prices/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "genai-prices";
-  version = "0.0.57";
+  version = "0.0.59";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "genai-prices";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gEviMu89IL4qSU4/wjGhLo8l1kA5N2alGp+/VcQpEHM=";
+    hash = "sha256-ANYl6wxjAZYnzvKhMsmC2eyg33ngF8DaYd67KCBGHLg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/python";

From 37d240158ee0bd486a6377b444cfcfebf4e5bfb2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 13 May 2026 02:18:46 +0200
Subject: [PATCH 221/221] python3Packages.pydantic-ai-slim: 1.90.0 -> 1.94.0

https://github.com/pydantic/pydantic-ai/compare/v1.90.0...v1.94.0
---
 pkgs/development/python-modules/pydantic-ai-slim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
index 86ba63a3c161..c4bf75525c04 100644
--- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix
+++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-ai-slim";
-  version = "1.90.0";
+  version = "1.94.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+yFaSnMfgaTzhvQmFRiYoOnAf60JW45c7QsOrxRIElw=";
+    hash = "sha256-7bFlAJiJVxZWNcP/LbLQO97KRXIcG3xy12m1HEji1Rs=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";