From ff9b3598e6ce7e9fbd4f0cc8a61cfab9b300003d Mon Sep 17 00:00:00 2001
From: toborwinner <102221758+ToborWinner@users.noreply.github.com>
Date: Mon, 10 Mar 2025 17:05:22 +0100
Subject: [PATCH 01/95] lib.modules: simplified logic in zipAttrsWith and minor
 cleanup

---
 lib/modules.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 935ef4baabad..8e6c6249f61c 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -320,7 +320,6 @@ let
         prefix ? [],
         }:
           evalModules (evalModulesArgs // {
-            inherit class;
             modules = regularModules ++ modules;
             specialArgs = evalModulesArgs.specialArgs or {} // specialArgs;
             prefix = extendArgs.prefix or evalModulesArgs.prefix or [];
@@ -335,8 +334,7 @@ let
         options = checked options;
         config = checked (removeAttrs config [ "_module" ]);
         _module = checked (config._module);
-        inherit extendModules type;
-        class = class;
+        inherit extendModules type class;
       };
     in result;
 
@@ -602,7 +600,7 @@ let
       # an attrset 'name' => list of submodules that declare ‘name’.
       declsByName =
         zipAttrsWith
-          (n: concatLists)
+          (n: v: v)
           (map
             (module: let subtree = module.options; in
               if !(isAttrs subtree) then
@@ -614,7 +612,7 @@ let
               else
                 mapAttrs
                   (n: option:
-                    [{ inherit (module) _file; pos = unsafeGetAttrPos n subtree; options = option; }]
+                    { inherit (module) _file; pos = unsafeGetAttrPos n subtree; options = option; }
                   )
                   subtree
               )
@@ -657,12 +655,12 @@ let
       # extract the definitions for each loc
       rawDefinitionsByName =
         zipAttrsWith
-          (n: concatLists)
+          (n: v: v)
           (map
             (module:
               mapAttrs
                 (n: value:
-                  [{ inherit (module) file; inherit value; }]
+                  { inherit (module) file; inherit value; }
                 )
                 module.config
             )

From 85a6974d6e3568d131386384da880b3433caed07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Mar 2025 00:02:48 +0000
Subject: [PATCH 02/95] python312Packages.rq: 2.1 -> 2.2

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

diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index 1350c06b1265..16e0369c4061 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "rq";
-  version = "2.1";
+  version = "2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "rq";
     repo = "rq";
     tag = "v${version}";
-    hash = "sha256-J3ftABqm+5lH37LiBskEXOb6MszvDKO2271s+CEk0ls=";
+    hash = "sha256-RuqLfPEwdwfJo+mdY4vB3lpyGkbP/GQDfRU+TmUur3s=";
   };
 
   build-system = [ hatchling ];

From 7c9a73fc2393ff3d6d1450972dcdcbf5df2612e3 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 23 Mar 2025 18:33:23 +0100
Subject: [PATCH 03/95] electron_33-bin: 33.4.5 -> 33.4.6

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.6
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.5...v33.4.6
- Fixes CVE-2025-1920
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 7775d40ea427..68570cb1690e 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "01cdfb1537bd56691bd65a855c5680f43336b402d3c44bf2e3fde2c9522ad39f",
-            "aarch64-linux": "1b91071b2da78c8a2e35113ae4f0705b60e4dbf74626cc1962af68fc1583ce11",
-            "armv7l-linux": "94dfc24c44900795609ce0cb02598a5f40ca9ef10fd685f8939f9142e8aca4ed",
-            "headers": "1whlam8s7n8rz46z3s4mq41079zd5jkkdk4xrppzkgpmcz98rzq1",
-            "x86_64-darwin": "5d84d441d7e3ee4c4a3088426c1da39369cf7bdf96ed709f1f15db5e1d1624df",
-            "x86_64-linux": "1fcc119c2b35d7d6e347bca6c4280111ac87f138d5f53817e8cba10027ef0d88"
+            "aarch64-darwin": "a7616e1fec12241cde5c130e8e05650d702fa6c6b9c2b3a09790e8adaf4bdb82",
+            "aarch64-linux": "b5754231a5d946526b31f97add5d6c6c6a4e77ea5f25c9b10e02b9b4f03ad926",
+            "armv7l-linux": "5b111adf94d6c7be2983b6704285f298133de2ef770590538bdcc17f55849c73",
+            "headers": "0w86j77zm2fahd6a6p7kwwk6nw07cis7c5zchawpgxhnpc8x8ajb",
+            "x86_64-darwin": "38ec29d9bf6f1f73703a6fd68791f62b8eb84faf7497c741c7fbf7ee8cd9faae",
+            "x86_64-linux": "87082e3dc30598c8e484a1a529736c54e3f7844e8023d3ef7f81924e78b255e8"
         },
-        "version": "33.4.5"
+        "version": "33.4.6"
     },
     "34": {
         "hashes": {

From 69d7e249ebae757f69b0de76152abbadb579d563 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 23 Mar 2025 18:33:27 +0100
Subject: [PATCH 04/95] electron-chromedriver_33: 33.4.5 -> 33.4.6

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.6
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.5...v33.4.6
- Fixes CVE-2025-1920
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index d7e3fc441dac..3ff92d911d36 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "3cb2951e2591648e0d55f52b14d0743cca22dbdff5b832a5616434a68f24f3c2",
-            "aarch64-linux": "dbb5dccda630f37e52d6dd09be9f26cacbead7981b2bf4ab7fd0cb8793e1ef2c",
-            "armv7l-linux": "aaf4c2e562a0c9bbcaf72cd652531376d31cbe9745a4e811b904e32448a3bd8b",
-            "headers": "1whlam8s7n8rz46z3s4mq41079zd5jkkdk4xrppzkgpmcz98rzq1",
-            "x86_64-darwin": "c9721607e7c6e86986d05bf9bf3ea9674b1409516aa1a6956d0c8537a4995fa2",
-            "x86_64-linux": "6377a8be4424a1469f54ecc68d64b757d16b55c9f942eae97149610e1347588f"
+            "aarch64-darwin": "81c9cd7f694e51f0969fc6f265af2676f6ffa7f70cd83f1a774f857a39550fb8",
+            "aarch64-linux": "18aa9643499628a46288945ade422cb7b33b265ef190e805662ff030e1ac4f55",
+            "armv7l-linux": "dcd91ddd204b1f8b435b476b721757ac6db0b1d781cfcc26132a9e9d8fb6a5cf",
+            "headers": "0w86j77zm2fahd6a6p7kwwk6nw07cis7c5zchawpgxhnpc8x8ajb",
+            "x86_64-darwin": "6f1cb522426a4e9b2a9b27097296400bc623e4bc056eb3a4a3bb16cf106ad0de",
+            "x86_64-linux": "44831e32d223c131b8a2f7b88bc127946dc2d700f8f6b4c2252dc6429f68cf4e"
         },
-        "version": "33.4.5"
+        "version": "33.4.6"
     },
     "34": {
         "hashes": {

From 64137d69fb6d0921d41396420f34f932ab12221d Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 23 Mar 2025 18:33:43 +0100
Subject: [PATCH 05/95] electron_34-bin: 34.3.3 -> 34.3.4

- Changelog: https://github.com/electron/electron/releases/tag/v34.3.4
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.3...v34.3.4
- Fixes CVE-2025-1920
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 68570cb1690e..f371d98ae644 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "dab1531dc858b2f8b888182bc62272b4d7d40dc53cee97454779f37e1803acb3",
-            "aarch64-linux": "26c5509e785b4e3117f9430e6b52ad1cb8c7dc83a3b7c7ad4b593c724fc334f2",
-            "armv7l-linux": "26f50b1ef9bfb572fea3af20cdebae01112aaff69cf0933602d2c33de1a5e71a",
-            "headers": "0a41rnr2fbhrqgxzhglvm3xxznhh01zhl92qmdz2r9kj352lm4bl",
-            "x86_64-darwin": "c515f2b65af0f2c0fd08c478e26801061a14d17decdb5dd40ed7a36fd03e0ff4",
-            "x86_64-linux": "7ddd7e64846d72f90f62c4af29ce7930859b7d2ffac256c156e5bfa36f9e9b39"
+            "aarch64-darwin": "4ec82228e960df71a92a21a637b262c9e4686327f321a989f1f2399224fdf560",
+            "aarch64-linux": "f67c92e78e42be738f769ee08b4f5f2c397d94eb1631e21025a96bb93d874d21",
+            "armv7l-linux": "bdf5492b3c3fb86a719a9e10a3fc2537f5d1fa585e263fc168f932f267201bcc",
+            "headers": "1jr209irda0d06w8jwq6lrkadkbbjdq21583s9xvcjafw26cf8dn",
+            "x86_64-darwin": "6c41a7206ad90d703d8f832507bd037adde71c8a44cae2408d96315270b59648",
+            "x86_64-linux": "c2fcfd338300de8c0f38931a7e956d7cea1dcde640ca60490f4a45b986ff368a"
         },
-        "version": "34.3.3"
+        "version": "34.3.4"
     },
     "35": {
         "hashes": {

From eb059ed15933561d08ce9856fa3c85e2e3fa59bf Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 23 Mar 2025 18:33:47 +0100
Subject: [PATCH 06/95] electron-chromedriver_34: 34.3.3 -> 34.3.4

- Changelog: https://github.com/electron/electron/releases/tag/v34.3.4
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.3...v34.3.4
- Fixes CVE-2025-1920
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 3ff92d911d36..209e2852d5dc 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "aa80917205c7bf0c3fa01c4c9246415d1668836ba8244509e495d67fa197f383",
-            "aarch64-linux": "6c99a95b2c9fc98636678c44477f11c39e2603d93211f41e788442445a210020",
-            "armv7l-linux": "b1c0ebc724e8e833201b23348477f348086cfd102879d6c1cc8269f72e177d72",
-            "headers": "0a41rnr2fbhrqgxzhglvm3xxznhh01zhl92qmdz2r9kj352lm4bl",
-            "x86_64-darwin": "7ba6b42a5fba86391c3f496db885fd240b22e8fa80790747a11697dab80ef099",
-            "x86_64-linux": "999fb44c5877b34da0ee6e24eb0ce74e521ed47e84db107b6037488ec51d45f1"
+            "aarch64-darwin": "c1c4fdd66e0a94f5f9b09704e7c95a80f99c8c37d252bf08b2ec52150c9dc2bb",
+            "aarch64-linux": "5396d023255d3a79e807097b428c08a4325ef72be5ab5706dff66cfb996acb3c",
+            "armv7l-linux": "b39bc8cedc2283f4590db715d7a7171fb8dde9bfd1ff95cb34bfa8134a4225da",
+            "headers": "1jr209irda0d06w8jwq6lrkadkbbjdq21583s9xvcjafw26cf8dn",
+            "x86_64-darwin": "64abfaa71689a4a1d6da708935a12f44376a487a0c261b770c176cf7c96d0424",
+            "x86_64-linux": "4af0b47c198213375f822715bfcd09caba03842aba6674274f00c752a3d75a92"
         },
-        "version": "34.3.3"
+        "version": "34.3.4"
     },
     "35": {
         "hashes": {

From 07701af1c599b1834f65f1229b2ecb2dfcf6b09b Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 23 Mar 2025 18:48:33 +0100
Subject: [PATCH 07/95] electron-source.electron_33: 33.4.5 -> 33.4.6

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.6
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.5...v33.4.6
- Fixes CVE-2025-1920
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 797c971c2333..6203882290f3 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -47,10 +47,10 @@
             },
             "src/electron": {
                 "fetcher": "fetchFromGitHub",
-                "hash": "sha256-jumOmlCUiRRR0ubLuVRGl5E2lwbID5C0JYJ2+gJUrA8=",
+                "hash": "sha256-jql2U+pmXqwrCoVdLVhbRD/G49r6lH1IkyI8kYbGC5I=",
                 "owner": "electron",
                 "repo": "electron",
-                "rev": "v33.4.5"
+                "rev": "v33.4.6"
             },
             "src/media/cdm/api": {
                 "fetcher": "fetchFromGitiles",
@@ -950,7 +950,7 @@
         "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8",
         "modules": "130",
         "node": "20.18.3",
-        "version": "33.4.5"
+        "version": "33.4.6"
     },
     "34": {
         "chrome": "132.0.6834.210",

From 869af4cb85f812d034df0f46d6d23aed2bbb0d09 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 23 Mar 2025 18:49:54 +0100
Subject: [PATCH 08/95] electron-source.electron_34: 34.3.3 -> 34.3.4

- Changelog: https://github.com/electron/electron/releases/tag/v34.3.4
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.3...v34.3.4
- Fixes CVE-2025-1920
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 6203882290f3..06b9653bf45e 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1000,10 +1000,10 @@
             },
             "src/electron": {
                 "fetcher": "fetchFromGitHub",
-                "hash": "sha256-mOrKKuUkfTDjLxNvjlvHS5NP4NjdgaIdS4xgWKJBET8=",
+                "hash": "sha256-8VmE8o0YHV4C8S29ATDBUXvk1mq9VjD3f+iRTkTdyDI=",
                 "owner": "electron",
                 "repo": "electron",
-                "rev": "v34.3.3"
+                "rev": "v34.3.4"
             },
             "src/media/cdm/api": {
                 "fetcher": "fetchFromGitiles",
@@ -1915,7 +1915,7 @@
         "electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
         "modules": "132",
         "node": "20.18.3",
-        "version": "34.3.3"
+        "version": "34.3.4"
     },
     "35": {
         "chrome": "134.0.6998.88",

From d99a9f820bfc2db2a2240a7a3d07f4a18f6d7b26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 02:32:59 +0000
Subject: [PATCH 09/95] python312Packages.ansible-core: 2.18.3 -> 2.18.4

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

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 7cf89891c004..090b58a2411d 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "ansible-core";
-  version = "2.18.3";
+  version = "2.18.4";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "ansible_core";
     inherit version;
-    hash = "sha256-jE6spAhFI44mAbm8nb+9T27TUCy4smMnifdc5Hir/e4=";
+    hash = "sha256-4fj1wzVGNisO6TPglpo7o2S0hlFab6G8Jeu12V+OxfQ=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through

From b45da3b2efdbee18f3c962b589dba9e0da79cd2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?=
 <rapiteanu.catalin@gmail.com>
Date: Fri, 21 Feb 2025 23:58:45 +0200
Subject: [PATCH 10/95] python3Packages.proton-vpn-api-core: 0.39.0 -> 0.42.3

Update to the latest package.
---
 .../python-modules/proton-vpn-api-core/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
index dad65babe699..0142603b9e50 100644
--- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "proton-vpn-api-core";
-  version = "0.39.0";
+  version = "0.42.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-vpn-api-core";
     rev = "v${version}";
-    hash = "sha256-1GmLrX3FLwPoj+RGzPxzw1O7Q7r5M1coJelPhn2CTLI=";
+    hash = "sha256-/GV5DFWc6RBWP723APNxn9FTxdePumYOtdwDQEg4ccA=";
   };
 
   build-system = [

From 6128c988fd15465b0b84f0e1912e27549ff63ab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?=
 <rapiteanu.catalin@gmail.com>
Date: Sat, 22 Feb 2025 00:01:03 +0200
Subject: [PATCH 11/95] python3Packages.proton-vpn-network-manager: 0.10.2 ->
 0.12.13

Update the package to the latest version.
---
 .../python-modules/proton-vpn-network-manager/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
index 06ee4e31cfd9..61abc0ab426f 100644
--- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "proton-vpn-network-manager";
-  version = "0.10.2";
+  version = "0.12.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-vpn-network-manager";
     tag = "v${version}";
-    hash = "sha256-btlTZcfocNC7MpzXOh9daCP696lXhFGtzcKI+N/x7Bc=";
+    hash = "sha256-LRjC1uuAG2OG52moRBSvTR7HvqdldNmW0Tv7AZmUf60=";
   };
 
   nativeBuildInputs = [

From a606c6659d0df810ecb8ea625c271ee77248c541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?=
 <rapiteanu.catalin@gmail.com>
Date: Sat, 22 Feb 2025 00:05:14 +0200
Subject: [PATCH 12/95] proton-vpn-local-agent: 1.2.0 -> 1.4.4

Updated the package to the latest stable version.
---
 pkgs/by-name/pr/proton-vpn-local-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
index d4d7fb7a68b4..c9a25a988dcd 100644
--- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
+++ b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "proton-vpn-local-agent";
-  version = "1.2.0";
+  version = "1.4.4";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-KD+cTEmezTiGL+OmMryS/Q1mRR0n9jx80o3hb5X3ZYM=";
+  cargoHash = "sha256-i/qJwN8693MRaWTcvGGcWMCqclyOOIb/wlqiUilOhzQ=";
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-vpn-local-agent";
     rev = version;
-    hash = "sha256-1iUeAWojIcXbvO6YoPEh//dbVdl90cUocyO3nfDtUEM";
+    hash = "sha256-9dyyLZZEOB2080KxN0ffdkRhyvEY8xKE/7b2mA7JL+o=";
   };
 
   sourceRoot = "${src.name}/python-proton-vpn-local-agent";

From 99ceb335d0d661a6b2346d49a224683e1d52c29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?=
 <rapiteanu.catalin@gmail.com>
Date: Sat, 22 Feb 2025 00:06:18 +0200
Subject: [PATCH 13/95] protonvpn-gui: 4.8.2 -> 4.9.5

Update the package to the latest version.
---
 pkgs/applications/networking/protonvpn-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix
index 68657d34605e..8edfbade14ee 100644
--- a/pkgs/applications/networking/protonvpn-gui/default.nix
+++ b/pkgs/applications/networking/protonvpn-gui/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonApplication rec {
   pname = "protonvpn-gui";
-  version = "4.8.2";
+  version = "4.9.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "proton-vpn-gtk-app";
     tag = "v${version}";
-    hash = "sha256-kNWwrNpXCkAPvXXqv8HwOx0msYEVsO0JgrtG3wUVmQ4=";
+    hash = "sha256-mXRTXr7u049pgPRK5gwaGfQUmUl4vlKca4lRH06HZj8=";
   };
 
   nativeBuildInputs = [

From 9794620a5dd2e6663c1c370aea367ce3defa9c27 Mon Sep 17 00:00:00 2001
From: Chun Yu <lamchunyu00@gmail.com>
Date: Wed, 26 Mar 2025 15:16:45 +0800
Subject: [PATCH 14/95] aider-chat: add optional dependencies for help and
 browser

---
 pkgs/by-name/ai/aider-chat/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix
index 2ed266af2905..c34ab1173617 100644
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@@ -1,9 +1,18 @@
 {
   python3Packages,
   withPlaywright ? false,
+  withBrowser ? false,
+  withHelp ? false,
+  withOptional ? false,
 }:
 
 if withPlaywright then
   python3Packages.toPythonApplication python3Packages.aider-chat.passthru.withPlaywright
+else if withBrowser then
+  python3Packages.toPythonApplication python3Packages.aider-chat.passthru.withBrowser
+else if withHelp then
+  python3Packages.toPythonApplication python3Packages.aider-chat.passthru.withHelp
+else if withOptional then
+  python3Packages.toPythonApplication python3Packages.aider-chat.passthru.withOptional
 else
   python3Packages.toPythonApplication python3Packages.aider-chat

From fca131252727c44b34f6b171e718f1b357dda05c Mon Sep 17 00:00:00 2001
From: Chun Yu <lamchunyu00@gmail.com>
Date: Wed, 26 Mar 2025 15:16:24 +0800
Subject: [PATCH 15/95] python3Packages.aider-chat: add optional dependencies

---
 .../python-modules/aider-chat/default.nix     | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index 76f8e414febb..d4879ed33c9f 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -177,6 +177,14 @@ let
         pyee
         typing-extensions
       ];
+      browser = [
+        streamlit
+      ];
+      help = [
+        llama-index-core
+        llama-index-embeddings-huggingface
+        torch
+      ];
     };
 
     passthru = {
@@ -196,6 +204,41 @@ let
           ];
         }
       );
+
+      withBrowser = aider-chat.overridePythonAttrs (
+        { dependencies, ... }:
+        {
+          dependencies = dependencies ++ aider-chat.optional-dependencies.browser;
+        }
+      );
+
+      withHelp = aider-chat.overridePythonAttrs (
+        { dependencies, ... }:
+        {
+          dependencies = dependencies ++ aider-chat.optional-dependencies.help;
+        }
+      );
+
+      withOptional = aider-chat.overridePythonAttrs (
+        {
+          dependencies,
+          makeWrapperArgs,
+          propagatedBuildInputs ? [ ],
+          ...
+        }:
+        {
+          dependencies =
+            dependencies
+            ++ aider-chat.optional-dependencies.playwright
+            ++ aider-chat.optional-dependencies.browser
+            ++ aider-chat.optional-dependencies.help;
+          propagatedBuildInputs = propagatedBuildInputs ++ [ playwright-driver.browsers ];
+          makeWrapperArgs = makeWrapperArgs ++ [
+            "--set PLAYWRIGHT_BROWSERS_PATH ${playwright-driver.browsers}"
+            "--set PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true"
+          ];
+        }
+      );
     };
 
     meta = {

From 844973ceede1f9383f85f0b8cc1a75d834fe46c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 27 Mar 2025 08:40:03 -0700
Subject: [PATCH 16/95] python313Packages.python-iso639: init at 2025.2.18

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

diff --git a/pkgs/development/python-modules/python-iso639/default.nix b/pkgs/development/python-modules/python-iso639/default.nix
new file mode 100644
index 000000000000..f467a5393258
--- /dev/null
+++ b/pkgs/development/python-modules/python-iso639/default.nix
@@ -0,0 +1,36 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "python-iso639";
+  version = "2025.2.18";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jacksonllee";
+    repo = "iso639";
+    tag = "v${version}";
+    hash = "sha256-CVLyeXA0FXLCthNO3SLgTvxi4sJI5fPhuqEbnDb4L/s=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "iso639" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/jacksonllee/iso639/blob/${src.tag}/CHANGELOG.md";
+    description = "ISO 639 language codes, names, and other associated information";
+    homepage = "https://github.com/jacksonllee/iso639";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84089eace07f..ab274c0e878f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14553,6 +14553,8 @@ self: super: with self; {
 
   python-ironicclient = callPackage ../development/python-modules/python-ironicclient { };
 
+  python-iso639 = callPackage ../development/python-modules/python-iso639 { };
+
   python-izone = callPackage ../development/python-modules/python-izone { };
 
   python-jenkins = callPackage ../development/python-modules/python-jenkins { };

From 3022018782b256349c80fe97fe5b7403a76e8e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 27 Mar 2025 08:48:52 -0700
Subject: [PATCH 17/95] python313Packages.python-oxmsg: init at 0.0.2

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

diff --git a/pkgs/development/python-modules/python-oxmsg/default.nix b/pkgs/development/python-modules/python-oxmsg/default.nix
new file mode 100644
index 000000000000..c98197e82918
--- /dev/null
+++ b/pkgs/development/python-modules/python-oxmsg/default.nix
@@ -0,0 +1,46 @@
+{
+  buildPythonPackage,
+  click,
+  fetchFromGitHub,
+  lib,
+  olefile,
+  pytestCheckHook,
+  setuptools,
+  typing-extensions,
+}:
+
+buildPythonPackage rec {
+  pname = "python-oxmsg";
+  version = "0.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "scanny";
+    repo = "python-oxmsg";
+    tag = "v${version}";
+    hash = "sha256-ramM27+SylBeJyb3kkRm1xn3qAefiLuBOvI/iucK2wM=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    click
+    olefile
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [ "oxmsg" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/scanny/python-oxmsg/blob/${src.tag}/CHANGELOG.md";
+    description = "Extract attachments from Outlook .msg files";
+    homepage = "https://github.com/scanny/python-oxmsg";
+    license = lib.licenses.mit;
+    mainProgram = "oxmsg";
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab274c0e878f..157a1d79c181 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14703,6 +14703,8 @@ self: super: with self; {
 
   python-owasp-zap-v2-4 = callPackage ../development/python-modules/python-owasp-zap-v2-4 { };
 
+  python-oxmsg = callPackage ../development/python-modules/python-oxmsg { };
+
   python-packer = callPackage ../development/python-modules/python-packer { };
 
   python-pae = callPackage ../development/python-modules/python-pae { };

From 8479c7eaa1242eaf60a2f02ad236063c36c10a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 27 Mar 2025 09:00:37 -0700
Subject: [PATCH 18/95] python313Packages.typing-inspection: init at 0.4.0

---
 .../typing-inspection/default.nix             | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/typing-inspection/default.nix

diff --git a/pkgs/development/python-modules/typing-inspection/default.nix b/pkgs/development/python-modules/typing-inspection/default.nix
new file mode 100644
index 000000000000..461d1d1b4add
--- /dev/null
+++ b/pkgs/development/python-modules/typing-inspection/default.nix
@@ -0,0 +1,41 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  pytestCheckHook,
+  typing-extensions,
+}:
+
+buildPythonPackage rec {
+  pname = "typing-inspection";
+  version = "0.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pydantic";
+    repo = "typing-inspection";
+    tag = "v${version}";
+    hash = "sha256-sWWO+TRqNf791s+q5YeEcl9ZMHCBuxQLGXHmEk1AU0Y=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [ "typing_inspection" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/pydantic/typing-inspection/releases/tag/${src.tag}";
+    description = "Runtime typing introspection tools";
+    homepage = "https://github.com/pydantic/typing-inspection";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 157a1d79c181..3b1982ae6fb8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18386,6 +18386,8 @@ self: super: with self; {
 
   typing-inspect = callPackage ../development/python-modules/typing-inspect { };
 
+  typing-inspection = callPackage ../development/python-modules/typing-inspection { };
+
   typing-validation = callPackage ../development/python-modules/typing-validation { };
 
   typish = callPackage ../development/python-modules/typish { };

From f70c18307d83adfc9cf10f7ccc454ef029660bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 27 Mar 2025 08:57:37 -0700
Subject: [PATCH 19/95] python313Packages.unstructured-client: init at 0.31.5

---
 .../unstructured-client/default.nix           | 75 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/development/python-modules/unstructured-client/default.nix

diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix
new file mode 100644
index 000000000000..9de30ac6f1fb
--- /dev/null
+++ b/pkgs/development/python-modules/unstructured-client/default.nix
@@ -0,0 +1,75 @@
+{
+  aiofiles,
+  buildPythonPackage,
+  cryptography,
+  deepdiff,
+  eval-type-backport,
+  fetchFromGitHub,
+  httpx,
+  lib,
+  nest-asyncio,
+  poetry-core,
+  pydantic,
+  pypdf,
+  pytest-asyncio,
+  pytestCheckHook,
+  python,
+  python-dateutil,
+  requests-toolbelt,
+  typing-inspection,
+}:
+
+buildPythonPackage rec {
+  pname = "unstructured-client";
+  version = "0.31.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Unstructured-IO";
+    repo = "unstructured-python-client";
+    tag = "v${version}";
+    hash = "sha256-b5Hnp3XKuuGUWEFhQzTArUUWbsZ2+Q2Iz+3+WjMn4XU=";
+  };
+
+  preBuild = ''
+    ${python.interpreter} scripts/prepare_readme.py
+  '';
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiofiles
+    cryptography
+    eval-type-backport
+    httpx
+    nest-asyncio
+    pydantic
+    pypdf
+    python-dateutil
+    requests-toolbelt
+    typing-inspection
+  ];
+
+  pythonImportsCheck = [ "unstructured_client" ];
+
+  nativeCheckInputs = [
+    deepdiff
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    # see test-unit in Makefile
+    "_test_unstructured_client"
+    "-k"
+    "unit"
+  ];
+
+  meta = {
+    changelog = "https://github.com/Unstructured-IO/unstructured-python-client/blob/${src.tag}/RELEASES.md";
+    description = "Python Client SDK for Unstructured API";
+    homepage = "https://github.com/Unstructured-IO/unstructured-python-client";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b1982ae6fb8..0a9c9ca564f6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18554,6 +18554,8 @@ self: super: with self; {
 
   unstructured-api-tools = callPackage ../development/python-modules/unstructured-api-tools { };
 
+  unstructured-client = callPackage ../development/python-modules/unstructured-client { };
+
   unstructured-inference = callPackage ../development/python-modules/unstructured-inference { };
 
   untangle = callPackage ../development/python-modules/untangle { };

From 5da7dac8b61a073d8009d2b95d36c8675b2f0310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 27 Mar 2025 08:28:49 -0700
Subject: [PATCH 20/95] python313Packages.unstructured: 0.16.15 -> 0.17.2

Diff: https://github.com/Unstructured-IO/unstructured/compare/refs/tags/0.16.15...0.17.2

Changelog: https://github.com/Unstructured-IO/unstructured/blob/0.17.2/CHANGELOG.md
---
 .../python-modules/unstructured/default.nix   | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix
index eac7e5e04224..fb11ac599003 100644
--- a/pkgs/development/python-modules/unstructured/default.nix
+++ b/pkgs/development/python-modules/unstructured/default.nix
@@ -3,6 +3,9 @@
   buildPythonPackage,
   fetchFromGitHub,
 
+  # build-system
+  setuptools,
+
   # core networking and async dependencies
   anyio,
   backoff,
@@ -30,9 +33,9 @@
   olefile,
   orderly-set,
   python-dateutil,
-  # python-iso639,
+  python-iso639,
   python-magic,
-  # python-oxmsg,
+  python-oxmsg,
   rapidfuzz,
   regex,
   soupsieve,
@@ -65,7 +68,7 @@
   pypandoc,
   pypdf,
   python-docx,
-  # unstructured-client,
+  unstructured-client,
   # unstructured-pytesseract,
   # optional dependencies
   # csv
@@ -113,21 +116,23 @@
   grpcio,
 }:
 let
-  version = "0.16.15";
+  version = "0.17.2";
 in
 buildPythonPackage {
   pname = "unstructured";
   inherit version;
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured";
     tag = version;
-    hash = "sha256-Wp51LOgM/zE81324Qzu83XGupUMAzz2wn+COmNq95H8=";
+    hash = "sha256-DbNfhJzpPJObACWSc2r16kjIE2X/CrOCiT7fdgGNwIg=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     # Base dependencies
     anyio
     backoff
@@ -163,9 +168,9 @@ buildPythonPackage {
     pycparser
     pypdf
     python-dateutil
-    # python-iso639
+    python-iso639
     python-magic
-    # python-oxmsg
+    python-oxmsg
     rapidfuzz
     regex
     requests
@@ -176,7 +181,7 @@ buildPythonPackage {
     tqdm
     typing-extensions
     typing-inspect
-    # unstructured-client
+    unstructured-client
     urllib3
     webencodings
     wrapt

From fefeed987af810fd92a8cb3463647411aaf57be4 Mon Sep 17 00:00:00 2001
From: Chun Yu <lamchunyu00@gmail.com>
Date: Fri, 28 Mar 2025 01:52:31 +0800
Subject: [PATCH 21/95] python3Packages.aider-chat: made withOptional a
 function with parameters

---
 .../python-modules/aider-chat/default.nix     | 80 ++++++++-----------
 1 file changed, 33 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index d4879ed33c9f..d02baf5434dc 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -188,57 +188,43 @@ let
     };
 
     passthru = {
-      withPlaywright = aider-chat.overridePythonAttrs (
+      withOptional =
         {
-          dependencies,
-          makeWrapperArgs,
-          propagatedBuildInputs ? [ ],
+          withPlaywright ? false,
+          withBrowser ? false,
+          withHelp ? false,
+          withAll ? false,
           ...
         }:
-        {
-          dependencies = dependencies ++ aider-chat.optional-dependencies.playwright;
-          propagatedBuildInputs = propagatedBuildInputs ++ [ playwright-driver.browsers ];
-          makeWrapperArgs = makeWrapperArgs ++ [
-            "--set PLAYWRIGHT_BROWSERS_PATH ${playwright-driver.browsers}"
-            "--set PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true"
-          ];
-        }
-      );
+        aider-chat.overridePythonAttrs (
+          {
+            dependencies,
+            makeWrapperArgs,
+            propagatedBuildInputs ? [ ],
+            ...
+          }:
+          let
+            playwrightDeps =
+              if withPlaywright || withAll then aider-chat.optional-dependencies.playwright else [ ];
+            browserDeps = if withBrowser || withAll then aider-chat.optional-dependencies.browser else [ ];
+            helpDeps = if withHelp || withAll then aider-chat.optional-dependencies.help else [ ];
 
-      withBrowser = aider-chat.overridePythonAttrs (
-        { dependencies, ... }:
-        {
-          dependencies = dependencies ++ aider-chat.optional-dependencies.browser;
-        }
-      );
-
-      withHelp = aider-chat.overridePythonAttrs (
-        { dependencies, ... }:
-        {
-          dependencies = dependencies ++ aider-chat.optional-dependencies.help;
-        }
-      );
-
-      withOptional = aider-chat.overridePythonAttrs (
-        {
-          dependencies,
-          makeWrapperArgs,
-          propagatedBuildInputs ? [ ],
-          ...
-        }:
-        {
-          dependencies =
-            dependencies
-            ++ aider-chat.optional-dependencies.playwright
-            ++ aider-chat.optional-dependencies.browser
-            ++ aider-chat.optional-dependencies.help;
-          propagatedBuildInputs = propagatedBuildInputs ++ [ playwright-driver.browsers ];
-          makeWrapperArgs = makeWrapperArgs ++ [
-            "--set PLAYWRIGHT_BROWSERS_PATH ${playwright-driver.browsers}"
-            "--set PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true"
-          ];
-        }
-      );
+            playwrightInputs = if withPlaywright || withAll then [ playwright-driver.browsers ] else [ ];
+            playwrightArgs =
+              if withPlaywright || withAll then
+                [
+                  "--set PLAYWRIGHT_BROWSERS_PATH ${playwright-driver.browsers}"
+                  "--set PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true"
+                ]
+              else
+                [ ];
+          in
+          {
+            dependencies = dependencies ++ playwrightDeps ++ browserDeps ++ helpDeps;
+            propagatedBuildInputs = propagatedBuildInputs ++ playwrightInputs;
+            makeWrapperArgs = makeWrapperArgs ++ playwrightArgs;
+          }
+        );
     };
 
     meta = {

From b54f01f1c069ad8f070e552ca00778c0a1a99aff Mon Sep 17 00:00:00 2001
From: Chun Yu <lamchunyu00@gmail.com>
Date: Fri, 28 Mar 2025 01:55:58 +0800
Subject: [PATCH 22/95] python3Packages.aider-chat: add bedrock optional
 dependencies

---
 pkgs/development/python-modules/aider-chat/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index d02baf5434dc..7fc8ac807754 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -185,6 +185,9 @@ let
         llama-index-embeddings-huggingface
         torch
       ];
+      bedrock = [
+        boto3
+      ];
     };
 
     passthru = {
@@ -193,6 +196,7 @@ let
           withPlaywright ? false,
           withBrowser ? false,
           withHelp ? false,
+          withBedrock ? false,
           withAll ? false,
           ...
         }:
@@ -208,6 +212,7 @@ let
               if withPlaywright || withAll then aider-chat.optional-dependencies.playwright else [ ];
             browserDeps = if withBrowser || withAll then aider-chat.optional-dependencies.browser else [ ];
             helpDeps = if withHelp || withAll then aider-chat.optional-dependencies.help else [ ];
+            bedrockDeps = if withBedrock || withAll then aider-chat.optional-dependencies.bedrock else [ ];
 
             playwrightInputs = if withPlaywright || withAll then [ playwright-driver.browsers ] else [ ];
             playwrightArgs =
@@ -220,7 +225,7 @@ let
                 [ ];
           in
           {
-            dependencies = dependencies ++ playwrightDeps ++ browserDeps ++ helpDeps;
+            dependencies = dependencies ++ playwrightDeps ++ browserDeps ++ helpDeps ++ bedrockDeps;
             propagatedBuildInputs = propagatedBuildInputs ++ playwrightInputs;
             makeWrapperArgs = makeWrapperArgs ++ playwrightArgs;
           }

From b6f322c419adff44ddfb4cb859356a47012937ad Mon Sep 17 00:00:00 2001
From: Omar Jatoi <git@omarjatoi.com>
Date: Fri, 28 Mar 2025 09:00:20 -0400
Subject: [PATCH 23/95] scala: 3.3.4 -> 3.3.5

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

diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/development/compilers/scala/bare.nix
index 51e156312e24..d3e79fdde206 100644
--- a/pkgs/development/compilers/scala/bare.nix
+++ b/pkgs/development/compilers/scala/bare.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "3.3.4";
+  version = "3.3.5";
   pname = "scala-bare";
 
   src = fetchurl {
     url = "https://github.com/scala/scala3/releases/download/${finalAttrs.version}/scala3-${finalAttrs.version}.tar.gz";
-    hash = "sha256-/Q7KKe8fbEGHS2cR57ZRTx3Hw4fAh3QvuHP25yCWN3A=";
+    hash = "sha256-JVQG16L0/3RbahJc+FDz6pazTyb5vnxqP4272l0TalI=";
   };
 
   propagatedBuildInputs = [

From 112e7ced337482a97838c0f5b1ce046656fbe298 Mon Sep 17 00:00:00 2001
From: Omar Jatoi <git@omarjatoi.com>
Date: Fri, 28 Mar 2025 09:00:38 -0400
Subject: [PATCH 24/95] scala-next: 3.6.3 -> 3.6.4

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

diff --git a/pkgs/by-name/sc/scala-next/package.nix b/pkgs/by-name/sc/scala-next/package.nix
index 093bdac0b6e2..d43b3d0a184d 100644
--- a/pkgs/by-name/sc/scala-next/package.nix
+++ b/pkgs/by-name/sc/scala-next/package.nix
@@ -1,10 +1,10 @@
 { scala, fetchurl }:
 
 scala.bare.overrideAttrs (oldAttrs: {
-  version = "3.6.3";
+  version = "3.6.4";
   pname = "scala-next";
   src = fetchurl {
     inherit (oldAttrs.src) url;
-    hash = "sha256-I+PYPSRLS8Q0SJ/BEAoFwB7EcFERZpN5pGcD5cGwlNU=";
+    hash = "sha256-I8Jpq/aelCJyAZzvNq5/QbfdD0Mk5mPuzTDxVdkIxKU=";
   };
 })

From 0113cbea686d6a452251ece085f0c19c98617222 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 10:52:03 +0000
Subject: [PATCH 25/95] spring-boot-cli: 3.4.3 -> 3.4.4

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

diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix
index 17618e9db4ff..54cf2cec0a6a 100644
--- a/pkgs/by-name/sp/spring-boot-cli/package.nix
+++ b/pkgs/by-name/sp/spring-boot-cli/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spring-boot-cli";
-  version = "3.4.3";
+  version = "3.4.4";
 
   src = fetchzip {
     url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip";
-    hash = "sha256-Whk+BgPdPYNuNvQA5iz6p6tSqcTBTzt3qWkHwmUcqbc=";
+    hash = "sha256-+dhYpd8qrsYZ5a5xuOsym/Oa0vkB0z1ZWNP9eGgcQv8=";
   };
 
   nativeBuildInputs = [

From b92da6e77d84fa7c9af02232848822cf0e7c591e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 11:38:12 +0000
Subject: [PATCH 26/95] coroot: 1.9.0 -> 1.9.9

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

diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix
index 28a35d6577a3..05c5a5dc8f81 100644
--- a/pkgs/by-name/co/coroot/package.nix
+++ b/pkgs/by-name/co/coroot/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "coroot";
-  version = "1.9.0";
+  version = "1.9.9";
 
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot";
     rev = "v${version}";
-    hash = "sha256-qhKpB1Gp2GPtWCjlkEjVAx9oB2y8FYfZIMMlnpJLduI=";
+    hash = "sha256-pGNlXXggy32vnbbjGNCev8HzUltls1ElGVULPhOwoRQ=";
   };
 
   vendorHash = "sha256-wyxNT8g5TUCjlxauL7NmCf4HZ91V2nD64L1L/rYH864=";

From e59b02bfd901ad1b73f3117d612b52bfe577b601 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 12:56:38 +0000
Subject: [PATCH 27/95] redis-plus-plus: 1.3.13 -> 1.3.14

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

diff --git a/pkgs/by-name/re/redis-plus-plus/package.nix b/pkgs/by-name/re/redis-plus-plus/package.nix
index 656dd94c9249..40cd5a4224e1 100644
--- a/pkgs/by-name/re/redis-plus-plus/package.nix
+++ b/pkgs/by-name/re/redis-plus-plus/package.nix
@@ -13,13 +13,13 @@ assert enableShared || enableStatic;
 
 stdenv.mkDerivation rec {
   pname = "redis-plus-plus";
-  version = "1.3.13";
+  version = "1.3.14";
 
   src = fetchFromGitHub {
     owner = "sewenew";
     repo = "redis-plus-plus";
     rev = version;
-    sha256 = "sha256-bZxs1qnVAkh0BO0CyP1zL/+K3NZYmFy9ryg1QcRLcmg=";
+    sha256 = "sha256-GN+GrV53+JPEbVefH0EXzS1PyGEdQGFcPEctdWOI5uk=";
   };
 
   patches = [

From c19c725b49b88b4c621caf0e2feb94db97d8d4da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 12:59:18 +0000
Subject: [PATCH 28/95] revive: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/by-name/re/revive/package.nix b/pkgs/by-name/re/revive/package.nix
index 615552e00fce..feee185a79e9 100644
--- a/pkgs/by-name/re/revive/package.nix
+++ b/pkgs/by-name/re/revive/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "revive";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "mgechev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-omG3fLsrl8wrfp4EFBYdagKEBn2SRPE/MVrLMs6gGds=";
+    hash = "sha256-lu5zbZXTaLJ5m2sVOG1Y7I/bbJ7kwqbfL1ebwPJ+C0o=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -18,7 +18,7 @@ buildGoModule rec {
       rm -rf $out/.git
     '';
   };
-  vendorHash = "sha256-emR8QR/OYQIWZBMcSU2VzWb5kazSVGGudLAJL9uGDNw=";
+  vendorHash = "sha256-sGvD8CdTFE+TqMjerPSjg7EY9VXPA/EKjY9Ncy+UKTo=";
 
   ldflags = [
     "-s"

From dff382687c5a9e0a159dc40454d665ba2eaf8ce5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 14:54:43 +0000
Subject: [PATCH 29/95] sunxi-tools: 0-unstable-2025-03-07 ->
 0-unstable-2025-03-29

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

diff --git a/pkgs/by-name/su/sunxi-tools/package.nix b/pkgs/by-name/su/sunxi-tools/package.nix
index c6ec1b65cd04..b20be9e00960 100644
--- a/pkgs/by-name/su/sunxi-tools/package.nix
+++ b/pkgs/by-name/su/sunxi-tools/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation {
   pname = "sunxi-tools";
-  version = "0-unstable-2025-03-07";
+  version = "0-unstable-2025-03-29";
 
   src = fetchFromGitHub {
     owner = "linux-sunxi";
     repo = "sunxi-tools";
-    rev = "4390ca668f3b2e62f885edb6952b189c4489d83d";
-    sha256 = "sha256-TwMV+hsbfARrns1ZimYTXNdGS8E9gIal6NqXBzsQjAc=";
+    rev = "7540cb235691be94ac5ef0181a73dd929949fc4e";
+    sha256 = "sha256-bPH63+I+YN6Gvm3Q/zd4RGHEbR4cF1QXJ6v1zwzl89w=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 364dbc6c3d6df74da778f4649828255878da4259 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 15:24:00 +0000
Subject: [PATCH 30/95] python312Packages.pyinstaller-hooks-contrib: 2025.1 ->
 2025.2

---
 .../python-modules/pyinstaller-hooks-contrib/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
index cc45401a6e68..8f0b6e4447d0 100644
--- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pyinstaller-hooks-contrib";
-  version = "2025.1";
+  version = "2025.2";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "pyinstaller_hooks_contrib";
     inherit version;
-    hash = "sha256-EwgY+emgp/ImHx/WYFSWajpQyZ0ACYHF0dsR060MarI=";
+    hash = "sha256-zN1BvDApD3JfPkj0o5mF0RhVr4HWFNFn4wIeMDrLkQI=";
   };
 
   build-system = [ setuptools ];

From f95b89b987240e56aa5924e3ea3fe8841b5295e3 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 18:32:22 +0200
Subject: [PATCH 31/95] electron_33-bin: 33.4.6 -> 33.4.8

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.8
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.6...v33.4.8
- Fixes CVE-2025-2783
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index f371d98ae644..fa5e573bc5f2 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "a7616e1fec12241cde5c130e8e05650d702fa6c6b9c2b3a09790e8adaf4bdb82",
-            "aarch64-linux": "b5754231a5d946526b31f97add5d6c6c6a4e77ea5f25c9b10e02b9b4f03ad926",
-            "armv7l-linux": "5b111adf94d6c7be2983b6704285f298133de2ef770590538bdcc17f55849c73",
-            "headers": "0w86j77zm2fahd6a6p7kwwk6nw07cis7c5zchawpgxhnpc8x8ajb",
-            "x86_64-darwin": "38ec29d9bf6f1f73703a6fd68791f62b8eb84faf7497c741c7fbf7ee8cd9faae",
-            "x86_64-linux": "87082e3dc30598c8e484a1a529736c54e3f7844e8023d3ef7f81924e78b255e8"
+            "aarch64-darwin": "b1425938a053b47bdf1c3c28abd146defb7372a8e645adb0a2f2a9650ca6a36d",
+            "aarch64-linux": "0f7350d2aa0d03b4e57aced4cc921a71fa15a0a5528ee463651771cb415e0381",
+            "armv7l-linux": "153938fe15bf90e2ff6429d1f7db19144b01b8ec12a00a351fdb9fee56c585c3",
+            "headers": "1ji9mxjh2pigx1ldvp6m9ydlkcyvl6mrrpqsbvzvxd2spppzih0d",
+            "x86_64-darwin": "38d247a3540650e21ee8d99a8e07b3c9f40439ad09cc176628adb2af948070f6",
+            "x86_64-linux": "ae5cb348d7697f4acfb6d19dddc4ffc9fae1a687be5bee66684279a82fd8621b"
         },
-        "version": "33.4.6"
+        "version": "33.4.8"
     },
     "34": {
         "hashes": {

From b7e6e2700eb01381019c181fc5e100d40b1fa789 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 18:32:26 +0200
Subject: [PATCH 32/95] electron-chromedriver_33: 33.4.6 -> 33.4.8

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.8
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.6...v33.4.8
- Fixes CVE-2025-2783
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 209e2852d5dc..1178c9a4f220 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "81c9cd7f694e51f0969fc6f265af2676f6ffa7f70cd83f1a774f857a39550fb8",
-            "aarch64-linux": "18aa9643499628a46288945ade422cb7b33b265ef190e805662ff030e1ac4f55",
-            "armv7l-linux": "dcd91ddd204b1f8b435b476b721757ac6db0b1d781cfcc26132a9e9d8fb6a5cf",
-            "headers": "0w86j77zm2fahd6a6p7kwwk6nw07cis7c5zchawpgxhnpc8x8ajb",
-            "x86_64-darwin": "6f1cb522426a4e9b2a9b27097296400bc623e4bc056eb3a4a3bb16cf106ad0de",
-            "x86_64-linux": "44831e32d223c131b8a2f7b88bc127946dc2d700f8f6b4c2252dc6429f68cf4e"
+            "aarch64-darwin": "70fd7d0e788c76f750f50e09ac12956cb2393ae8160f412b48bd32da076d53c4",
+            "aarch64-linux": "e3edec29ac7a4dff69957b7848de324816c68215ba413d5536f934ea3b41c362",
+            "armv7l-linux": "67de15769a70713c7422bd6eb1390f4150e83218e5bdba7409eaaa429c640b1b",
+            "headers": "1ji9mxjh2pigx1ldvp6m9ydlkcyvl6mrrpqsbvzvxd2spppzih0d",
+            "x86_64-darwin": "476d91e836986d49518da86869a2b923417718d8be008ef50738ef5920a995ba",
+            "x86_64-linux": "8109a11081311b94b2fbf38cb9e505857aaf5dbc952cc5d0c2fd6477603084f6"
         },
-        "version": "33.4.6"
+        "version": "33.4.8"
     },
     "34": {
         "hashes": {

From bf664fe5289e18450e8cded3e357f0287f5c02f1 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 18:32:40 +0200
Subject: [PATCH 33/95] electron_34-bin: 34.3.4 -> 34.4.1

- Changelog: https://github.com/electron/electron/releases/tag/v34.4.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.4...v34.4.1
- Fixes CVE-2025-2783
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index fa5e573bc5f2..4897a32068d6 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "4ec82228e960df71a92a21a637b262c9e4686327f321a989f1f2399224fdf560",
-            "aarch64-linux": "f67c92e78e42be738f769ee08b4f5f2c397d94eb1631e21025a96bb93d874d21",
-            "armv7l-linux": "bdf5492b3c3fb86a719a9e10a3fc2537f5d1fa585e263fc168f932f267201bcc",
-            "headers": "1jr209irda0d06w8jwq6lrkadkbbjdq21583s9xvcjafw26cf8dn",
-            "x86_64-darwin": "6c41a7206ad90d703d8f832507bd037adde71c8a44cae2408d96315270b59648",
-            "x86_64-linux": "c2fcfd338300de8c0f38931a7e956d7cea1dcde640ca60490f4a45b986ff368a"
+            "aarch64-darwin": "5a142772493b25ad22dda774a1d4da78887024adae8e83b0e74ad0ba64a7f55a",
+            "aarch64-linux": "d22f1778894393414d7da01aa3f85d6f11f2cb5a5c7623d9d8339bcd824df4cb",
+            "armv7l-linux": "29af72e24c74da70c85bfdce1ed6492b7efbe85f88cfb3da642844b51e5d7259",
+            "headers": "175n6wkz5gyj7plbjbcd6nkhbc108i2ng8ms2wvjya042mshzlqi",
+            "x86_64-darwin": "618156b4c923adcc2bf3d0a81d82dc874f27129893b7b3c349d0ca13651619e8",
+            "x86_64-linux": "18ebcf0d2b681e273eb003ea0d77bb4fb91ed891f39778ad9c22b41972ed1975"
         },
-        "version": "34.3.4"
+        "version": "34.4.1"
     },
     "35": {
         "hashes": {

From 44ad692ad9a47ad53b8b930a54550557d62a74cd Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 18:32:43 +0200
Subject: [PATCH 34/95] electron-chromedriver_34: 34.3.4 -> 34.4.1

- Changelog: https://github.com/electron/electron/releases/tag/v34.4.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.4...v34.4.1
- Fixes CVE-2025-2783
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 1178c9a4f220..8b9b059da22a 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "c1c4fdd66e0a94f5f9b09704e7c95a80f99c8c37d252bf08b2ec52150c9dc2bb",
-            "aarch64-linux": "5396d023255d3a79e807097b428c08a4325ef72be5ab5706dff66cfb996acb3c",
-            "armv7l-linux": "b39bc8cedc2283f4590db715d7a7171fb8dde9bfd1ff95cb34bfa8134a4225da",
-            "headers": "1jr209irda0d06w8jwq6lrkadkbbjdq21583s9xvcjafw26cf8dn",
-            "x86_64-darwin": "64abfaa71689a4a1d6da708935a12f44376a487a0c261b770c176cf7c96d0424",
-            "x86_64-linux": "4af0b47c198213375f822715bfcd09caba03842aba6674274f00c752a3d75a92"
+            "aarch64-darwin": "5b3ba7acb5eabf1a8651322138094ab26d313171f624456cf4b6243c74d35bc4",
+            "aarch64-linux": "1778d1c3903beaa33d75c82cb9b6769f2b303bd75c991f6e55382d916055efd4",
+            "armv7l-linux": "41b9afe8dbe5a0656d6e395ed0d00a26e5e6206a7399768066d91501f181e0d5",
+            "headers": "175n6wkz5gyj7plbjbcd6nkhbc108i2ng8ms2wvjya042mshzlqi",
+            "x86_64-darwin": "e16db516f323e30dc6fd54cac11f72bfdc8fe7852839b55a3609b30fee2318f0",
+            "x86_64-linux": "e49534cc2c68f8aa58df6f1f2c1706b579b54f9ae362dba6a04469c04f1da9f3"
         },
-        "version": "34.3.4"
+        "version": "34.4.1"
     },
     "35": {
         "hashes": {

From 3f0ca819d31e6606830baf7fd6a12b595171401f Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 18:32:54 +0200
Subject: [PATCH 35/95] electron_35-bin: 35.0.3 -> 35.1.2

- Changelog: https://github.com/electron/electron/releases/tag/v35.1.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.0.3...v35.1.2
- Fixes CVE-2025-2783
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 4897a32068d6..bbffce82c458 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "1f4a5d6f43de4a39b45ff2d17e2165b5ac236480eec811e0ff8e8ac78094840c",
-            "aarch64-linux": "b6068824cfe1f69add33320237cb994e2f9630fb568afa5c4dca6e6b74c6f6e0",
-            "armv7l-linux": "187b27a2db6b20fda3b0542670c9b490d246f1b7111fe71c7d6e31b2788042ce",
-            "headers": "0i7x7liv4dwqg4ijlgr3z28s3802hmbz6z56xvlg40jkq4g28j11",
-            "x86_64-darwin": "469d6f90744127e9d53ec0116c0eca94cd6f6d8c74be70b7e7e8251f047f0205",
-            "x86_64-linux": "44504bde889285d5798bd5921de87af492551ab1221be531a678dbb39ad58288"
+            "aarch64-darwin": "ad701bedd2b969eddad8676c8dfa69a21d18896ae58fbd7310a358dd21c7d0eb",
+            "aarch64-linux": "a1a71be2bb826b59a1da726a59895025481ee335896c175fcffdc2fcfc432675",
+            "armv7l-linux": "28186a0edb4e83c9d7afeb32923f26794d26c39f28a3706462a060d4b0e3bc5f",
+            "headers": "1y6d1nygfg6hdcjlzzgdz12hvh8j3xihhg9sg7p6fkmqkll4fyyb",
+            "x86_64-darwin": "858f17d67ea811711802b209d041cfca8caa14e6c8f0960de48df14892a0c632",
+            "x86_64-linux": "ab6d4bceff76a070ebf3264ee516a3f96a040947f462d26ba202aa754e54d852"
         },
-        "version": "35.0.3"
+        "version": "35.1.2"
     }
 }

From f0c56ee777476318668bdc5f4821c730aed3893a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 18:32:57 +0200
Subject: [PATCH 36/95] electron-chromedriver_35: 35.0.3 -> 35.1.2

- Changelog: https://github.com/electron/electron/releases/tag/v35.1.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.0.3...v35.1.2
- Fixes CVE-2025-2783
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 8b9b059da22a..489a70b27547 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "529ef74efb2222618e02a4df3004c21d61f9dfe27a2787b9111a4a00906e260d",
-            "aarch64-linux": "fd3d8ba3e0604cf417e373d06ece9f6abdf925dc42c68bf2a559d512f553a021",
-            "armv7l-linux": "728a7db1e5196e3e6330c424a633219f6f5e8297895f7f13a0971f41e96d9d65",
-            "headers": "0i7x7liv4dwqg4ijlgr3z28s3802hmbz6z56xvlg40jkq4g28j11",
-            "x86_64-darwin": "b36a45a4a70834067d338f7f3e472278c044f7a53522f9367c91ab51dde96902",
-            "x86_64-linux": "39c908639d5a121eb524f3fd4af3c5649f18247ddb7b4ce41438c39ad190eeeb"
+            "aarch64-darwin": "df9ef717c02b38d9f5d85381d2f4f9f7604b74a439bd7998b351c2ba5fed7039",
+            "aarch64-linux": "47bafd3cce09a617b4fea65e6a7a440f2eb15f1419b93c037f52e4b50927922c",
+            "armv7l-linux": "9d95d2685426965c2dab2631ad07b91085967fc98ba9539bca65d2ce189d3574",
+            "headers": "1y6d1nygfg6hdcjlzzgdz12hvh8j3xihhg9sg7p6fkmqkll4fyyb",
+            "x86_64-darwin": "4a1e4b18fc9e7f8903d1041bd43d3b21a589525a83a87ca8a0f77b2615107cb2",
+            "x86_64-linux": "8dca29ef167b7afaaff6737bd1c17312a08b01ebd9fb4b2737491523c4e8a504"
         },
-        "version": "35.0.3"
+        "version": "35.1.2"
     }
 }

From 0675251e31153936850a4fa14e0d864ead39b227 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 18:33:21 +0200
Subject: [PATCH 37/95] electron-source.electron_33: 33.4.6 -> 33.4.8

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.8
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.6...v33.4.8
- Fixes CVE-2025-2783
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 06b9653bf45e..38548b83b8dd 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -47,10 +47,10 @@
             },
             "src/electron": {
                 "fetcher": "fetchFromGitHub",
-                "hash": "sha256-jql2U+pmXqwrCoVdLVhbRD/G49r6lH1IkyI8kYbGC5I=",
+                "hash": "sha256-mvDHVVjrKoeg2E2ucAGTsjnMRDqcrqr3QlDoCmxHQJY=",
                 "owner": "electron",
                 "repo": "electron",
-                "rev": "v33.4.6"
+                "rev": "v33.4.8"
             },
             "src/media/cdm/api": {
                 "fetcher": "fetchFromGitiles",
@@ -950,7 +950,7 @@
         "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8",
         "modules": "130",
         "node": "20.18.3",
-        "version": "33.4.6"
+        "version": "33.4.8"
     },
     "34": {
         "chrome": "132.0.6834.210",

From 06e31c5c89452e6190b5716bfc962432297b85b4 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 18:33:47 +0200
Subject: [PATCH 38/95] electron-source.electron_34: 34.3.4 -> 34.4.1

- Changelog: https://github.com/electron/electron/releases/tag/v34.4.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.4...v34.4.1
- Fixes CVE-2025-2783
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 38548b83b8dd..be738267935e 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1000,10 +1000,10 @@
             },
             "src/electron": {
                 "fetcher": "fetchFromGitHub",
-                "hash": "sha256-8VmE8o0YHV4C8S29ATDBUXvk1mq9VjD3f+iRTkTdyDI=",
+                "hash": "sha256-q4StFkSb6IbTJ7rC2qiKOyEwLCErNuK5r/iSFEmTSYo=",
                 "owner": "electron",
                 "repo": "electron",
-                "rev": "v34.3.4"
+                "rev": "v34.4.1"
             },
             "src/media/cdm/api": {
                 "fetcher": "fetchFromGitiles",
@@ -1915,7 +1915,7 @@
         "electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
         "modules": "132",
         "node": "20.18.3",
-        "version": "34.3.4"
+        "version": "34.4.1"
     },
     "35": {
         "chrome": "134.0.6998.88",

From 2ca5fa4a3f3d968fad0149759cb55cd690dda775 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 30 Mar 2025 18:43:13 +0200
Subject: [PATCH 39/95] electron-source.electron_35: 35.0.3 -> 35.1.2

- Changelog: https://github.com/electron/electron/releases/tag/v35.1.2
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.0.3...v35.1.2
- Fixes CVE-2025-2783
---
 pkgs/development/tools/electron/info.json | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index be738267935e..230d05651108 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1918,7 +1918,7 @@
         "version": "34.4.1"
     },
     "35": {
-        "chrome": "134.0.6998.88",
+        "chrome": "134.0.6998.178",
         "chromium": {
             "deps": {
                 "gn": {
@@ -1928,15 +1928,15 @@
                     "version": "2025-01-13"
                 }
             },
-            "version": "134.0.6998.88"
+            "version": "134.0.6998.178"
         },
         "chromium_npm_hash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=",
         "deps": {
             "src": {
                 "fetcher": "fetchFromGitiles",
-                "hash": "sha256-PRANW/xQKaboL2RuFXuKf/nNt5alTjmgc+aXjR24lMs=",
+                "hash": "sha256-9oFVt+a34Zes3fivgmqRprKPBMjvXWVxfA2J1Q9QWPU=",
                 "postFetch": "rm -r $out/third_party/blink/web_tests; rm -rf $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                "rev": "134.0.6998.88",
+                "rev": "134.0.6998.178",
                 "url": "https://chromium.googlesource.com/chromium/src.git"
             },
             "src/chrome/test/data/perf/canvas_bench": {
@@ -1965,10 +1965,10 @@
             },
             "src/electron": {
                 "fetcher": "fetchFromGitHub",
-                "hash": "sha256-pk3vmQUlHfcucwB0RowxQh+9Iakxbty4ogfUeuvp5Ow=",
+                "hash": "sha256-30Y/IhEyoFFXdhe94WP7wBLEsNRvZRs1I7tXSPYWI4Y=",
                 "owner": "electron",
                 "repo": "electron",
-                "rev": "v35.0.3"
+                "rev": "v35.1.2"
             },
             "src/media/cdm/api": {
                 "fetcher": "fetchFromGitiles",
@@ -2352,8 +2352,8 @@
             },
             "src/third_party/icu": {
                 "fetcher": "fetchFromGitiles",
-                "hash": "sha256-O9qrAt8lwNBg5LCVz+SfTe48uJx8onVYwn0LRXIhUvY=",
-                "rev": "bbccc2f6efc1b825de5f2c903c48be685cd0cf22",
+                "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=",
+                "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b",
                 "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
             },
             "src/third_party/ink/src": {
@@ -2653,8 +2653,8 @@
             },
             "src/third_party/skia": {
                 "fetcher": "fetchFromGitiles",
-                "hash": "sha256-Y0KtUKn6DxpxVLRM+jPvUPhPzekTAma1HYs27xlJlkw=",
-                "rev": "fb519f2fe5d4409bc0033a4ae00ab9a7095fe566",
+                "hash": "sha256-tP6DnMeOoVqfTSn6bYXMLiCb4wg5f9uB28KzYMAeBUw=",
+                "rev": "aefbd9403c1b3032ad4cd0281ef312ed262c7125",
                 "url": "https://skia.googlesource.com/skia.git"
             },
             "src/third_party/smhasher/src": {
@@ -2896,14 +2896,14 @@
             },
             "src/v8": {
                 "fetcher": "fetchFromGitiles",
-                "hash": "sha256-IE1X6lfMyoXsN+7ebJ3RWXAgpR98AjituL3faQbNag0=",
-                "rev": "a57459aad9ec3ed5f78d9ded700d52e31029efd2",
+                "hash": "sha256-wpz9W/ZurpCT/dGIHGpmdkI3dsXbP8TPNeee2w9zBU8=",
+                "rev": "4f282ae4acae85cdcc8c167cbc296a86d24c1cf6",
                 "url": "https://chromium.googlesource.com/v8/v8.git"
             }
         },
         "electron_yarn_hash": "0l38rbmlrcrgkw7ggj33xszcs7arm601gzq4c8v0rn3m5zp6yr77",
         "modules": "133",
         "node": "22.14.0",
-        "version": "35.0.3"
+        "version": "35.1.2"
     }
 }

From 30409918667afca754971e04a4adb0ce90bf0c99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 19:56:14 +0000
Subject: [PATCH 40/95] fdupes: 2.3.2 -> 2.4.0

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

diff --git a/pkgs/by-name/fd/fdupes/package.nix b/pkgs/by-name/fd/fdupes/package.nix
index c0052c2889d8..83e336b07d8f 100644
--- a/pkgs/by-name/fd/fdupes/package.nix
+++ b/pkgs/by-name/fd/fdupes/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fdupes";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "adrianlopezroche";
     repo = "fdupes";
     rev = "v${version}";
-    hash = "sha256-VPaNDKUgaJRF75cxksK0nZNFarqhat7n8ztIdBoxHI8=";
+    hash = "sha256-epregz+i2mML5zCQErQDJFUFUxnUoqcBlUPGPJ4tcmc=";
   };
 
   nativeBuildInputs = [

From 1791347c19a1c5277fc7a466fb07cb0fc2850529 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 24 Mar 2025 16:12:51 -0700
Subject: [PATCH 41/95] python3Packages.langchain*: fix bulk update script

---
 .../python-modules/langchain-core/default.nix | 11 ++---
 .../python-modules/langchain-core/update.sh   | 46 +++++++++++++++++++
 .../langchain-tests/default.nix               |  8 +---
 .../python-modules/langchain/default.nix      |  4 +-
 4 files changed, 53 insertions(+), 16 deletions(-)
 create mode 100755 pkgs/development/python-modules/langchain-core/update.sh

diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 411e0ed3b329..bf00fa2feba1 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -28,9 +28,6 @@
   pytest-xdist,
   pytestCheckHook,
   syrupy,
-
-  # passthru
-  nix-update-script,
 }:
 
 buildPythonPackage rec {
@@ -95,11 +92,9 @@ buildPythonPackage rec {
       doCheck = true;
     });
 
-    updateScript = nix-update-script {
-      extraArgs = [
-        "--version-regex"
-        "^langchain-core==([0-9.]+)$"
-      ];
+    updateScript = {
+       command = [./update.sh ];
+       supportedFeatures = [ "commit"];
     };
   };
 
diff --git a/pkgs/development/python-modules/langchain-core/update.sh b/pkgs/development/python-modules/langchain-core/update.sh
new file mode 100755
index 000000000000..5568df95e43b
--- /dev/null
+++ b/pkgs/development/python-modules/langchain-core/update.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p common-updater-scripts jq
+
+set -euo pipefail
+
+declare -ar packages=(
+    langchain
+    langchain-azure-dynamic-sessions
+    langchain-chroma
+    langchain-community
+    langchain-core
+    langchain-groq
+    langchain-huggingface
+    langchain-mongodb
+    langchain-ollama
+    langchain-openai
+    langchain-tests
+    langchain-text-splitters
+)
+
+tags=$(git ls-remote --tags --refs "https://github.com/langchain-ai/langchain" | cut --delimiter=/ --field=3-)
+
+# Will be printed as JSON at the end to list what  needs updating
+updates=""
+
+for package in ${packages[@]}
+do
+    pyPackage="python3Packages.$package"
+    oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion $pyPackage" | tr -d '"')"
+    newVersion=$(echo "$tags" | grep -Po "(?<=$package==)\d+\.\d+\.\d+$" | sort --version-sort --reverse | head -1 )
+    if [[ "$newVersion" != "$oldVersion" ]]; then
+        update-source-version $pyPackage "$newVersion"
+        updates+="{
+    \"attrPath\": \"$pyPackage\",
+    \"oldVersion\": \"$oldVersion\",
+    \"newVersion\": \"$newVersion\",
+    \"files\": [
+        \"$PWD/pkgs/development/python-modules/${package}/default.nix\"
+    ]
+},"
+    fi
+done
+# Remove trailing comma
+updates=${updates%,}
+# Print the updates in JSON format
+echo "[ $updates ]"
diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index b4f9ee35cca7..d10262e35bd1 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  nix-update-script,
 
   # build-system
   pdm-backend,
@@ -62,11 +61,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--version-regex"
-      "^langchain-tests==([0-9.]+)$"
-    ];
+  passthru = {
+    inherit (langchain-core) updateScript;
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index d9a8c52f5e07..92a4c7d67001 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "langchain";
-  version = "0.3.20";
+  version = "0.3.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain==${version}";
-    hash = "sha256-N209wUGdlHkOZynhSSE+ZHylL7cK+8H3PfZIG/wvMd0=";
+    hash = "sha256-Up/pH2TxLPiPO49oIa2ZlNeH3TyN9sZSlNsqOIRmlxc=";
   };
 
   sourceRoot = "${src.name}/libs/langchain";

From fc298fadd1a58012a78f50fef86ce533e82710f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Mar 2025 20:15:46 +0000
Subject: [PATCH 42/95] esbuild: 0.25.1 -> 0.25.2

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

diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index 15fd950d5206..05563a439981 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "esbuild";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchFromGitHub {
     owner = "evanw";
     repo = "esbuild";
     rev = "v${version}";
-    hash = "sha256-vrhtdrvrcC3dQoJM6hWq6wrGJLSiVww/CNPlL1N5kQ8=";
+    hash = "sha256-aDxheDMeQYqCT9XO3In6RbmzmXVchn+bjgf3nL3VE4I=";
   };
 
   vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

From 123e789d815155f68459e8bac1958afd3d9414c2 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sun, 30 Mar 2025 16:34:52 -0700
Subject: [PATCH 43/95] python3Packages.langchain-text-splitters: 0.3.6 ->
 0.3.7

---
 .../python-modules/langchain-text-splitters/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix
index 4bcfcf159414..e15c3e6e30a1 100644
--- a/pkgs/development/python-modules/langchain-text-splitters/default.nix
+++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-text-splitters";
-  version = "0.3.6";
+  version = "0.3.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-text-splitters==${version}";
-    hash = "sha256-mYaIVE/v+t7TJw/l87IJcFh893OTIew6jl6OVj0gXCo=";
+    hash = "sha256-tIX1nxmXU3xhJuM2Q3Tm4fbCoJwI0A8+G1aSyLcoNo0=";
   };
 
   sourceRoot = "${src.name}/libs/text-splitters";

From ed61cea3d9b8d03e552c5cc14ae207bbf402cbbc Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sun, 30 Mar 2025 20:25:38 +0000
Subject: [PATCH 44/95] python3Packages.langchain-community: 0.3.19 -> 0.3.20

---
 .../python-modules/langchain-community/default.nix       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix
index 1652b899434b..56eba2b3cb10 100644
--- a/pkgs/development/python-modules/langchain-community/default.nix
+++ b/pkgs/development/python-modules/langchain-community/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-community";
-  version = "0.3.19";
+  version = "0.3.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-community==${version}";
-    hash = "sha256-U7L60GyxRQL9ze22Wy7g6ZdI/IFyAtUe1bRCconv6pg=";
+    hash = "sha256-6YLy7G1kZIqHAGMUIQoGCfDO2ZuVgNEtpkOI1o8eFvc=";
   };
 
   sourceRoot = "${src.name}/libs/community";
@@ -122,6 +122,11 @@ buildPythonPackage rec {
     "test_group_dependencies"
   ];
 
+  disabledTestPaths = [
+    # ValueError: Received unsupported arguments {'strict': None}
+    "tests/unit_tests/chat_models/test_cloudflare_workersai.py"
+  ];
+
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"

From dd676362e406f297c9af6c55606a81a20e2e0ac8 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sun, 30 Mar 2025 16:31:11 -0700
Subject: [PATCH 45/95] python3Packages.langchain-core: 0.3.47 -> 0.3.49

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

diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index bf00fa2feba1..0903e6d2d509 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-core";
-  version = "0.3.47";
+  version = "0.3.49";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-core==${version}";
-    hash = "sha256-UUsT8RvBK4TJNrAwXjv/LPzHrgTEoSewUb+8pHG6Xa8=";
+    hash = "sha256-s1vZ7G6Wzywf3euwX/RdCPkgzxvZTYVG0udGpHTIiQc=";
   };
 
   sourceRoot = "${src.name}/libs/core";
@@ -93,8 +93,8 @@ buildPythonPackage rec {
     });
 
     updateScript = {
-       command = [./update.sh ];
-       supportedFeatures = [ "commit"];
+      command = [ ./update.sh ];
+      supportedFeatures = [ "commit" ];
     };
   };
 

From c241ec4456e6081b6d7e449fe83b3287146a7457 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sun, 30 Mar 2025 16:31:31 -0700
Subject: [PATCH 46/95]  python3Packages.langchain-ollama: 0.2.3 -> 0.3.0

---
 .../python-modules/langchain-ollama/default.nix        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix
index b3f6baf00161..149091e699c6 100644
--- a/pkgs/development/python-modules/langchain-ollama/default.nix
+++ b/pkgs/development/python-modules/langchain-ollama/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
 
   # build-system
+  pdm-backend,
   poetry-core,
 
   # dependencies
@@ -21,19 +22,22 @@
 
 buildPythonPackage rec {
   pname = "langchain-ollama";
-  version = "0.2.3";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-ollama==${version}";
-    hash = "sha256-G7faykRlpfmafSnSe/CdPW87uCtofBp7mLzbxZgBBhM=";
+    hash = "sha256-KsQV2jM2rXbFg+ZlDnpw8sD3Nm8C37BWo+DkDTaMDtQ=";
   };
 
   sourceRoot = "${src.name}/libs/partners/ollama";
 
-  build-system = [ poetry-core ];
+  build-system = [
+    pdm-backend
+    poetry-core
+  ];
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.

From 9b0a483d0e29469768075af19a27c740ed873332 Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sun, 30 Mar 2025 16:32:06 -0700
Subject: [PATCH 47/95] python3Packages.langchain-openai: 0.3.8 -> 0.3.11

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

diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix
index 8a44d9cb0c44..cdb4d9c64e3d 100644
--- a/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/pkgs/development/python-modules/langchain-openai/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-openai";
-  version = "0.3.8";
+  version = "0.3.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-openai==${version}";
-    hash = "sha256-ooqIUHel/tAI0jNI/j7OXD9ytAH3pXQ3QN5YMhFt2ac=";
+    hash = "sha256-yIYVRn9IHjxBSxnBOTayYrIxw8ZbAeuawu3gKk9gA0M=";
   };
 
   sourceRoot = "${src.name}/libs/partners/openai";

From 6076c38569d245ac9291c74359952bb4f89f36ca Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sun, 30 Mar 2025 16:32:36 -0700
Subject: [PATCH 48/95] python3Packages.langchain-tests: 0.3.13 -> 0.3.17

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

diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index d10262e35bd1..77ef7dcac9f3 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-tests";
-  version = "0.3.13";
+  version = "0.3.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-tests==${version}";
-    hash = "sha256-N209wUGdlHkOZynhSSE+ZHylL7cK+8H3PfZIG/wvMd0=";
+    hash = "sha256-jhdCpZsRvCxDIfaZpdqAdx+rxJTU6QHDgNKc4w7XmR8=";
   };
 
   sourceRoot = "${src.name}/libs/standard-tests";

From fcc73ad69eb7803633712dd616c5c218f13dccbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 02:48:34 +0000
Subject: [PATCH 49/95] lunatask: 2.0.18 -> 2.0.19

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

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index 5744f6862267..412385bf625e 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -6,12 +6,12 @@
 }:
 
 let
-  version = "2.0.18";
+  version = "2.0.19";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
-    hash = "sha256-tBkJGB6sKDXzgmt4wTVRVboIbeRK75XK1MJxov6WJio=";
+    hash = "sha256-JJyGpVak0bBouvFduD5mWna0QlUwQ898HGdnL7fGvPA=";
   };
 
   appimageContents = appimageTools.extract {

From db1bd4fcfee22920e13ac73513fb3c3796b202cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 04:56:43 +0000
Subject: [PATCH 50/95] terraform-providers.spotinst: 1.213.1 -> 1.216.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 081c81edef7b..7a70acb8cbac 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1228,13 +1228,13 @@
     "vendorHash": "sha256-oEamCseBGmETqeBLiBHfh81oQNUHWfTrsegkFijvb20="
   },
   "spotinst": {
-    "hash": "sha256-2y7fPIz+4L4Hz2s52yOGqVAT7W8k0bgtr1ypl1i0InE=",
+    "hash": "sha256-tTU9+4wxSMSWmmeuSpS60FSuzg9BH6ylEaywLB9LwQc=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.213.1",
+    "rev": "v1.216.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-xvA7znqcCESUOsNGaik2xHeZNSV70VQww31sQGhEvm0="
+    "vendorHash": "sha256-STIPYBMj6r630/J71fAeLTkrvop/8u7gToGcijopqCo="
   },
   "ssh": {
     "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",

From aa4ea35ccbc12a408dab4831c6c61a4f39d38442 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 05:37:38 +0000
Subject: [PATCH 51/95] ginkgo: 2.23.1 -> 2.23.3

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

diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix
index b7403ce96b37..0e852265f0db 100644
--- a/pkgs/by-name/gi/ginkgo/package.nix
+++ b/pkgs/by-name/gi/ginkgo/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "ginkgo";
-  version = "2.23.1";
+  version = "2.23.3";
 
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
     rev = "v${version}";
-    sha256 = "sha256-yQnkKh5RXzUIff4gSKDo79GZuRvjkT1vK0IUbvKdVjk=";
+    sha256 = "sha256-lDSw4BPYZ5wOuaoUtSSkdbcOpKAEuLsSwldrASpM6mA=";
   };
   vendorHash = "sha256-uqpib3k5PtQOsndic0GV1rYBeVlY5Tpg931yHfU6dWI=";
 

From 26c6f178e1fd79570c1bdae7c00e010c717cc603 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 06:23:17 +0000
Subject: [PATCH 52/95] grafana-alloy: 1.7.4 -> 1.7.5

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

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index 19f9cbed4179..84383c352580 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -17,13 +17,13 @@
 
 buildGoModule rec {
   pname = "grafana-alloy";
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "alloy";
     tag = "v${version}";
-    hash = "sha256-vMNh7tvRYGJRRWcLePBbNlUU2qVNtKhOSwsfB1dWWRA=";
+    hash = "sha256-4JfzjeF654+Q4Hc/0P08minpSJX3mO/p8EOeHUCKu6A=";
   };
 
   proxyVendor = true;

From 7d90b3e7f8133a7a5e31a361f055447e1c942a1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 06:27:52 +0000
Subject: [PATCH 53/95] mpvScripts.mpvacious: 0.38 -> 0.39

---
 pkgs/applications/video/mpv/scripts/mpvacious.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix
index 5ed2019d4c03..a6a00283129e 100644
--- a/pkgs/applications/video/mpv/scripts/mpvacious.nix
+++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix
@@ -10,13 +10,13 @@
 
 buildLua rec {
   pname = "mpvacious";
-  version = "0.38";
+  version = "0.39";
 
   src = fetchFromGitHub {
     owner = "Ajatt-Tools";
     repo = "mpvacious";
     rev = "v${version}";
-    sha256 = "sha256-x0ZljJSNlkIszUJy2FUCZMd6Vud08YnCJs7DmT4o/fA=";
+    sha256 = "sha256-8E/EGIePK5siCchZPL81XMgspvNaRunqiLVU/J3nsmI=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 

From fa0769bf6d41fc884c1b2bfee5fb5391245d8e82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 07:26:01 +0000
Subject: [PATCH 54/95] kubectl-view-secret: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/by-name/ku/kubectl-view-secret/package.nix b/pkgs/by-name/ku/kubectl-view-secret/package.nix
index dedb3a5dc1d8..63df059f6cb3 100644
--- a/pkgs/by-name/ku/kubectl-view-secret/package.nix
+++ b/pkgs/by-name/ku/kubectl-view-secret/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubectl-view-secret";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "elsesiy";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-mdooeKlwoPxiAHaOuhMF+Zx1l0uZ1OYMgDADI7JbYDc=";
+    hash = "sha256-l7pyS3eQDETrGCN7+Q0xhm+9Ocpk+qxTNMu4SMq+IDU=";
   };
 
-  vendorHash = "sha256-5mSS7UWfdk28oXk/ONnnjj4OMGJAtH26xGES4NGZuTc=";
+  vendorHash = "sha256-XtQkAgmnXNKHHjFtZN8Ht/C/aH2mPOeHk7azihehzsc=";
 
   subPackages = [ "./cmd/" ];
 

From ce8f18df87d6600a65d97de15fe98a19bad170f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 07:32:13 +0000
Subject: [PATCH 55/95] mackerel-agent: 0.84.1 -> 0.84.2

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

diff --git a/pkgs/by-name/ma/mackerel-agent/package.nix b/pkgs/by-name/ma/mackerel-agent/package.nix
index e66666edd4db..f8579fb30f36 100644
--- a/pkgs/by-name/ma/mackerel-agent/package.nix
+++ b/pkgs/by-name/ma/mackerel-agent/package.nix
@@ -10,20 +10,20 @@
 
 buildGoModule rec {
   pname = "mackerel-agent";
-  version = "0.84.1";
+  version = "0.84.2";
 
   src = fetchFromGitHub {
     owner = "mackerelio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-gBpqBmqq9c37JzKwJKZZxP67BFWISZgVm5Vp8v+D3K0=";
+    sha256 = "sha256-sh5hbhWlyu70Wm2zTQeKiQr/nYi6bG4g6a/yvEnd/DU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ nettools ];
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ iproute2 ];
 
-  vendorHash = "sha256-DPxkZp46AsUiThQC9OwL24uKfJrUhgo8IvvE4fLo1yg=";
+  vendorHash = "sha256-2JpI67HkhNJcFTuveHSgsqmmHhWOjHC0f0dK0tOjwIc=";
 
   subPackages = [ "." ];
 

From e000d4e4953bb399b00cba0d2a96677febd5b1f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 07:49:08 +0000
Subject: [PATCH 56/95] terraform-providers.sumologic: 3.0.6 -> 3.0.7

---
 .../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 081c81edef7b..630c8cadea55 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1264,11 +1264,11 @@
     "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
   },
   "sumologic": {
-    "hash": "sha256-bjOyxgdEAfd98OvjWT8pQrrqEcmDp0qeQ7gitvTdLVA=",
+    "hash": "sha256-x7TN3UrvW3/0MnvmJEQp9z/2qUe2yX21hk0V9/nZUF0=",
     "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
     "owner": "SumoLogic",
     "repo": "terraform-provider-sumologic",
-    "rev": "v3.0.6",
+    "rev": "v3.0.7",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE="
   },

From 5fa2e1152ec13d8b06a4d3afeb693329cd52a142 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 08:12:51 +0000
Subject: [PATCH 57/95] v2raya: 2.2.6.6 -> 2.2.6.7

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

diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix
index 5ec5a2eddecb..78ab7fab6286 100644
--- a/pkgs/by-name/v2/v2raya/package.nix
+++ b/pkgs/by-name/v2/v2raya/package.nix
@@ -18,13 +18,13 @@
 }:
 let
   pname = "v2raya";
-  version = "2.2.6.6";
+  version = "2.2.6.7";
 
   src = fetchFromGitHub {
     owner = "v2rayA";
     repo = "v2rayA";
     tag = "v${version}";
-    hash = "sha256-OXydUg9prJ3Rc5yecEqHfv+kyx/rMzzDQdz+lHvPG6k=";
+    hash = "sha256-UnA7+DJEzWekPhNhwNcnJ6Carx6IoExauZRjsfWBERM=";
     postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock";
   };
 

From 9adf6e599ce353a3171a6466d75d779048ab2be2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 31 Mar 2025 10:30:13 +0200
Subject: [PATCH 58/95] gnat-bootstrap12: restrict platforms

---
 pkgs/development/compilers/gnat-bootstrap/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix
index f69a58fdfada..660168e62c7b 100644
--- a/pkgs/development/compilers/gnat-bootstrap/default.nix
+++ b/pkgs/development/compilers/gnat-bootstrap/default.nix
@@ -197,7 +197,8 @@ in {
     homepage = "https://www.gnu.org/software/gnat";
     license = licenses.gpl3;
     maintainers = with maintainers; [ ethindp ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ]
+      ++ lib.optionals (lib.versionAtLeast majorVersion "14") [ "aarch64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })

From 859e0c965572c191648eb95d8f9c35239f8b1828 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 08:37:27 +0000
Subject: [PATCH 59/95] git-aggregator: 4.0.2 -> 4.1

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

diff --git a/pkgs/by-name/gi/git-aggregator/package.nix b/pkgs/by-name/gi/git-aggregator/package.nix
index bb0fcabe04da..39cbf1e3cc01 100644
--- a/pkgs/by-name/gi/git-aggregator/package.nix
+++ b/pkgs/by-name/gi/git-aggregator/package.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "git-aggregator";
-  version = "4.0.2";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "acsone";
     repo = "git-aggregator";
     tag = version;
-    hash = "sha256-6o+bf3s5KyRQWA7hp3xk76AfxBdzP0lOBOozgwe3Wtw=";
+    hash = "sha256-sZYh3CN15WTCQ59W24ERJdP48EJt571cbkswLQ3JL2g=";
   };
 
   nativeBuildInputs = with python3Packages; [

From a04a6c768e33bcb811e652f85a69db1aa6029beb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 09:23:16 +0000
Subject: [PATCH 60/95] lxgw-neoxihei: 1.215 -> 1.216.1

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

diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
index 29fe3021d192..99678ed26fc5 100644
--- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix
+++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.215";
+  version = "1.216.1";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-aBmPFLc2gkf+1bI85GPrOVmFjgcCyvXd//OPbKhxVQM=";
+    hash = "sha256-wwsCGSZy/WB7QBbRams06DGA6oypsPKTN0TGYlX3jQM=";
   };
 
   dontUnpack = true;

From 98ebf83b89f18ed639381b14c14772db4714225e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 10:12:03 +0000
Subject: [PATCH 61/95] terraform-providers.acme: 2.30.2 -> 2.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 081c81edef7b..fdca60acc967 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -9,13 +9,13 @@
     "vendorHash": null
   },
   "acme": {
-    "hash": "sha256-bHx997DT7JhL0bc9Z62KwShlaqKmuyQsGI1d5X7XoxE=",
+    "hash": "sha256-0iFJ6+7IpEExvjiC301PaVHWUuxqPlYjkMzwDJ1BzQo=",
     "homepage": "https://registry.terraform.io/providers/vancluever/acme",
     "owner": "vancluever",
     "repo": "terraform-provider-acme",
-    "rev": "v2.30.2",
+    "rev": "v2.31.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Opxhz3ymrDLe/1FhiCPXkzpvC/fSQA+PD+nuL/f2rPo="
+    "vendorHash": "sha256-P3yrAfuYvN/sapQGj6fBYQtsScacIJW6JLBq+MOJlVc="
   },
   "age": {
     "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",

From b9d27a3bb509192e12b9618020c700d8e08977b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 11:19:20 +0000
Subject: [PATCH 62/95] kuma: 2.10.0 -> 2.10.1

---
 pkgs/applications/networking/cluster/kuma/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix
index 97a8b6ea77cd..aacfe394ac61 100644
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/applications/networking/cluster/kuma/default.nix
@@ -15,17 +15,17 @@
 
 buildGoModule rec {
   inherit pname;
-  version = "2.10.0";
+  version = "2.10.1";
   tags = lib.optionals enableGateway [ "gateway" ];
 
   src = fetchFromGitHub {
     owner = "kumahq";
     repo = "kuma";
     rev = version;
-    hash = "sha256-lxXD+q8EyBo4HdP+JjyVMiVPOwt1Y+EGxq9GDEEw2I4=";
+    hash = "sha256-7vRz2B1aSxpQrV7Om8Zs4o1kJgSVd9rMsOagQZyWMLI=";
   };
 
-  vendorHash = "sha256-/mIiK95UIWszYK3YlhLJRpjgUaFO/pfIogLKLvjAAsk=";
+  vendorHash = "sha256-1vI61lfs9R9aY1vFQUxXN99zE1SPSfPQ8RxWxykqqp0=";
 
   # no test files
   doCheck = false;

From 06298d1e344fe5a2fa5f0373036c6e631dbe6097 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 11:22:42 +0000
Subject: [PATCH 63/95] mint: 0.23.1 -> 0.23.2

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

diff --git a/pkgs/by-name/mi/mint/package.nix b/pkgs/by-name/mi/mint/package.nix
index 208d2bcdc0ef..17b994f0b53e 100644
--- a/pkgs/by-name/mi/mint/package.nix
+++ b/pkgs/by-name/mi/mint/package.nix
@@ -8,13 +8,13 @@
 
 crystal.buildCrystalPackage rec {
   pname = "mint";
-  version = "0.23.1";
+  version = "0.23.2";
 
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
     rev = version;
-    hash = "sha256-oSDg/tOdF/nk164jl7OZOINNWfAZmjAT/HFFFJNr3pk=";
+    hash = "sha256-cPx0/BrD2w7LlH5xO9hKlHndNmVm8jpN7cti5/eZ1m4=";
   };
 
   format = "shards";

From 13b177e67acee32e570705441d99879b9b14c7eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 11:33:36 +0000
Subject: [PATCH 64/95] vacuum-go: 0.16.4 -> 0.16.5

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

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 32f0993d4eb2..c5da16a18cfd 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule rec {
   pname = "vacuum-go";
-  version = "0.16.4";
+  version = "0.16.5";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${version}";
-    hash = "sha256-7nVDKR2H84SW6s97jgShylcc1degLzkjkeldlGBcQ/o=";
+    hash = "sha256-r42bmY7wmEjA2Q/k8czyyNpU59a4z6vxeCnIfMkMScg=";
   };
 
   vendorHash = "sha256-1lr1VQU4JHg0PZbjAUmALFZJiYc+HTwrk0E/t/1qXqE=";

From dcf592b94dfa92e6d228eaf8b7886d1570f689d6 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Mon, 31 Mar 2025 12:30:00 +0200
Subject: [PATCH 65/95] gitmux: use finalAttrs pattern

---
 .../version-management/gitmux/default.nix          | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix
index b3c1189fe3d1..148e26cae34f 100644
--- a/pkgs/applications/version-management/gitmux/default.nix
+++ b/pkgs/applications/version-management/gitmux/default.nix
@@ -3,30 +3,28 @@
   buildGoModule,
   lib,
   testers,
-  gitmux,
   git,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gitmux";
   version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "arl";
-    repo = pname;
-    rev = "v${version}";
+    repo = "gitmux";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-0Cw98hTg8qPu7BUTBDEgFBOpoCxstPW9HeNXQUUjgGA=";
   };
 
   vendorHash = "sha256-PHY020MIuLlC1LqNGyBJRNd7J+SzoHbNMPAil7CKP/M=";
 
   nativeCheckInputs = [ git ];
-  doCheck = true;
 
-  ldflags = [ "-X main.version=${version}" ];
+  ldflags = [ "-X main.version=${finalAttrs.version}" ];
 
   passthru.tests.version = testers.testVersion {
-    package = gitmux;
+    package = finalAttrs.finalPackage;
     command = "gitmux -V";
   };
 
@@ -39,4 +37,4 @@ buildGoModule rec {
     maintainers = with maintainers; [ nialov ];
     mainProgram = "gitmux";
   };
-}
+})

From 367ce324583edb6f07c007157932eb89515d5578 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 11:48:09 +0000
Subject: [PATCH 66/95] python312Packages.types-psycopg2: 2.9.21.20250121 ->
 2.9.21.20250318

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

diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix
index 31c8d6091516..aacf54b5a919 100644
--- a/pkgs/development/python-modules/types-psycopg2/default.nix
+++ b/pkgs/development/python-modules/types-psycopg2/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-psycopg2";
-  version = "2.9.21.20250121";
+  version = "2.9.21.20250318";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_psycopg2";
     inherit version;
-    hash = "sha256-Kw4s0PN0evGuJacCeJhxbYAglgR3DvPL81D+BVucNJs=";
+    hash = "sha256-626sW/sWrf1fFrgYkYueJqQO3hR+Dyu//fU6bvcCWoc=";
   };
 
   build-system = [ setuptools ];

From 4c0841bb6545cce071abee4b4b6ae63425b1000f Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 31 Mar 2025 13:56:47 +0200
Subject: [PATCH 67/95] buteo-syncfw: 0.11.9 -> 0.11.10

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

diff --git a/pkgs/by-name/bu/buteo-syncfw/package.nix b/pkgs/by-name/bu/buteo-syncfw/package.nix
index d84e72b4baca..3b23742a09eb 100644
--- a/pkgs/by-name/bu/buteo-syncfw/package.nix
+++ b/pkgs/by-name/bu/buteo-syncfw/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "buteo-syncfw";
-  version = "0.11.9";
+  version = "0.11.10";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "sailfishos";
     repo = "buteo-syncfw";
     tag = finalAttrs.version;
-    hash = "sha256-4dQl+ghkedYOqFaaY2XYlA59lYtkHCgZXhmyo4dHMsI=";
+    hash = "sha256-WZ70dFrQeHO0c9MM3wS8aWMd0DDhTW9Ks4hhw7pPmu8=";
   };
 
   postPatch = ''

From cfa994edfb90b15fcea17c988260ec4fd83d8ea4 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Mon, 31 Mar 2025 14:01:55 +0200
Subject: [PATCH 68/95] reposilite: 3.5.22 -> 3.5.23

---
 pkgs/by-name/re/reposilite/package.nix  |  4 ++--
 pkgs/by-name/re/reposilite/plugins.json | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix
index ca5bd30a0010..0cdb557714ca 100644
--- a/pkgs/by-name/re/reposilite/package.nix
+++ b/pkgs/by-name/re/reposilite/package.nix
@@ -17,11 +17,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "Reposilite";
-  version = "3.5.22";
+  version = "3.5.23";
 
   src = fetchurl {
     url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
-    hash = "sha256-6wrvV4o81Y5nO3i0mRS/ERgNG3IqH95VdrJEYOm0z3E=";
+    hash = "sha256-7DNl0u2iYAlqhflJCIppy8huMKtFjjyRJzUPcWHoRnE=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/re/reposilite/plugins.json b/pkgs/by-name/re/reposilite/plugins.json
index 53db0ae00a73..0bbd0cde2419 100644
--- a/pkgs/by-name/re/reposilite/plugins.json
+++ b/pkgs/by-name/re/reposilite/plugins.json
@@ -1,7 +1,7 @@
 {
-  "checksum": "sha256-Esxe2RBeJla2o8qLT5bLSLGCtsakM5nKk2rTd+eOleE=",
-  "groovy": "sha256-Jt2LX9P9PMOY6An2k73CNKbQ8Zi/8wz0a4YTsRS7v7E=",
-  "migration": "sha256-j71SqHQZN6O1fmbCLqqyBL58bGe6WQf0brjRgGEEW+c=",
-  "prometheus": "sha256-AjwuA58XutkCJK4/b44CSNS3GAM6GZKkAlvVwBEF93k=",
-  "swagger": "sha256-I4I3PCgAUYbUlJHLj6yb+3UME+G8/5+EaUXG4HbMS58="
+  "checksum": "sha256-k470nI1rGZJcUVETG3bmjqdvjkzeVM0OVWhONM6nJL8=",
+  "groovy": "sha256-8LjYnoXaEYmedWUPgqfDGVORQnpoDn5um02KWtkTjak=",
+  "migration": "sha256-T/n14xWA+YPZEDaybybtFiqcdE/I7SY/llvhwL+9JZU=",
+  "prometheus": "sha256-BChuSWSwPpwAA5jA9Lf4LsAGNA6uFlVqFNy7h9biZ9Q=",
+  "swagger": "sha256-uL3e85p1xk265xiNzDoxY62GPbp7qCummEMxXzKUn5Q="
 }

From 7d02bb4882d1c52694ce190c445e2cd112df85a8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 31 Mar 2025 11:09:25 +0200
Subject: [PATCH 69/95] databricks-cli: 0.244.0 -> 0.245.0

Diff: https://github.com/databricks/cli/compare/v0.244.0...v0.245.0

Changelog: https://github.com/databricks/cli/releases/tag/v0.245.0
---
 pkgs/by-name/da/databricks-cli/package.nix | 45 +++++++++++++++++-----
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index c443c30e51ec..c339d01ea28d 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -4,20 +4,28 @@
   fetchFromGitHub,
   gitMinimal,
   python3,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "databricks-cli";
-  version = "0.244.0";
+  version = "0.245.0";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
-    rev = "v${version}";
-    hash = "sha256-TGbmGAS3hS9m6CNTtHQ0N3Fz6Ei+ry06enfYtWK/xOw=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-4EWBDfDCiOF9LcON5XT77kNcAXBd57ZjsSGB+hzRgOw=";
   };
 
-  vendorHash = "sha256-W1tAFLSy5rX07Dkj+r+T6whbuTevpxxtakG2caUdWJQ=";
+  # Otherwise these tests fail asserting that the version is 0.0.0-dev
+  postPatch = ''
+    substituteInPlace bundle/deploy/terraform/init_test.go \
+      --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
+  '';
+
+  vendorHash = "sha256-XkUkCraKR9AP0lRZa+u1YMWzLZV+xxWZgbAlxkVjsXM=";
 
   excludedPackages = [
     "bundle/internal"
@@ -25,6 +33,10 @@ buildGoModule rec {
     "integration"
   ];
 
+  ldflags = [
+    "-X github.com/databricks/cli/internal/build.buildVersion=${finalAttrs.version}"
+  ];
+
   postBuild = ''
     mv "$GOPATH/bin/cli" "$GOPATH/bin/databricks"
   '';
@@ -60,15 +72,28 @@ buildGoModule rec {
     git remote add origin https://github.com/databricks/cli.git
   '';
 
-  meta = with lib; {
+  __darwinAllowLocalNetworking = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/databricks";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Databricks CLI";
     mainProgram = "databricks";
     homepage = "https://github.com/databricks/cli";
-    changelog = "https://github.com/databricks/cli/releases/tag/v${version}";
-    license = licenses.databricks;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/databricks/cli/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.databricks;
+    maintainers = with lib.maintainers; [
       kfollesdal
       taranarmo
     ];
   };
-}
+})

From 66fd59e9361f310b039e2e39b3df190bb0a976ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 12:43:20 +0000
Subject: [PATCH 70/95] python312Packages.mcdreforged: 2.14.5 -> 2.14.7

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

diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix
index 6c0760d18310..04298b76fbdf 100644
--- a/pkgs/development/python-modules/mcdreforged/default.nix
+++ b/pkgs/development/python-modules/mcdreforged/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "mcdreforged";
-  version = "2.14.5";
+  version = "2.14.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MCDReforged";
     repo = "MCDReforged";
     tag = "v${version}";
-    hash = "sha256-zhg4KK40nQAuKMaihALTXEeQuusKeSVp18yp8WKVZ2I=";
+    hash = "sha256-KwXvjLS9tg3EZT9vYFfiOIjPGswcOwdl66ErKPKS2rA=";
   };
 
   build-system = [ setuptools ];

From 8bfabcfe6bf823b4dbd58b91129199762f372f18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 12:51:04 +0000
Subject: [PATCH 71/95] src-cli: 6.1.0 -> 6.1.1

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

diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix
index a5b22d5bdf73..3057f97ad5ae 100644
--- a/pkgs/by-name/sr/src-cli/package.nix
+++ b/pkgs/by-name/sr/src-cli/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "src-cli";
-  version = "6.1.0";
+  version = "6.1.1";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "src-cli";
     rev = version;
-    hash = "sha256-PQu6Dx8x2LmsItQLso3pBdQzqV7a+QrIYftLcHwHf3s=";
+    hash = "sha256-vxoki4kQL3B0v3AhqZGzw3U5BF73Jg5pX92EldTYiWg=";
   };
 
-  vendorHash = "sha256-iv6qdC9/UvYt0q4hwHiKRLDxBylIikz35BqU+42HItE=";
+  vendorHash = "sha256-bpfDnVqJoJi9WhlA6TDWAhBRkbbQn1BHfnLJ8BTmhGM=";
 
   subPackages = [
     "cmd/src"

From 338941f4b7de811d05fb19a857d1964eb503d325 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 13:09:02 +0000
Subject: [PATCH 72/95] gurk-rs: 0.6.3 -> 0.6.4

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

diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix
index 2ed1f19cf064..dc254a26f243 100644
--- a/pkgs/by-name/gu/gurk-rs/package.nix
+++ b/pkgs/by-name/gu/gurk-rs/package.nix
@@ -19,13 +19,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "gurk-rs";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "boxdot";
     repo = "gurk-rs";
     tag = "v${version}";
-    hash = "sha256-6WU5epBnCPCkEYPZvWMOGOdkw8cL+nvHKs3RnsrhJO0=";
+    hash = "sha256-1vnyzKissOciLopWzWN2kmraFevYW/w32KVmP8qgUM4=";
   };
 
   postPatch = ''
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-qW+9d2Etwh9sPxgy0mZtUFtkjlFTHU5uJYTW5jLcBlo=";
+  cargoHash = "sha256-PCeiJYeIeMgKoQYiDI6DPwNgJcSxw4gw6Ra1YmqsNys=";
 
   nativeBuildInputs = [
     protobuf

From 7870c1206b13fa3f58841022c4dfb495ffd51a58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 13:29:52 +0000
Subject: [PATCH 73/95] minijinja: 2.8.0 -> 2.9.0

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

diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index de151854b0a5..3184c339168e 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "minijinja";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "minijinja";
     rev = version;
-    hash = "sha256-U/cncTfMyEvJbD+pr4kUxHcdsf9BxnMcL5bNvE8ard4=";
+    hash = "sha256-WbWMssIQ8ETaVaJ9fEkUxHmnylH4hdO14XMwyB0BtFY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Pbb2cq7IEA1ZqWnHoOtIRgBDXf6GjT7G8plswlWG2Ko=";
+  cargoHash = "sha256-B9La6DSrsJXsausew/FMcl/iQvZxrNkavddtU5yIQuA=";
 
   # The tests relies on the presence of network connection
   doCheck = false;

From c9e576897af30dc5f65a577f12952964dc752989 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 15:23:46 +0000
Subject: [PATCH 74/95] automatic-timezoned: 2.0.66 -> 2.0.67

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

diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index 6418af8b9d2f..e3e3369f223e 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -5,17 +5,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "automatic-timezoned";
-  version = "2.0.66";
+  version = "2.0.67";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
     rev = "v${version}";
-    sha256 = "sha256-Hf3g0USudI6Df1Js1lRWFVHo2np5ZpCnEXX312Fx7EM=";
+    sha256 = "sha256-j7wQ7jUiXpiDdGBDSiGkIcnnrwkJZESiwB4yqxp0moU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-tM3ikX51ZWadtRe2bnmIo167Hw0e5wjoY86Z5hFLizI=";
+  cargoHash = "sha256-AIZnpE9ULyZnKNOtpoTP1VQYXMAxEuDiHWdEJGiGo5Q=";
 
   meta = with lib; {
     description = "Automatically update system timezone based on location";

From e76d3c5f8507f914bc68e64870d2c09078774cd8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 31 Mar 2025 17:32:06 +0200
Subject: [PATCH 75/95] python312Packages.flax: 0.10.4 -> 0.10.5

Diff: https://github.com/google/flax/compare/refs/tags/v0.10.4...v0.10.5

Changelog: https://github.com/google/flax/releases/tag/v0.10.5
---
 .../python-modules/flax/default.nix           | 58 ++-----------------
 1 file changed, 5 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index 35d3c05e5762..987a2bc479ab 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -22,7 +22,7 @@
   # optional-dependencies
   matplotlib,
 
-  # dependencies
+  # tests
   cloudpickle,
   keras,
   einops,
@@ -39,14 +39,14 @@
 
 buildPythonPackage rec {
   pname = "flax";
-  version = "0.10.4";
+  version = "0.10.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "flax";
     tag = "v${version}";
-    hash = "sha256-+3PQPRVju9kw/4KWeifD8LhY4t6EzakhYISubMxrMw4=";
+    hash = "sha256-8ZJbuPht9vQV52HN7eMqHBaNkzRP4K6K9CSw68vSTys=";
   };
 
   build-system = [
@@ -84,12 +84,6 @@ buildPythonPackage rec {
     tensorflow
   ];
 
-  pytestFlagsArray = [
-    # DeprecationWarning: linear_util.wrap_init is missing a DebugInfo object.
-    "-W"
-    "ignore::DeprecationWarning"
-  ];
-
   disabledTestPaths = [
     # Docs test, needs extra deps + we're not interested in it.
     "docs/_ext/codediff_test.py"
@@ -101,54 +95,12 @@ buildPythonPackage rec {
     # `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them
     # would be limited anyway.
     "examples/*"
-
-    # See https://github.com/google/flax/issues/3232.
-    "tests/jax_utils_test.py"
   ];
 
   disabledTests =
     [
-      # AttributeError: module 'jax.api_util' has no attribute 'debug_info'
-      # https://github.com/google/flax/issues/4585
-      "test_basic_seq_lengths"
-      "test_bidirectional"
-      "test_big_resnet"
-      "test_custom_merge_fn"
-      "test_jit_scan_retracing_retracing"
-      "test_lazy_init"
-      "test_lazy_init"
-      "test_lazy_init_fails_on_data_dependence"
-      "test_lazy_init_fails_on_data_dependence"
-      "test_lifted_transform"
-      "test_lifted_transform_no_rename"
-      "test_multi_method_class_transform"
-      "test_numerical_equivalence"
-      "test_numerical_equivalence_single_batch"
-      "test_numerical_equivalence_single_batch_nn_scan"
-      "test_numerical_equivalence_with_mask"
-      "test_pjit_scan_over_layers"
-      "test_remat_scan"
-      "test_return_carry"
-      "test_reverse"
-      "test_reverse_but_keep_order"
-      "test_rnn_basic_forward"
-      "test_rnn_equivalence_with_flax_linen"
-      "test_rnn_multiple_batch_dims"
-      "test_rnn_time_major"
-      "test_rnn_unroll"
-      "test_rnn_with_spatial_dimensions"
-      "test_same_key"
-      "test_scan"
-      "test_scan_compact_count"
-      "test_scan_decorated"
-      "test_scan_negative_axes"
-      "test_scan_of_setup_parameter"
-      "test_scan_over_layers"
-      "test_scan_shared_params"
-      "test_scan_unshared_params"
-      "test_scan_with_axes"
-      "test_shared_cell"
-      "test_toplevel_submodule_adoption_pytree_transform"
+      # AssertionError: [Chex] Function 'add' is traced > 1 times!
+      "PadShardUnpadTest"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!

From 6e9b612688cf2d1664539c96122f672a96c21e01 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 1 Apr 2025 00:57:28 +0900
Subject: [PATCH 76/95] uv: 0.6.10 -> 0.6.11

https://github.com/astral-sh/uv/releases/tag/0.6.11

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 180595433333..a4c99991bc8b 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.6.10";
+  version = "0.6.11";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-IvHMueDY8sT+hLaySOwZ6sI3Jcb1Ht1Wpfzv17NCfI8=";
+    hash = "sha256-XqKtgGN7c6ArssYAjwdkdnAwv39I+FcEw+EXwC2Xehs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-YNeZt4Zcw0hiYiKwtuEHk5OuH041iILtFyY88/4Db3w=";
+  cargoHash = "sha256-FdpBTf/SBEGmEfAXVGNbyyIvEfTC9WqKvB+/YMYq1hI=";
 
   buildInputs = [
     rust-jemalloc-sys

From 07e0be58f78467c57e50477436c21bbbf6f1ad8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 31 Mar 2025 19:04:23 +0200
Subject: [PATCH 77/95] fsautocomplete: refactor

---
 pkgs/by-name/fs/fsautocomplete/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index ea691b24a768..0a5d85893ee1 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -14,7 +14,7 @@ buildDotnetModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "FsAutoComplete";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-QTLaaztZghcQRQSE/GXQGpo7W7bHNNXGwYNIaV41PvY=";
   };
 
@@ -40,14 +40,14 @@ buildDotnetModule (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "FsAutoComplete project (FSAC) provides a backend service for rich editing or intellisense features for editors";
     mainProgram = "fsautocomplete";
     homepage = "https://github.com/fsharp/FsAutoComplete";
-    changelog = "https://github.com/fsharp/FsAutoComplete/releases/tag/v${version}";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/fsharp/FsAutoComplete/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       gbtb
       mdarocha
     ];

From 664014638d44b003180c7b012fef5f9a7f9b9888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 31 Mar 2025 17:13:16 +0000
Subject: [PATCH 78/95] fsautocomplete: 0.77.4 -> 0.77.5

---
 pkgs/by-name/fs/fsautocomplete/deps.json   | 16 ++++++++--------
 pkgs/by-name/fs/fsautocomplete/package.nix |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json
index 06ca973f58f2..92bd7f130850 100644
--- a/pkgs/by-name/fs/fsautocomplete/deps.json
+++ b/pkgs/by-name/fs/fsautocomplete/deps.json
@@ -76,8 +76,8 @@
   },
   {
     "pname": "fsharp-analyzers",
-    "version": "0.28.0",
-    "hash": "sha256-BqGk9MzHHA3oRPNfWuANcM1YELsdhzWI+kLF4mUDUx8="
+    "version": "0.30.0",
+    "hash": "sha256-7oaSwpHAU1opzpz4szLU/gDaJC/ww9eiFkPu0nr4Mj4="
   },
   {
     "pname": "FSharp.Analyzers.Build",
@@ -86,8 +86,8 @@
   },
   {
     "pname": "FSharp.Analyzers.SDK",
-    "version": "0.29.1",
-    "hash": "sha256-bhkxMzJs1eOdrgWsiyUxJy3D9nKe1w3ajSCn1AVCggw="
+    "version": "0.30.0",
+    "hash": "sha256-UlMSSAQTSSF2hnGOXABpPWZnav6DU3FMtOkJYO/Sl+M="
   },
   {
     "pname": "FSharp.Compiler.Service",
@@ -206,8 +206,8 @@
   },
   {
     "pname": "Ionide.Analyzers",
-    "version": "0.13.0",
-    "hash": "sha256-PQ118rNahGoK7CPMv+NKDAPwm68p71vzMqmX71eu8E8="
+    "version": "0.14.4",
+    "hash": "sha256-yzEao/iNQ11A7WV54cU7OSJTPTvkr+YXaOdrTogy4JA="
   },
   {
     "pname": "Ionide.KeepAChangelog.Tasks",
@@ -216,8 +216,8 @@
   },
   {
     "pname": "Ionide.LanguageServerProtocol",
-    "version": "0.6.0",
-    "hash": "sha256-4CUMAzICBpp621nh3zTnIGrKH9YYvyflbXA3HFKtkpc="
+    "version": "0.7.0",
+    "hash": "sha256-fGkfG6OImLcHeLoG6/TvzNTDOYtR8FWZn4Zu7xlbYUg="
   },
   {
     "pname": "Ionide.ProjInfo",
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index 0a5d85893ee1..76030f61394d 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "fsautocomplete";
-  version = "0.77.4";
+  version = "0.77.5";
 
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "FsAutoComplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QTLaaztZghcQRQSE/GXQGpo7W7bHNNXGwYNIaV41PvY=";
+    hash = "sha256-rPg4GSnxfWWBn3UzQvraH8iL3zOomvompE9Kyuxj5Z0=";
   };
 
   nugetDeps = ./deps.json;

From cf77e949973ee74ad207bc69558043f9ccf037ee Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Mon, 31 Mar 2025 10:21:06 -0700
Subject: [PATCH 79/95] signalbackup-tools: 20250326 -> 20250331-1

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250326...20250331-1
---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 02f77a83c533..378faf6ee65b 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20250326";
+  version = "20250331-1";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-Oi2tN44h+f2Ann5Iq8PVMTT5ea/MB4easByLryc9s4k=";
+    hash = "sha256-MrpHGSuV5HhZuwCC8E1konE3DhyK/hv6m6Mt+Wx3JT4=";
   };
 
   nativeBuildInputs = [

From 7cce75a6f3ba79802a2189e33ee2fe33e27094dd Mon Sep 17 00:00:00 2001
From: Chun Yu <lamchunyu00@gmail.com>
Date: Tue, 1 Apr 2025 02:06:15 +0800
Subject: [PATCH 80/95] python3Packages.aider-chat: add additional dependencies
 for help

---
 .../python-modules/aider-chat/default.nix     | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index 7fc8ac807754..08771cbb23e4 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -6,9 +6,18 @@
   gitMinimal,
   portaudio,
   playwright-driver,
+  symlinkJoin,
+  nltk-data,
 }:
 
 let
+  aider-nltk-data = symlinkJoin {
+    name = "aider-nltk-data";
+    paths = [
+      nltk-data.punkt_tab
+      nltk-data.stopwords
+    ];
+  };
   python3 = python312.override {
     self = python3;
     packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
@@ -161,8 +170,12 @@ let
       ];
 
     makeWrapperArgs = [
-      "--set AIDER_CHECK_UPDATE false"
-      "--set AIDER_ANALYTICS false"
+      "--set"
+      "AIDER_CHECK_UPDATE"
+      "false"
+      "--set"
+      "AIDER_ANALYTICS"
+      "false"
     ];
 
     preCheck = ''
@@ -184,6 +197,7 @@ let
         llama-index-core
         llama-index-embeddings-huggingface
         torch
+        nltk
       ];
       bedrock = [
         boto3
@@ -218,8 +232,21 @@ let
             playwrightArgs =
               if withPlaywright || withAll then
                 [
-                  "--set PLAYWRIGHT_BROWSERS_PATH ${playwright-driver.browsers}"
-                  "--set PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true"
+                  "--set"
+                  "PLAYWRIGHT_BROWSERS_PATH"
+                  "${playwright-driver.browsers}"
+                  "--set"
+                  "PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS"
+                  "true"
+                ]
+              else
+                [ ];
+            helpArgs =
+              if withHelp || withAll then
+                [
+                  "--set"
+                  "NLTK_DATA"
+                  "${aider-nltk-data}"
                 ]
               else
                 [ ];
@@ -227,7 +254,7 @@ let
           {
             dependencies = dependencies ++ playwrightDeps ++ browserDeps ++ helpDeps ++ bedrockDeps;
             propagatedBuildInputs = propagatedBuildInputs ++ playwrightInputs;
-            makeWrapperArgs = makeWrapperArgs ++ playwrightArgs;
+            makeWrapperArgs = makeWrapperArgs ++ playwrightArgs ++ helpArgs;
           }
         );
     };

From 2164766ad2a58af4fe4274a7948c8dda1d0fc5cc Mon Sep 17 00:00:00 2001
From: Chun Yu <lamchunyu00@gmail.com>
Date: Tue, 1 Apr 2025 02:06:37 +0800
Subject: [PATCH 81/95] aider-chat: refactor aider-chat to all-packages, add
 variants

---
 pkgs/by-name/ai/aider-chat/package.nix | 18 ------------------
 pkgs/top-level/all-packages.nix        | 12 ++++++++++++
 2 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/by-name/ai/aider-chat/package.nix

diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix
deleted file mode 100644
index c34ab1173617..000000000000
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  python3Packages,
-  withPlaywright ? false,
-  withBrowser ? false,
-  withHelp ? false,
-  withOptional ? false,
-}:
-
-if withPlaywright then
-  python3Packages.toPythonApplication python3Packages.aider-chat.passthru.withPlaywright
-else if withBrowser then
-  python3Packages.toPythonApplication python3Packages.aider-chat.passthru.withBrowser
-else if withHelp then
-  python3Packages.toPythonApplication python3Packages.aider-chat.passthru.withHelp
-else if withOptional then
-  python3Packages.toPythonApplication python3Packages.aider-chat.passthru.withOptional
-else
-  python3Packages.toPythonApplication python3Packages.aider-chat
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 057c6c48359c..dc51f850668a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -170,6 +170,18 @@ with pkgs;
     } ../build-support/setup-hooks/add-bin-to-path.sh
   ) { };
 
+  aider-chat = with python3Packages; toPythonApplication aider-chat;
+
+  aider-chat-with-playwright = with python3Packages; toPythonApplication (aider-chat.withOptional { withPlaywright = true; });
+
+  aider-chat-with-browser = with python3Packages; toPythonApplication (aider-chat.withOptional { withBrowser = true; });
+
+  aider-chat-with-help = with python3Packages; toPythonApplication (aider-chat.withOptional { withHelp = true; });
+
+  aider-chat-with-bedrock = with python3Packages; toPythonApplication (aider-chat.withOptional { withBedrock = true; });
+
+  aider-chat-full = with python3Packages; toPythonApplication (aider-chat.withOptional { withAll = true; });
+
   autoreconfHook = callPackage (
     { makeSetupHook, autoconf, automake, gettext, libtool }:
     makeSetupHook {

From bdb1b01672d5eefe6e7b3566ccfe2d811c4e458c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 18:31:54 +0000
Subject: [PATCH 82/95] xmoto: 0.6.2 -> 0.6.3

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

diff --git a/pkgs/by-name/xm/xmoto/package.nix b/pkgs/by-name/xm/xmoto/package.nix
index fcfb9384d2af..a25518bc2507 100644
--- a/pkgs/by-name/xm/xmoto/package.nix
+++ b/pkgs/by-name/xm/xmoto/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmoto";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-n58GB5HA50ybSq0ssvJMq+p3I3JThHUGLZ5sHy/245M=";
+    hash = "sha256-DNljUd7FSH0fTgQx8LMqItZ54aLZtwMUPzqR8Z820SM=";
   };
 
   nativeBuildInputs = [

From 83cfa06335461596960ade6b7122b28cd80c538f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 18:32:46 +0000
Subject: [PATCH 83/95] xivlauncher: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/by-name/xi/xivlauncher/package.nix b/pkgs/by-name/xi/xivlauncher/package.nix
index 9b1bbc246526..f56b6fbd68c3 100644
--- a/pkgs/by-name/xi/xivlauncher/package.nix
+++ b/pkgs/by-name/xi/xivlauncher/package.nix
@@ -17,7 +17,7 @@
 }:
 
 let
-  rev = "1.1.1";
+  rev = "1.1.2";
 in
 buildDotnetModule rec {
   pname = "XIVLauncher";
@@ -27,7 +27,7 @@ buildDotnetModule rec {
     owner = "goatcorp";
     repo = "XIVLauncher.Core";
     inherit rev;
-    hash = "sha256-gXec5Btnm/9M7jgPdrnLn8im0jCdLCJjsEBPpuCNz2I=";
+    hash = "sha256-QkA18C3oWxcW0vK6sji7vbm4bY5LxwIWierAg5qf38Q=";
     fetchSubmodules = true;
   };
 

From 0f4e17bd7ef3174c32bcf35e39e2c865df81312e Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Tue, 1 Apr 2025 07:36:14 +1300
Subject: [PATCH 84/95] peroxide: remove

Peroxide has been abandoned upstream.
---
 pkgs/by-name/pe/peroxide/package.nix | 42 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/by-name/pe/peroxide/package.nix

diff --git a/pkgs/by-name/pe/peroxide/package.nix b/pkgs/by-name/pe/peroxide/package.nix
deleted file mode 100644
index b3cae30ade3f..000000000000
--- a/pkgs/by-name/pe/peroxide/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  buildGo122Module,
-  fetchFromGitHub,
-  nixosTests,
-}:
-
-buildGo122Module rec {
-  pname = "peroxide";
-  version = "0.5.0";
-
-  src = fetchFromGitHub {
-    owner = "ljanyst";
-    repo = "peroxide";
-    rev = "v${version}";
-    sha256 = "sha256-6Jb1i4aNjeemiQp9FF/KGyZ+Evom9PPBvARbJWyrhok=";
-  };
-
-  vendorHash = "sha256-kuFlkkMkCKO5Rrh1EoyVdaykvxTfchK2l1/THqTBeAY=";
-
-  postPatch = ''
-    # These tests connect to the internet, which does not work in sandboxed
-    # builds, so skip these.
-    rm pkg/pmapi/dialer_pinning_test.go \
-       pkg/pmapi/dialer_proxy_provider_test.go \
-       pkg/pmapi/dialer_proxy_test.go
-  '';
-
-  passthru.tests.peroxide = nixosTests.peroxide;
-
-  meta = with lib; {
-    homepage = "https://github.com/ljanyst/peroxide";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ aidalgol ];
-    description = "Unofficial ProtonMail bridge";
-    longDescription = ''
-      Peroxide is a fork of the official ProtonMail bridge that aims to be
-      similar to Hydroxide while reusing as much code from the official bridge
-      as possible.
-    '';
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8ccf7791d8c6..ca53624cf161 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1158,6 +1158,7 @@ mapAliases {
   percona-server_lts = percona-server; # Added 2024-10-13
   percona-xtrabackup_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13
   percona-xtrabackup_lts = percona-xtrabackup; # Added 2024-10-13
+  peroxide = throw "'peroxide' has been dropped due to lack of upstream maintenance."; # Added 2025-03-31
   pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
   perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead";
   perldevelPackages = perldevel;

From 2403040433a3825ff88bb73b5dbdf6b8bdf15308 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 31 Mar 2025 21:20:35 +0200
Subject: [PATCH 85/95] python312Packages.mhcflurry: 2.1.4 -> 2.1.5

Diff: https://github.com/openvax/mhcflurry/compare/refs/tags/v2.1.4...v2.1.5

Changelog: https://github.com/openvax/mhcflurry/releases/tag/v2.1.5
---
 .../python-modules/mhcflurry/default.nix       | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix
index 7ab37fa8678f..611b67645165 100644
--- a/pkgs/development/python-modules/mhcflurry/default.nix
+++ b/pkgs/development/python-modules/mhcflurry/default.nix
@@ -2,12 +2,12 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # dependencies
   appdirs,
   keras,
   mhcgnomes,
+  numpy,
   pandas,
   pyyaml,
   scikit-learn,
@@ -21,30 +21,22 @@
 
 buildPythonPackage rec {
   pname = "mhcflurry";
-  version = "2.1.4";
+  version = "2.1.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openvax";
     repo = "mhcflurry";
     tag = "v${version}";
-    hash = "sha256-dxCGCPnk1IFKg8ZVqMJsojQL0KlNirKlHJoaaOYIzMU=";
+    hash = "sha256-TNb3oKZvgBuXoSwsTuEJjFKEVZyHynazuPInj7wVKs8=";
   };
 
-  patches = [
-    # TODO: this has been merged in master and will thus be included in the next release.
-    (fetchpatch {
-      name = "migrate-from-nose-to-pytest";
-      url = "https://github.com/openvax/mhcflurry/commit/8e9f35381a476362ca41cb71eb0a90f6573fe4b3.patch";
-      hash = "sha256-PyyxGrjE3OZR8dKHEQBQGiRG9A8kcz/e14PRyrVvqrE=";
-    })
-  ];
-
   # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run.
   dependencies = [
     appdirs
     keras
     mhcgnomes
+    numpy
     pandas
     pyyaml
     scikit-learn
@@ -53,8 +45,6 @@ buildPythonPackage rec {
     tqdm
   ];
 
-  # Tests currently depend on nose; see
-  # <https://github.com/openvax/mhcflurry/pull/244>.
   nativeCheckInputs = [
     pytestCheckHook
   ];

From 9537bd50fb933cdc6118859a9d2e2e85e8efa4db Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 31 Mar 2025 22:30:35 +0300
Subject: [PATCH 86/95] 
 python312Packages.{proton-vpn-api-core,proton-vpn-network-manager}: Fix
 import tests

When pyxdg is available the dirs will use xdg vars

https://www.github.com/ProtonVPN/python-proton-core/blob/e87d1e3b5fc70883adc02ef2e2d9b0eb360b83ba/proton/utils/environment.py#L56-L102
---
 .../python-modules/proton-vpn-api-core/default.nix            | 4 ++++
 .../python-modules/proton-vpn-network-manager/default.nix     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
index 0142603b9e50..0361703a9df8 100644
--- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
@@ -12,6 +12,7 @@
   pytest-asyncio,
   requests,
   sentry-sdk,
+  pyxdg,
   distro,
   pytestCheckHook,
   pytest-cov-stub,
@@ -40,6 +41,7 @@ buildPythonPackage rec {
     pynacl
     proton-core
     sentry-sdk
+    pyxdg
   ];
 
   pythonImportsCheck = [
@@ -59,9 +61,11 @@ buildPythonPackage rec {
     pytest-cov-stub
   ];
 
+  # Needed for `pythonImportsCheck`, `preCheck` happens between `pythonImportsCheckPhase` and `pytestCheckPhase`.
   postInstall = ''
     # Needed for Permission denied: '/homeless-shelter'
     export HOME=$(mktemp -d)
+    export XDG_RUNTIME_DIR=$(mktemp -d)
   '';
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
index 61abc0ab426f..937c54b5c103 100644
--- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix
@@ -12,6 +12,7 @@
   proton-vpn-local-agent,
   pycairo,
   pygobject3,
+  pyxdg,
   pytest-asyncio,
   pytestCheckHook,
   pytest-cov-stub,
@@ -46,6 +47,7 @@ buildPythonPackage rec {
     proton-vpn-local-agent
     pycairo
     pygobject3
+    pyxdg
   ];
 
   postPatch = ''
@@ -67,9 +69,11 @@ buildPythonPackage rec {
     pytest-asyncio
   ];
 
+  # Needed for `pythonImportsCheck`, `preCheck` happens between `pythonImportsCheckPhase` and `pytestCheckPhase`.
   preCheck = ''
     # Needed for Permission denied: '/homeless-shelter'
     export HOME=$(mktemp -d)
+    export XDG_RUNTIME_DIR=$(mktemp -d)
   '';
 
   meta = {

From c99f7ebc0b3cf033c1215265f0acf103d9c45c85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Mar 2025 00:27:56 +0000
Subject: [PATCH 87/95] dayon: 16.0.2 -> 16.0.3

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

diff --git a/pkgs/by-name/da/dayon/package.nix b/pkgs/by-name/da/dayon/package.nix
index e9c846c3daf6..9efd81de54b6 100644
--- a/pkgs/by-name/da/dayon/package.nix
+++ b/pkgs/by-name/da/dayon/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dayon";
-  version = "16.0.2";
+  version = "16.0.3";
 
   src = fetchFromGitHub {
     owner = "RetGal";
     repo = "dayon";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EOQVDzza1tqAzGtEV0npT2k1thTNJOhzMXXX1Tuti6Q=";
+    hash = "sha256-d+8Ra5JkaJ3q4TfjlOGsDLSzuL5dZP33ldVT9bSWl6k=";
   };
 
   nativeBuildInputs = [

From 51d5f49002bdb6b94f0d01bbfc943fc4106ef25c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 31 Mar 2025 22:36:36 +0200
Subject: [PATCH 88/95] python312Packages.pylance: 0.25.1 -> 0.25.2

Diff: https://github.com/lancedb/lance/compare/refs/tags/v0.25.1...v0.25.2

Changelog: https://github.com/lancedb/lance/releases/tag/v0.25.2
---
 pkgs/development/python-modules/pylance/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index cba2e2cba64e..417c7b733c73 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "pylance";
-  version = "0.25.1";
+  version = "0.25.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${version}";
-    hash = "sha256-mAVHpQfuAr4RQ8ZwsJHwKtlAtWO3ssm0ic6Y2/c1tZk=";
+    hash = "sha256-Xds+qSVB7X4CrtrOrfIdOSfgn22CnUyCfKZh2e0hzRo=";
   };
 
   sourceRoot = "${src.name}/python";
@@ -50,7 +50,7 @@ buildPythonPackage rec {
       src
       sourceRoot
       ;
-    hash = "sha256-auL8d8gu2V7kCb4LKdP7mmJZys4YLi2s856/aE73e7Q=";
+    hash = "sha256-c+uQQmB6KScB5sS+HW1TMAwNsze7Ssog2bf0kQWQUWA=";
   };
 
   nativeBuildInputs = [

From 15ffdcd46fb0755dc00888d2033e6df513359b66 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 31 Mar 2025 23:45:17 +0300
Subject: [PATCH 89/95] protonvpn-gui: Add missing dep

https://www.github.com/ProtonVPN/proton-vpn-gtk-app/blob/1d44f9aa7e4239685c1759bf9c106b3a14708e76/proton/vpn/app/gtk/__init__.py#L31
---
 .../networking/protonvpn-gui/default.nix        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix
index 8edfbade14ee..3bc4d3be4d81 100644
--- a/pkgs/applications/networking/protonvpn-gui/default.nix
+++ b/pkgs/applications/networking/protonvpn-gui/default.nix
@@ -5,6 +5,7 @@
   gobject-introspection,
   setuptools,
   wrapGAppsHook3,
+  libnotify,
   dbus-python,
   packaging,
   proton-core,
@@ -37,12 +38,16 @@ buildPythonApplication rec {
     wrapGAppsHook3
   ];
 
-  buildInputs = lib.optionals withIndicator [
-    # Adds AppIndicator3 namespace
-    libappindicator-gtk3
-    # Adds AyatanaAppIndicator3 namespace
-    libayatana-appindicator
-  ];
+  buildInputs =
+    [
+      libnotify # gir typelib is used
+    ]
+    ++ lib.optionals withIndicator [
+      # Adds AppIndicator3 namespace
+      libappindicator-gtk3
+      # Adds AyatanaAppIndicator3 namespace
+      libayatana-appindicator
+    ];
 
   build-system = [
     setuptools

From 05bd38dfc046ac28780adf5001a83d38224a3f27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 20:50:09 +0000
Subject: [PATCH 90/95] boxflat: 1.28.4 -> 1.28.5

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

diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix
index fd107f204b69..78d6f96e7044 100644
--- a/pkgs/by-name/bo/boxflat/package.nix
+++ b/pkgs/by-name/bo/boxflat/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "boxflat";
-  version = "1.28.4";
+  version = "1.28.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lawstorant";
     repo = "boxflat";
     tag = "v${version}";
-    hash = "sha256-szKGrP+z0HsCV/FhhKPlOMcb6LkQhOA1pZfwR86xa3Y=";
+    hash = "sha256-YwszXAm0B1FuLfa9EKNoh0cXXxj82CXY5q8ot1G184M=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 0f4299f5919a984499b38cfeb59fdc807d035c77 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 31 Mar 2025 14:25:06 -0700
Subject: [PATCH 91/95] python3Packages.langchain-groq: 0.3.1 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix
index 212791cd9fed..a54f98e1e28b 100644
--- a/pkgs/development/python-modules/langchain-groq/default.nix
+++ b/pkgs/development/python-modules/langchain-groq/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-groq";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-groq==${version}";
-    hash = "sha256-kdqgX2fnagVL+W6dRJwnpngcJK2q4E4nk8r4+zIwPt4=";
+    hash = "sha256-KsKT7+jpTTiSVMZWcIwW7+1BCL7rpZHg/OX3PNLI6As=";
   };
 
   sourceRoot = "${src.name}/libs/partners/groq";

From 314b75aafafa04aeee18454f691f65138b1f663d Mon Sep 17 00:00:00 2001
From: Philipp Arras <c@philipp-arras.de>
Date: Sun, 30 Mar 2025 22:35:34 +0200
Subject: [PATCH 92/95] python3Packages.nifty8: 8.5.6 -> 8.5.7

Diff: https://gitlab.mpcdf.mpg.de/ift/nifty/-/compare/v8.5.6..v8.5.7
Changelog: https://gitlab.mpcdf.mpg.de/ift/nifty/-/blob/v8.5.7/ChangeLog.md
---
 pkgs/development/python-modules/nifty8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nifty8/default.nix b/pkgs/development/python-modules/nifty8/default.nix
index 2ffbde2ed8b2..d97ba353fca6 100644
--- a/pkgs/development/python-modules/nifty8/default.nix
+++ b/pkgs/development/python-modules/nifty8/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "nifty8";
-  version = "8.5.6";
+  version = "8.5.7";
   pyproject = true;
 
   src = fetchFromGitLab {
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "ift";
     repo = "nifty";
     tag = "v${version}";
-    hash = "sha256-DQPCLRVl/UE1zv7nUZtPJa/sRwmAkHgrcDsxRa/ndX4=";
+    hash = "sha256-5KPmM1UaXnS/ZEsnyFyxvDk4Nc4m6AT5FDgmCG6U6YU=";
   };
 
   # nifty8.re is the jax-backed version of nifty8 (the regular one uses numpy).

From 0d415c830712003ac0ffd42d053d5198b9066d60 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 1 Apr 2025 00:21:53 +0200
Subject: [PATCH 93/95] python312Packages.huggingface-hub: add
 optional-dependencies

---
 .../huggingface-hub/default.nix               | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index c3344fa45ca2..33d2245a9806 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -14,6 +14,27 @@
   requests,
   tqdm,
   typing-extensions,
+
+  # optional-dependencies
+  # cli
+  inquirerpy,
+  # inference
+  aiohttp,
+  # torch
+  torch,
+  safetensors,
+  # hf_transfer
+  hf-transfer,
+  # fastai
+  toml,
+  fastai,
+  fastcore,
+  # tensorflow
+  tensorflow,
+  pydot,
+  graphviz,
+  # tensorflow-testing
+  keras,
 }:
 
 buildPythonPackage rec {
@@ -40,6 +61,42 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
+  optional-dependencies = {
+    all = [
+
+    ];
+    cli = [
+      inquirerpy
+    ];
+    inference = [
+      aiohttp
+    ];
+    torch = [
+      torch
+      safetensors
+    ] ++ safetensors.optional-dependencies.torch;
+    hf_transfer = [
+      hf-transfer
+    ];
+    fastai = [
+      toml
+      fastai
+      fastcore
+    ];
+    tensorflow = [
+      tensorflow
+      pydot
+      graphviz
+    ];
+    tensorflow-testing = [
+      tensorflow
+      keras
+    ];
+    hf_xet = [
+      # hf-xet
+    ];
+  };
+
   # Tests require network access.
   doCheck = false;
 

From 39484caf3fd9c08f2220b83a12da31980191b35a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 31 Mar 2025 14:23:41 +0200
Subject: [PATCH 94/95] python312Packages.kserve: 0.14.1 -> 0.15.0

Diff: https://github.com/kserve/kserve/compare/refs/tags/v0.14.1...v0.15.0

Changelog: https://github.com/kserve/kserve/releases/tag/v0.15.0
---
 .../python-modules/kserve/default.nix          | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index 8ba8618faa8e..b0e06d8497e5 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -11,6 +11,7 @@
   # dependencies
   cloudevents,
   fastapi,
+  grpc-interceptor,
   grpcio,
   httpx,
   kubernetes,
@@ -28,6 +29,7 @@
   huggingface-hub,
   asgi-logger,
   ray,
+  vllm,
 
   prometheus-client,
   protobuf,
@@ -51,14 +53,14 @@
 
 buildPythonPackage rec {
   pname = "kserve";
-  version = "0.14.1";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kserve";
     repo = "kserve";
     tag = "v${version}";
-    hash = "sha256-VwuUXANjshV4fN0i54Fs0zubHY81UtQcCV14JwMpXwA=";
+    hash = "sha256-J2VFMHwhHpvtsywv3ixuVzpuDwq8y9w4heedYYWVBmM=";
   };
 
   sourceRoot = "${src.name}/python/kserve";
@@ -81,6 +83,7 @@ buildPythonPackage rec {
   dependencies = [
     cloudevents
     fastapi
+    grpc-interceptor
     grpcio
     httpx
     kubernetes
@@ -108,9 +111,12 @@ buildPythonPackage rec {
       huggingface-hub
       google-cloud-storage
       requests
-    ];
+    ] ++ huggingface-hub.optional-dependencies.hf_transfer;
     logging = [ asgi-logger ];
     ray = [ ray ];
+    llm = [
+      # vllm (broken)
+    ];
   };
 
   nativeCheckInputs = [
@@ -146,6 +152,12 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # Looks for a config file at the root of the repository
     "test/test_inference_service_client.py"
+
+    # Require broken vllm
+    "test/test_dataplane.py"
+    "test/test_model_repository.py"
+    "test/test_openai_completion.py"
+    "test/test_openai_embedding.py"
   ];
 
   disabledTests =

From 1372070979bbfb9d39b7d0e2b0bf0efb0a87335e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 1 Apr 2025 01:14:38 +0200
Subject: [PATCH 95/95] esphome: 2025.3.2 -> 2025.3.3

https://github.com/esphome/esphome/releases/tag/2025.3.3
---
 pkgs/by-name/es/esphome/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index cedafdf6afa2..adcab8b4f515 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -22,14 +22,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.3.2";
+  version = "2025.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     tag = version;
-    hash = "sha256-Wioi1k/Eo3rlh8qMnDDDIvRNQXWoxlmRRvjHLs01skY=";
+    hash = "sha256-757vkpIppL0f4DsTVFwTNZLzWUtScJQKhEFz9wEtCnE=";
   };
 
   build-systems = with python.pkgs; [