From 846b1a7097bb3f8c259b33cb6fd44a668d0fafcf Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 20 Feb 2026 18:12:24 +0100
Subject: [PATCH 01/93] nixos/atticd: use `garage' in the test instead of
 `minio`

Related #490996, `minio` is not supported upstream anymore.
---
 nixos/tests/atticd.nix | 47 ++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/nixos/tests/atticd.nix b/nixos/tests/atticd.nix
index dd0790fe65e7..5768da1def7a 100644
--- a/nixos/tests/atticd.nix
+++ b/nixos/tests/atticd.nix
@@ -1,13 +1,10 @@
 { lib, pkgs, ... }:
 
 let
-  accessKey = "BKIKJAA5BMMU2RHO6IBB";
-  secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
+  accessKey = "GKaaaaaaaaaaaaaaaaaaaaaaaa";
+  secretKey = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+  s3Addr = "127.0.0.1:9000";
 
-  minioCredentialsFile = pkgs.writeText "minio-credentials-full" ''
-    MINIO_ROOT_USER=${accessKey}
-    MINIO_ROOT_PASSWORD=${secretKey}
-  '';
   environmentFile = pkgs.runCommand "atticd-env" { } ''
     echo ATTIC_SERVER_TOKEN_RS256_SECRET_BASE64="$(${lib.getExe pkgs.openssl} genrsa -traditional 4096 | ${pkgs.coreutils}/bin/base64 -w0)" > $out
   '';
@@ -36,8 +33,8 @@ in
           storage = {
             type = "s3";
             bucket = "attic";
-            region = "us-east-1";
-            endpoint = "http://127.0.0.1:9000";
+            region = "garage";
+            endpoint = "http://${s3Addr}";
 
             credentials = {
               access_key_id = accessKey;
@@ -49,14 +46,24 @@ in
         inherit environmentFile;
       };
 
-      services.minio = {
+      services.garage = {
         enable = true;
-        rootCredentialsFile = minioCredentialsFile;
+        package = pkgs.garage_2;
+        settings = {
+          rpc_bind_addr = "127.0.0.1:3901";
+          rpc_public_addr = "127.0.0.1:3901";
+          rpc_secret = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+          replication_factor = 1;
+
+          s3_api = {
+            s3_region = "garage";
+            api_bind_addr = s3Addr;
+          };
+        };
       };
 
       environment.systemPackages = [
         pkgs.attic-client
-        pkgs.minio-client
       ];
     };
   };
@@ -74,15 +81,19 @@ in
           local.succeed("attic push test-cache ${environmentFile}")
 
       with subtest("s3 storage push"):
-          s3.wait_for_unit("atticd.service")
-          s3.wait_for_unit("minio.service")
-          s3.wait_for_open_port(9000)
+          s3.wait_for_unit("garage.service")
+          s3.wait_for_open_port(3901)
+          garage_node_id = s3.succeed("garage status | tail -n1 | awk '{ print $1 }'")
           s3.succeed(
-              "mc alias set minio "
-              + "http://localhost:9000 "
-              + "${accessKey} ${secretKey} --api s3v4",
-              "mc mb minio/attic",
+              f"garage layout assign -c 100MB -z garage {garage_node_id}",
+              "garage layout apply --version 1",
+              "garage key import ${accessKey} ${secretKey} --yes",
+              "garage bucket create attic",
+              "garage bucket allow --read --write --owner attic --key ${accessKey}"
           )
+
+          s3.wait_for_unit("atticd.service")
+          s3.wait_for_open_port(9000)
           token = s3.succeed("atticd-atticadm make-token --sub stop --validity 1y --create-cache '*' --pull '*' --push '*' --delete '*' --configure-cache '*' --configure-cache-retention '*'").strip()
 
           s3.succeed(f"attic login s3 http://localhost:8080 {token}")

From 6657da58e829dac59dad07dcecfb4f5a33a3e451 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sat, 7 Mar 2026 17:25:03 +0100
Subject: [PATCH 02/93] ghidra-delinker-extension: 0.7.0 -> 0.8.0

---
 .../binary-file-toolkit.nix                   |  4 +-
 .../ghidra-delinker-extension/default.nix     |  9 ++--
 .../ghidra-delinker-extension/deps.json       | 50 +++++++++----------
 .../local-binary-file-toolkit.patch           | 14 +++---
 4 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix
index 003b36dea253..4db9aae029e5 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/binary-file-toolkit.nix
@@ -5,13 +5,13 @@
 }:
 maven.buildMavenPackage rec {
   pname = "binary-file-toolkit";
-  version = "0.4.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "boricj";
     repo = "binary-file-toolkit";
     tag = "v${version}";
-    hash = "sha256-ABDJDdx0OxXVOgYAw4kZAP3Psr+w7YevP1xk1RszXw8=";
+    hash = "sha256-HMzRh/Q06Ik33mEkmh5U6qLiWk7ZCEstYq3Ll/pFhXM=";
   };
 
   mvnHash = "sha256-Ek2qulMSHd1ZJfEloo6fIe+QMqub/Ftna/TzTt01ky8=";
diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
index c089a154c893..0c88293b41a0 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
@@ -9,26 +9,27 @@
 }:
 ghidra.buildGhidraExtension (finalAttrs: {
   pname = "ghidra-delinker-extension";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "boricj";
     repo = "ghidra-delinker-extension";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Hgpf1eqP/DRYczRDvAhXTWoycHe8N/xhMorlYDjytZg=";
+    hash = "sha256-Wqxi/xF+HMG9wQUiHwilKX8PkdtHtGaNrXZyPMjT4iE=";
   };
 
   patches = [
     # The GitHub Maven repository is not available unauthenticated,
     # so patch in the dependency this way and replace the fake path
     # with the locally built derivation later.
-    # This is tracked at boricj/binary-file-toolkit#1.
+    # The vendored-in dependency does not work for us because maven
+    # needs to download dependencies while building.
     ./local-binary-file-toolkit.patch
   ];
 
   postPatch = ''
     substituteInPlace build.gradle \
-      --replace-fail '"''${getGitHash()}"' '"v${finalAttrs.version}"' \
+      --replace-fail '"GIT_VERSION", gitVersionProvider' '"GIT_VERSION", "v${finalAttrs.version}"' \
       --replace-fail '"@binary-file-toolkit@"' '"${binary-file-toolkit}"'
   '';
 
diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/deps.json b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/deps.json
index ca347cfae912..3b220a34fabd 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/deps.json
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/deps.json
@@ -162,24 +162,24 @@
   "org/hamcrest#hamcrest-parent/1.3": {
    "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
   },
-  "org/jacoco#org.jacoco.agent/0.8.11": {
-   "jar": "sha256-0+2F3qeKntVYRqdzjjoMoVxwLGYe5LyMv+Aqi59KmcA=",
-   "pom": "sha256-FuBen0liG4fFPmk1AUDzxG1C2WbGepM730sGOiscj8U="
+  "org/jacoco#org.jacoco.agent/0.8.13": {
+   "jar": "sha256-nbPJ1ddPqHCyYbZKMIJBLhvW4i6fqY9HN7G/+K+cxk0=",
+   "pom": "sha256-auuUf988z1Qlydq41oPWu+MPCSjEWnAuYlWMblXmRLc="
   },
-  "org/jacoco#org.jacoco.ant/0.8.11": {
-   "jar": "sha256-gdfriJDZvjCpOWEsKVYDVBBjUpzdA6UyZaunRHS3C3w=",
-   "pom": "sha256-ftED2VnQzue6v7Ewf6bkUbFpb/01JwYVU7VQ3lUgHYU="
+  "org/jacoco#org.jacoco.ant/0.8.13": {
+   "jar": "sha256-ZDS4VS/z0OSi+70Tpu+xJODJykU4F8YsA96DkNh//RE=",
+   "pom": "sha256-I4tCPVxuZQ9LQPF1T42iYQDHpzYz5d1RKIxzgHRj744="
   },
-  "org/jacoco#org.jacoco.build/0.8.11": {
-   "pom": "sha256-W4SxXPLu8+WeuRvCJ4SDMQCwnfmRHjMZAww7xki9iws="
+  "org/jacoco#org.jacoco.build/0.8.13": {
+   "pom": "sha256-mUw64c/KZ2WWj+Pt5PN5mGrrLn61GiAUyqSgnXGo9KM="
   },
-  "org/jacoco#org.jacoco.core/0.8.11": {
-   "jar": "sha256-/NGIxohHP8jcwMbKrzVeeziVAiQ1J8M7lZej7Ch5H0c=",
-   "pom": "sha256-u2E18Qo2NJy4SlYA/Yz3P8EpahNbLxStzYPejPJMq7E="
+  "org/jacoco#org.jacoco.core/0.8.13": {
+   "jar": "sha256-UUwj32z9AV19g8EKeS41q2int+gvPWo6RIF2LBMuM6k=",
+   "pom": "sha256-73/2F3zZcB1QXv6C9N1P6l5fcssEesK088qitBbaD08="
   },
-  "org/jacoco#org.jacoco.report/0.8.11": {
-   "jar": "sha256-g5MpWuJGgO0QytgzOQcED5KLhxMySRWBylvHhOLLT74=",
-   "pom": "sha256-jjtzR3nV4/1oPsAVQT1S+WGYTFDLkEX9orI7/160I4E="
+  "org/jacoco#org.jacoco.report/0.8.13": {
+   "jar": "sha256-gTMoCgqkQ1i+nRNrUjcDQvRVzLlEquB0OCIKd2YleKI=",
+   "pom": "sha256-EBBlOpAAx+qoVqJx+E0HH/Rt6nojdbhKitmiOz5lPOg="
   },
   "org/mockito#mockito-core/5.4.0": {
    "jar": "sha256-sWibBmF+oB/Xd7+u293lEvrwg9Y5oEn3mziNWk6W0uU=",
@@ -195,20 +195,20 @@
   "org/ow2#ow2/1.5.1": {
    "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
   },
-  "org/ow2/asm#asm-bom/9.6": {
-   "pom": "sha256-ig5fYk/ikwt6jWmVb0OORe9TKZa01kQJthbErvSxrE4="
+  "org/ow2/asm#asm-bom/9.8": {
+   "pom": "sha256-DaHcsibmzf2ttNrFkZFruRe1c3RnTZG9LxMAMTe0FSA="
   },
-  "org/ow2/asm#asm-commons/9.6": {
-   "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=",
-   "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w="
+  "org/ow2/asm#asm-commons/9.8": {
+   "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=",
+   "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI="
   },
-  "org/ow2/asm#asm-tree/9.6": {
-   "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=",
-   "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM="
+  "org/ow2/asm#asm-tree/9.8": {
+   "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=",
+   "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c="
   },
-  "org/ow2/asm#asm/9.6": {
-   "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=",
-   "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A="
+  "org/ow2/asm#asm/9.8": {
+   "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=",
+   "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o="
   }
  }
 }
diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/local-binary-file-toolkit.patch b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/local-binary-file-toolkit.patch
index 891bd2d8b029..bbc93d2b2dfe 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/local-binary-file-toolkit.patch
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/local-binary-file-toolkit.patch
@@ -1,8 +1,8 @@
 diff --git a/build.gradle b/build.gradle
-index 6f3bc6f..16fc51b 100644
+index 48da640..bca1958 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -55,16 +55,8 @@ else {
+@@ -84,16 +84,8 @@ tasks.register("installStandaloneDeps") {
  repositories {
  	mavenLocal()
  	mavenCentral()
@@ -10,12 +10,12 @@ index 6f3bc6f..16fc51b 100644
 -		name = "boricj's binary-file-toolkit"
 -		url = uri("https://maven.pkg.github.com/boricj/binary-file-toolkit")
 -		credentials(HttpHeaderCredentials) {
--            name = "Authorization"
--            value = "Bearer " + project.findProperty("githubToken") as String ?: System.getenv("GITHUB_TOKEN")
+-			name = "Authorization"
+-			value = "Bearer " + project.findProperty("githubToken") as String ?: System.getenv("GITHUB_TOKEN")
+-		}
+-		authentication {
+-			header(HttpHeaderAuthentication)
 -		}
--        authentication {
--            header(HttpHeaderAuthentication)
--        }
 +	flatDir {
 +		dirs "@binary-file-toolkit@"
  	}

From 2983ae6911f80d4802157aaf1b9cfe3dc0d549e3 Mon Sep 17 00:00:00 2001
From: Andreas Erdes <socialcoms@posteo.de>
Date: Thu, 12 Mar 2026 20:45:35 +0100
Subject: [PATCH 03/93] tuxbox: 3.0.1 -> 3.1.0

---
 ...p-patterns-to-detect-driver-on-NixOS.patch | 86 -------------------
 pkgs/by-name/tu/tuxbox/package.nix            | 22 +++--
 2 files changed, 16 insertions(+), 92 deletions(-)
 delete mode 100644 pkgs/by-name/tu/tuxbox/Broaden-pgrep-patterns-to-detect-driver-on-NixOS.patch

diff --git a/pkgs/by-name/tu/tuxbox/Broaden-pgrep-patterns-to-detect-driver-on-NixOS.patch b/pkgs/by-name/tu/tuxbox/Broaden-pgrep-patterns-to-detect-driver-on-NixOS.patch
deleted file mode 100644
index 613941867c6d..000000000000
--- a/pkgs/by-name/tu/tuxbox/Broaden-pgrep-patterns-to-detect-driver-on-NixOS.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From db2e25602339253c12ed65720bae7c793c044bdc Mon Sep 17 00:00:00 2001
-From: Scott Bowman <scott@bowmans.org>
-Date: Thu, 19 Feb 2026 16:58:03 -0600
-Subject: [PATCH] Broaden pgrep patterns to detect driver on NixOS and pip
- entry points
-
-Use multiple pgrep patterns to find running driver processes,
-covering python -m invocation, pip console_scripts entry points,
-and NixOS wrapped executables.
----
- tuxbox/gui/driver_manager.py | 50 ++++++++++++++++++++++--------------
- 1 file changed, 31 insertions(+), 19 deletions(-)
-
-diff --git a/tuxbox/gui/driver_manager.py b/tuxbox/gui/driver_manager.py
-index accb457..384c00e 100644
---- a/tuxbox/gui/driver_manager.py
-+++ b/tuxbox/gui/driver_manager.py
-@@ -82,6 +82,17 @@ class DriverManager:
-         DriverManager._systemctl_available = shutil.which('systemctl') is not None
-         return DriverManager._systemctl_available
- 
-+    # Patterns to match driver processes via pgrep -f (full command line match).
-+    # Multiple patterns cover different invocation methods:
-+    #   - "python -m tuxbox [args]"         (standard / systemd service)
-+    #   - "/path/to/tuxbox [args]"          (pip entry point)
-+    #   - "/path/to/.tuxbox-wrapped [args]" (NixOS wrapper)
-+    # The patterns intentionally exclude GUI processes (tuxbox-gui, tuxbox.gui).
-+    DRIVER_PGREP_PATTERNS = [
-+        r'python.*-m\s+tuxbox(\s|$)',
-+        r'[/.]tuxbox(-wrapped)?(\s|$)',
-+    ]
-+
-     @staticmethod
-     def _get_driver_pids() -> list:
-         """Get PIDs of running driver processes
-@@ -89,27 +100,28 @@ class DriverManager:
-         Returns:
-             List of PID strings for running tuxbox processes
-         """
--        try:
--            # Use pgrep to find Python processes running tuxbox
--            # -f matches against full command line
--            result = subprocess.run(
--                ['pgrep', '-f', f'python.*-m.*{DriverManager.DRIVER_MODULE}'],
--                capture_output=True,
--                text=True,
--                timeout=5
--            )
-+        all_pids = set()
-+        our_pid = str(os.getpid())
-+        parent_pid = str(os.getppid())
- 
--            if result.returncode == 0 and result.stdout.strip():
--                pids = result.stdout.strip().split('\n')
--                # Filter out our own process (the GUI)
--                our_pid = str(os.getpid())
--                parent_pid = str(os.getppid())
--                return [pid for pid in pids if pid and pid != our_pid and pid != parent_pid]
--            return []
-+        for pattern in DriverManager.DRIVER_PGREP_PATTERNS:
-+            try:
-+                result = subprocess.run(
-+                    ['pgrep', '-f', pattern],
-+                    capture_output=True,
-+                    text=True,
-+                    timeout=5
-+                )
- 
--        except Exception as e:
--            logger.debug(f"pgrep failed: {e}")
--            return []
-+                if result.returncode == 0 and result.stdout.strip():
-+                    for pid in result.stdout.strip().split('\n'):
-+                        if pid and pid != our_pid and pid != parent_pid:
-+                            all_pids.add(pid)
-+
-+            except Exception as e:
-+                logger.debug(f"pgrep failed for pattern '{pattern}': {e}")
-+
-+        return list(all_pids)
- 
-     @staticmethod
-     def stop_driver() -> Tuple[bool, str]:
--- 
-2.52.0
-
diff --git a/pkgs/by-name/tu/tuxbox/package.nix b/pkgs/by-name/tu/tuxbox/package.nix
index 8ccde5c3eef9..bb9e95c7a074 100644
--- a/pkgs/by-name/tu/tuxbox/package.nix
+++ b/pkgs/by-name/tu/tuxbox/package.nix
@@ -5,20 +5,16 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "tuxbox";
-  version = "3.0.1";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AndyCappDev";
     repo = "tuxbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hBk4KhLNMgk8bFCZPQMtQlJ1/RB9qcL4kiF+eb3n4LU=";
+    hash = "sha256-jPPjGumArcnsRKQm3HKhoTGh913WEB5MUs7Y7eCHXNY=";
   };
 
-  patches = [
-    ./Broaden-pgrep-patterns-to-detect-driver-on-NixOS.patch
-  ];
-
   build-system = [ python3Packages.setuptools ];
 
   dependencies = with python3Packages; [
@@ -28,6 +24,20 @@ python3Packages.buildPythonApplication (finalAttrs: {
     pyside6
   ];
 
+  postInstall = ''
+    # Copy .desktop file to output
+    mkdir -p $out/share/applications/
+    cp ./tuxbox-gui.desktop $out/share/applications/
+
+    substituteInPlace $out/share/applications/tuxbox-gui.desktop \
+      --replace-fail "/usr/local/bin/tuxbox-gui" "$out/bin/tuxbox-gui"
+
+    # Install uinput udev rules
+    mkdir -p $out/lib/udev/rules.d/
+    echo 'KERNEL=="uinput", MODE="0660", GROUP="input", OPTIONS+="static_node=uinput"' > $out/lib/udev/rules.d/99-tuxbox-uinput.rules
+    chmod 0744 $out/lib/udev/rules.d/99-tuxbox-uinput.rules
+  '';
+
   meta = {
     changelog = "https://github.com/AndyCappDev/tuxbox/releases/tag/${finalAttrs.version}";
     description = "Linux driver for all TourBox models - Native feel with USB, Bluetooth, haptics and graphical configuration GUI";

From 070d6cd5a5d4bdee5059f4aab5e7acb096cecdc7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Mar 2026 01:04:44 +0000
Subject: [PATCH 04/93] renovate: 43.59.4 -> 43.76.5

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

diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index 74094a52d919..0bbdaff3a62b 100644
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "renovate";
-  version = "43.59.4";
+  version = "43.76.5";
 
   src = fetchFromGitHub {
     owner = "renovatebot";
     repo = "renovate";
     tag = finalAttrs.version;
-    hash = "sha256-pdB5b8mdvuykI7iCiINj2iITPZXJIqyVObQDuDszIdc=";
+    hash = "sha256-9DAgX6CG3Wnesp5AZqfv12KT8tRAGZXuewm7fqPVmpg=";
   };
 
   postPatch = ''
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 2;
-    hash = "sha256-EujMiRpGdEsl9CWtM+WMffYWS3Fbv9QSNjTagyvnNyY=";
+    hash = "sha256-LgVtV/jyJP/+fJ9XQHEsz67COUHV4RL0hfVdxph1cUg=";
   };
 
   env.COREPACK_ENABLE_STRICT = 0;

From 5bac5715593b2689624262bad9be60ab2f38d6db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Mar 2026 02:32:25 +0000
Subject: [PATCH 05/93] cudaPackages.gdrcopy: 2.5.1 -> 2.5.2

---
 pkgs/development/cuda-modules/packages/gdrcopy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/gdrcopy.nix b/pkgs/development/cuda-modules/packages/gdrcopy.nix
index 433b8b3f3130..22afb890c603 100644
--- a/pkgs/development/cuda-modules/packages/gdrcopy.nix
+++ b/pkgs/development/cuda-modules/packages/gdrcopy.nix
@@ -22,13 +22,13 @@ backendStdenv.mkDerivation (finalAttrs: {
   # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
   name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "gdrcopy";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "gdrcopy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2cDsDc1lGW9rNF1q3EhjmiJhNaIwuFYlNdooPe7/R2I=";
+    hash = "sha256-KfdCiJE8q5MUYjI5qsZjeFmBm9jKfdSxtrlhmQRosns=";
   };
 
   outputs = [ "out" ];

From b5905eb2d09848ad3bb7ccf3b2911f8bc59aed71 Mon Sep 17 00:00:00 2001
From: Vitalii Lagutin <lvitalii@gmail.com>
Date: Tue, 17 Mar 2026 16:07:39 +0200
Subject: [PATCH 06/93] metals: add metals-mcp binary for MCP server support

---
 pkgs/by-name/me/metals/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix
index da2d7e95e762..1811fa6cea05 100644
--- a/pkgs/by-name/me/metals/package.nix
+++ b/pkgs/by-name/me/metals/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     name = "metals-deps-${finalAttrs.version}";
     buildCommand = ''
       export COURSIER_CACHE=$(pwd)
-      ${coursier}/bin/cs fetch org.scalameta:metals_2.13:${finalAttrs.version} \
+      ${coursier}/bin/cs fetch org.scalameta:metals_2.13:${finalAttrs.version} org.scalameta:metals-mcp_2.13:${finalAttrs.version} \
         -r bintray:scalacenter/releases \
         -r sonatype:snapshots > deps
       mkdir -p $out/share/java
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-Snx4JvWOTkJcihVRwj25op4BJqmChz+1fZH/PrCCbt0=";
+    outputHash = "sha256-Gc5fQCXLWvDLzxfj+NfOcelVV51UoydNfGdDx1T4cbk=";
   };
 
   nativeBuildInputs = [
@@ -41,6 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
 
     makeWrapper ${jre}/bin/java $out/bin/metals \
       --add-flags "${finalAttrs.extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"
+
+    makeWrapper ${jre}/bin/java $out/bin/metals-mcp \
+      --add-flags "${finalAttrs.extraJavaOpts} -cp $CLASSPATH scala.meta.metals.McpMain"
   '';
 
   meta = {

From df65637e00e619462622bf73287bedfdc2490c2d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 17 Mar 2026 23:16:22 +0100
Subject: [PATCH 07/93] 
 coolercontrol.{coolercontrold,coolercontrol-ui-data,coolercontrol-gui}: 3.1.1
 -> 4.0.1

---
 .../system/coolercontrol/coolercontrol-ui-data.nix       | 3 ++-
 .../applications/system/coolercontrol/coolercontrold.nix | 9 +++++++--
 pkgs/applications/system/coolercontrol/default.nix       | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
index 17aa677cb734..04dc724254ae 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
@@ -11,7 +11,8 @@ buildNpmPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrol-ui";
 
-  npmDepsHash = "sha256-crkAK9k7wwbjiAQGBK584/29Zi0TZlljuASdvni8RkQ=";
+  npmDepsFetcherVersion = 2;
+  npmDepsHash = "sha256-NmTNaHm7NGkNWnNbTfLC9/3cSJRR+ir1YS+ot4MJNog=";
 
   postBuild = ''
     cp -r dist $out
diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix
index e185235f4906..d6a6435ea382 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrold.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix
@@ -1,6 +1,7 @@
 {
   rustPlatform,
   testers,
+  hwdata,
   libdrm,
   coolercontrol,
   runtimeShell,
@@ -21,7 +22,7 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrold";
 
-  cargoHash = "sha256-5YYodScAAs6ERVbj+irvyNS9IOkVaBHR4DCXTrrtyVI=";
+  cargoHash = "sha256-i6QYJ2kVXpYVbGyY/5EeGbCVCkxLeqf1mgvrXKRdup0=";
 
   buildInputs = [ libdrm ];
 
@@ -39,8 +40,12 @@ rustPlatform.buildRustPackage {
     cp -R ${coolercontrol.coolercontrol-ui-data}/* resources/app/
 
     # Hardcode a shell
-    substituteInPlace src/repositories/utils.rs \
+    substituteInPlace daemon/src/repositories/utils.rs \
       --replace-fail 'Command::new("sh")' 'Command::new("${runtimeShell}")'
+
+    # This is supposed to be a "nix-compatible file path", but there is nothing that actually does the substitution
+    substituteInPlace ../../coolercontrold-${version}-vendor/pciid-parser-*/src/lib.rs \
+      --replace-fail '@hwdata@' '${hwdata}'
   '';
 
   postInstall = ''
diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix
index 0aa095f4f763..343f79d3c8c2 100644
--- a/pkgs/applications/system/coolercontrol/default.nix
+++ b/pkgs/applications/system/coolercontrol/default.nix
@@ -5,13 +5,13 @@
 }:
 
 let
-  version = "3.1.1";
+  version = "4.0.1";
 
   src = fetchFromGitLab {
     owner = "coolercontrol";
     repo = "coolercontrol";
-    rev = version;
-    hash = "sha256-ocGW55z/cbO7uXWxiHoE798hN56fLlSgmZkO507eruY=";
+    tag = version;
+    hash = "sha256-X8KEZARksSwmFEKnGnwZk9aQ0ND6fOsSelCIWPkEjN8=";
   };
 
   meta = {

From e662efa40c390ca35c86ae7a89cdfd319b2998b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2026 15:25:42 +0000
Subject: [PATCH 08/93] microsoft-edge: 145.0.3800.97 -> 146.0.3856.62

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

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 4bfb445cdfca..679cd6436615 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -170,11 +170,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "145.0.3800.97";
+  version = "146.0.3856.62";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-Zih/MOiE1AptZBOtR5V7IRd50JVokzzXQb1V6pUK0VI=";
+    hash = "sha256-ana/Vyt3pRyxhNBdduRLRt/wbcdn6622UPEJolCc3Pc=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 9d52966842c5fc20c76bd53f4530d4a0d251d053 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 21 Mar 2026 01:00:38 +0700
Subject: [PATCH 09/93] nextcloud-client: 4.0.7 -> 4.0.8

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

diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index 439941237a0d..20f9e121a909 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextcloud-client";
-  version = "4.0.7";
+  version = "4.0.8";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cur50O//LSZwXvbE7qeaNa0BgpdR25NIpCUF5NDDObY=";
+    hash = "sha256-EKJj2z3CkWrNL2idBHu5jHuPXQXKwjEjUAgo6OOY/08=";
   };
 
   patches = [

From 0c8c5102faf735d9390b847b43786ddad8c9db57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2026 21:13:40 +0000
Subject: [PATCH 10/93] fly: 8.1.0 -> 8.1.1

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

diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix
index ee2214dbc3f3..e134b52de943 100644
--- a/pkgs/by-name/fl/fly/package.nix
+++ b/pkgs/by-name/fl/fly/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fly";
-  version = "8.1.0";
+  version = "8.1.1";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-M7TNOVBA30j87VkRJaYlAUE08wnQdB90Ey/u9SX39u4=";
+    hash = "sha256-JWl3dUx3eQWD8I+be6APuQklUw1ZzW6xK6iypxbgxF0=";
   };
 
   vendorHash = "sha256-ZZfiRfOkAcF3ItB4tjp8BgurMThxUOoBMyt9PeJpus4=";

From 10d125b9afe78d6267c981d1bc6324822522ccc4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 21 Mar 2026 10:29:28 +0800
Subject: [PATCH 11/93] =?UTF-8?q?webkitgtk=5F6=5F0:=202.50.6=20=E2=86=92?=
 =?UTF-8?q?=202.52.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/WebKit/WebKit/compare/webkitgtk-2.50.6...webkitgtk-2.52.0
https://webkitgtk.org/2026/03/18/webkitgtk2.52.0-released.html
https://webkitgtk.org/security/WSA-2026-0001.html

Usage of libwoff2 has been disabled when freetype has woff2 support.
https://bugs.webkit.org/show_bug.cgi?id=257627

Support for libsoup2 has been removed.
https://bugs.webkit.org/show_bug.cgi?id=300163

Fixes CVE-2025-46299.
---
 pkgs/development/libraries/webkitgtk/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index b347a8f8bbaa..5f7e98ae0ead 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -60,7 +60,6 @@
   sqlite,
   gst-plugins-base,
   gst-plugins-bad,
-  woff2,
   bubblewrap,
   libseccomp,
   libbacktrace,
@@ -85,7 +84,7 @@ in
 # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
-  version = "2.50.6";
+  version = "2.52.0";
   name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}";
 
   outputs = [
@@ -100,7 +99,7 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Kygav4iU/8YXIVLlZgt17u7b4cxD1ng9Cdx598hlu0I=";
+    hash = "sha256-sxxV8YGUrIO6CMm5O77/71en7P9/Qch00XqeeFPcoZ8=";
   };
 
   patches = lib.optionals clangStdenv.hostPlatform.isLinux [
@@ -145,6 +144,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     enchant
     expat
     flite
+    freetype
     libavif
     libepoxy
     libjxl
@@ -173,12 +173,10 @@ clangStdenv.mkDerivation (finalAttrs: {
     nettle
     p11-kit
     sqlite
-    woff2
   ]
   ++ lib.optionals clangStdenv.hostPlatform.isBigEndian [
     # https://bugs.webkit.org/show_bug.cgi?id=274032
     fontconfig
-    freetype
   ]
   ++ lib.optionals clangStdenv.hostPlatform.isDarwin [
     libedit
@@ -221,7 +219,6 @@ clangStdenv.mkDerivation (finalAttrs: {
     [
       "-DENABLE_INTROSPECTION=ON"
       "-DPORT=GTK"
-      "-DUSE_SOUP2=${cmakeBool false}"
       "-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
       "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"
     ]

From 405fec74276ec0b42100f247364bcf156f9591aa Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 21 Mar 2026 03:18:59 +0100
Subject: [PATCH 12/93] =?UTF-8?q?ocamlPackages.posix-base:=202.2.0=20?=
 =?UTF-8?q?=E2=86=92=204.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.posix-errno: init at 4.0.2
ocamlPackages.srt: 0.3.3 → 0.3.4
---
 pkgs/development/ocaml-modules/posix/base.nix | 12 +++++------
 .../development/ocaml-modules/posix/errno.nix | 20 +++++++++++++++++++
 .../development/ocaml-modules/posix/math2.nix |  2 --
 .../ocaml-modules/posix/socket.nix            |  8 +++++++-
 .../development/ocaml-modules/posix/time2.nix |  4 ++--
 .../development/ocaml-modules/srt/default.nix | 12 +++++------
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 7 files changed, 42 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/posix/errno.nix

diff --git a/pkgs/development/ocaml-modules/posix/base.nix b/pkgs/development/ocaml-modules/posix/base.nix
index 6d0cd879d4e2..2b36a96f08f8 100644
--- a/pkgs/development/ocaml-modules/posix/base.nix
+++ b/pkgs/development/ocaml-modules/posix/base.nix
@@ -6,19 +6,17 @@
   integers,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "posix-base";
-  version = "2.2.0";
+  version = "4.0.2";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-posix";
-    tag = "v${version}";
-    hash = "sha256-JKJIiuo4lW8DmcK1mJlT22784J1NS2ig860jDbRIjIo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nBSIuz4WEnESlECdKujEcSxFOcSBFxW1zo7J/lT/lCY=";
   };
 
-  minimalOCamlVersion = "4.08";
-
   propagatedBuildInputs = [
     ctypes
     integers
@@ -30,4 +28,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/posix/errno.nix b/pkgs/development/ocaml-modules/posix/errno.nix
new file mode 100644
index 000000000000..c91a0e02f17c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/posix/errno.nix
@@ -0,0 +1,20 @@
+{
+  buildDunePackage,
+  posix-base,
+}:
+
+buildDunePackage {
+  pname = "posix-errno";
+
+  inherit (posix-base) version src;
+
+  propagatedBuildInputs = [
+    posix-base
+  ];
+
+  doCheck = true;
+
+  meta = posix-base.meta // {
+    description = "Posix-errno provides comprehensive errno handling";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/posix/math2.nix b/pkgs/development/ocaml-modules/posix/math2.nix
index e60116f0dedd..62168e5710a1 100644
--- a/pkgs/development/ocaml-modules/posix/math2.nix
+++ b/pkgs/development/ocaml-modules/posix/math2.nix
@@ -1,7 +1,6 @@
 {
   buildDunePackage,
   posix-base,
-  unix-errno,
 }:
 
 buildDunePackage {
@@ -10,7 +9,6 @@ buildDunePackage {
 
   propagatedBuildInputs = [
     posix-base
-    unix-errno
   ];
 
   meta = posix-base.meta // {
diff --git a/pkgs/development/ocaml-modules/posix/socket.nix b/pkgs/development/ocaml-modules/posix/socket.nix
index 47d422b09322..f7b5fb473b02 100644
--- a/pkgs/development/ocaml-modules/posix/socket.nix
+++ b/pkgs/development/ocaml-modules/posix/socket.nix
@@ -1,4 +1,8 @@
-{ buildDunePackage, posix-base }:
+{
+  buildDunePackage,
+  posix-base,
+  dune-configurator,
+}:
 
 buildDunePackage {
   pname = "posix-socket";
@@ -7,6 +11,8 @@ buildDunePackage {
 
   minimalOCamlVersion = "4.12";
 
+  buildInputs = [ dune-configurator ];
+
   propagatedBuildInputs = [ posix-base ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/posix/time2.nix b/pkgs/development/ocaml-modules/posix/time2.nix
index 42906f67381a..ca38ba107945 100644
--- a/pkgs/development/ocaml-modules/posix/time2.nix
+++ b/pkgs/development/ocaml-modules/posix/time2.nix
@@ -3,7 +3,7 @@
   buildDunePackage,
   posix-base,
   posix-types,
-  unix-errno,
+  posix-errno,
 }:
 
 buildDunePackage {
@@ -14,7 +14,7 @@ buildDunePackage {
   propagatedBuildInputs = [
     posix-base
     posix-types
-    unix-errno
+    posix-errno
   ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/srt/default.nix b/pkgs/development/ocaml-modules/srt/default.nix
index 6cbcf20b1727..7275d6c6d11e 100644
--- a/pkgs/development/ocaml-modules/srt/default.nix
+++ b/pkgs/development/ocaml-modules/srt/default.nix
@@ -8,17 +8,17 @@
   ctypes-foreign,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "srt";
-  version = "0.3.3";
+  version = "0.3.4";
 
   minimalOCamlVersion = "4.12";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-srt";
-    rev = "v${version}";
-    hash = "sha256-FVgOEBPYZz7SQ5c6mLAssDwY1NuXsV3ghP7OyLRd9Kw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+1/TffqssRA9YR3KLfbAr/ZpDF5XUKw24gj4HWrhObU=";
   };
 
   buildInputs = [ dune-configurator ];
@@ -31,10 +31,10 @@ buildDunePackage rec {
   meta = {
     description = "OCaml bindings for the libsrt library";
     license = lib.licenses.gpl2Plus;
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/savonet/ocaml-srt";
     maintainers = with lib.maintainers; [
       vbgl
       dandellion
     ];
   };
-}
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index cc7036327e32..385f9012a673 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1746,6 +1746,8 @@ let
 
         posix-base = callPackage ../development/ocaml-modules/posix/base.nix { };
 
+        posix-errno = callPackage ../development/ocaml-modules/posix/errno.nix { };
+
         posix-math2 = callPackage ../development/ocaml-modules/posix/math2.nix { };
 
         posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { };

From 32387561c735f813c7ded7904ae26ea1d19d2ba6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2026 04:24:52 +0000
Subject: [PATCH 13/93] vscode: 1.111.0 -> 1.112.0

---
 pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 07b6893661f5..d31d783a3c04 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -35,17 +35,17 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-3s0UzfkufKXXm57JgKaMan/SRAlGTLmdIRXXpzxQvAo=";
-      x86_64-darwin = "sha256-1+1Lin4KH3BiriA6m0TJlVG4m9Xl+PyE5cJFborOATM=";
-      aarch64-linux = "sha256-p68lztb+e8OMXtyaqXDdElhuhmv4Og7R+tdRXG85DnU=";
-      aarch64-darwin = "sha256-DUjT+vqjct8WMiRecltPcL+Jn78DfnuyGTMWhaGVcRY=";
-      armv7l-linux = "sha256-70WqRdVnx4zTY5eUFrxz4MiREXNSvahuINcu/9VNkZU=";
+      x86_64-linux = "sha256-VyjqPTyLn8eGh/XS3nn0PMqiAsrL91vDZD6Z9L2oh24=";
+      x86_64-darwin = "sha256-3ACtYUblaJs8I1BHHFOSFuAODP0dziXFvd0qdJ/izZ8=";
+      aarch64-linux = "sha256-wyiOvHNMuE6SbInYK9vlYVkbdxAlf9/xHa2nKWh8ecc=";
+      aarch64-darwin = "sha256-0sOKWswv7M3VCralFt1BAA45JrQyAX4Fr/5imNmcaHA=";
+      armv7l-linux = "sha256-hAAuYK7ZQGpAQLE9o8/GF+qHHj0OfT15IXY9cvaKBC0=";
     }
     .${system} or throwSystem;
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.111.0";
+  version = "1.112.0";
 
   # The update server (update.code.visualstudio.com) expects the version path
   # segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
@@ -53,7 +53,7 @@ let
   downloadVersion = lib.versions.pad 3 version;
 
   # This is used for VS Code - Remote SSH test
-  rev = "ce099c1ed25d9eb3076c11e4a280f3eb52b4fbeb";
+  rev = "07ff9d6178ede9a1bd12ad3399074d726ebe6e43";
 in
 buildVscode {
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -86,7 +86,7 @@ buildVscode {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-0fEyS5/FtUBVE6J8NGghKITtIq6Yykyi5Vt8S20INP8=";
+      hash = "sha256-je83XIJD2Ayc4/j05BCUi/0dblVGlLQdDf+u7wfHZgA=";
     };
     stdenv = stdenvNoCC;
   };

From 8a379bb63cf5742911658dca78b0fb80a26dd950 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sat, 21 Mar 2026 20:15:37 +0100
Subject: [PATCH 14/93] servo: remove supinie from maintainers

---
 pkgs/by-name/se/servo/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 7ce62bf3273f..c686d97ab69b 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -176,7 +176,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       hexa
-      supinie
     ];
     teams = with lib.teams; [ ngi ];
     mainProgram = "servo";

From 51482bc6cd3e4f43bab7426fd7dd8e94bb36c733 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2026 03:05:22 +0000
Subject: [PATCH 15/93] qsv: 17.0.0 -> 18.0.0

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

diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index 9250bda31a59..28f3d73dca03 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -15,7 +15,7 @@
   withUi ? true,
   buildFeatures ?
     # enable all features except self_update by default
-    # https://github.com/dathere/qsv/blob/17.0.0/Cargo.toml#L370
+    # https://github.com/dathere/qsv/blob/18.0.0/Cargo.toml#L370
     [
       "apply"
       "feature_capable"
@@ -33,7 +33,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qsv";
-  version = "17.0.0";
+  version = "18.0.0";
 
   inherit buildFeatures;
 
@@ -41,10 +41,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "dathere";
     repo = "qsv";
     rev = finalAttrs.version;
-    hash = "sha256-RIrphnw0opCvp0fhkvevNaOQJ8/25c34qYfg4IVNP9g=";
+    hash = "sha256-2S10BYLSB2pLMX5kiLv1v4naSwFL66rl7NPzBGrz9Rg=";
   };
 
-  cargoHash = "sha256-nTyxEX2jiFZxkao0/xFxGjpitc5K0BQSvvo3A+PFLEI=";
+  cargoHash = "sha256-IdzTG3L3bzOMrmQls1mTsPQYp3hHThZ5l968fH+4Q5s=";
 
   buildInputs = [
     file

From 977f17a7e7982c89b188035b573de0952e37aba5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2026 08:42:15 +0000
Subject: [PATCH 16/93] clickhouse-lts: 25.8.18.1-lts -> 25.8.20.4-lts

---
 pkgs/by-name/cl/clickhouse/lts.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix
index 1cbd1eca961f..100c72de62fb 100644
--- a/pkgs/by-name/cl/clickhouse/lts.nix
+++ b/pkgs/by-name/cl/clickhouse/lts.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "25.8.18.1-lts";
-  rev = "557fdf60f81c4370867dff464de7f4b1064d39a7";
-  hash = "sha256-6QBejA0GdhjHVcqHVqjZkiJ1tmPglvIaFffBWyseYX8=";
+  version = "25.8.20.4-lts";
+  rev = "2e1cd6354ae8898072e5dbf97aa6e5945761e3d7";
+  hash = "sha256-Xd9hLb4sXnSQby8NuKnD0b8R6iGb+M4u0L0yYASNvzw=";
   lts = true;
 }

From 4fd6b31a326472305c2709c1ce7dc7a8ea5b839d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Sun, 22 Mar 2026 09:20:32 +0000
Subject: [PATCH 17/93] devenv: 2.0.5 -> 2.0.6

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pkgs/by-name/de/devenv/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 51d307c2a2e2..15bde47de803 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -23,16 +23,16 @@
 }:
 
 let
-  version = "2.0.5";
+  version = "2.0.6";
   devenvNixVersion = "2.32";
-  devenvNixRev = "ef483d53f25990bf0b4fd39f5414f885977ebd85";
+  devenvNixRev = "e127c1c94cefe02d8ca4cca79ef66be4c527510e";
 
   nix_components =
     (nixVersions.nixComponents_git.overrideSource (fetchFromGitHub {
       owner = "cachix";
       repo = "nix";
       rev = devenvNixRev;
-      hash = "sha256-eY8JFns4OeEidye8VIW68LSoykbPO0bQujvQVLLK7Qg=";
+      hash = "sha256-MRNVInSmvhKIg3y0UdogQJXe+omvKijGszFtYpd5r9k=";
     })).overrideScope
       (
         finalScope: prevScope: {
@@ -48,10 +48,10 @@ rustPlatform.buildRustPackage {
     owner = "cachix";
     repo = "devenv";
     tag = "v${version}";
-    hash = "sha256-8tO3NLG9Lc/NUee0Owcf/z63TNTrUcx7eVRxSb294rk=";
+    hash = "sha256-i1G6n/7Z5fO9RhplzXQSTiLyh1Cs0GhoCoEStFLARtA=";
   };
 
-  cargoHash = "sha256-ecntFSPDWblllDtS/D086UKtQJG9La4TGEBhP3q0CfY=";
+  cargoHash = "sha256-p5kI7HlG6RVxCCEb/J0L2gh36jkm/atAV98ny3h4vqo=";
 
   env = {
     RUSTFLAGS = "--cfg tracing_unstable";

From d047ec7b825b64013a48dc7dca123a80238a878a Mon Sep 17 00:00:00 2001
From: sophronesis <oleksandr.buzynnyi@gmail.com>
Date: Sun, 22 Mar 2026 10:49:37 +0100
Subject: [PATCH 18/93] maintainers: add sophronesis

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3c60e66f9aa1..9d58f348c4d8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24948,6 +24948,12 @@
     githubId = 13762043;
     matrix = "@sophie:nue.soopy.moe";
   };
+  sophronesis = {
+    email = "oleksandr.buzynnyi@gmail.com";
+    github = "sophronesis";
+    githubId = 13190573;
+    name = "Oleksandr Buzynnyi";
+  };
   sophrosyne = {
     email = "joshuaortiz@tutanota.com";
     github = "sophrosyne97";

From 2e2483d3aa9d76f6775add84b39e30c95ed7c84f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2026 14:55:19 +0000
Subject: [PATCH 19/93] hello-wayland: 0-unstable-2024-03-04 ->
 0-unstable-2026-03-17

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

diff --git a/pkgs/by-name/he/hello-wayland/package.nix b/pkgs/by-name/he/hello-wayland/package.nix
index da0e883992b3..e2091340fd1e 100644
--- a/pkgs/by-name/he/hello-wayland/package.nix
+++ b/pkgs/by-name/he/hello-wayland/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation {
   pname = "hello-wayland";
-  version = "0-unstable-2024-03-04";
+  version = "0-unstable-2026-03-17";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "hello-wayland";
-    rev = "5f3a35def81116f0a74fcaf5a421d66c6700482d";
-    hash = "sha256-gcLR8gosQlPPgFrxqmRQ6/59RjAfJNX6CcsYP+L+A58=";
+    rev = "9a64c5ce78d004dc50814361b5153cef071f7042";
+    hash = "sha256-YSdBY0IJQB7iyiunVikFHd0S2GlPy7cZBl+aQkpCY1s=";
   };
 
   separateDebugInfo = true;

From bd93b0b4927bcf91c1616d86626bb5e31b3931e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2026 16:21:18 +0000
Subject: [PATCH 20/93] spicedb: 1.49.1 -> 1.50.0

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

diff --git a/pkgs/by-name/sp/spicedb/package.nix b/pkgs/by-name/sp/spicedb/package.nix
index 85ca54ef16ef..954124454457 100644
--- a/pkgs/by-name/sp/spicedb/package.nix
+++ b/pkgs/by-name/sp/spicedb/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "spicedb";
-  version = "1.49.1";
+  version = "1.50.0";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FqgNtHh2eDy48uFWMmqjpVnrGHBUEM+CG3ukkPhEOqY=";
+    hash = "sha256-ixV2BINcZgcl17g58Qsi6t7nbjmJ86MBEcl12AEMHfg=";
   };
 
-  vendorHash = "sha256-wK5GDMkWesWRO5J2M5ambZShAw7b4U0+/lmAgXn8Ags=";
+  vendorHash = "sha256-C3GqC0isMM8XP8K6BLd7I3UFxXPHs2Vmm0+LCroH6k4=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'"

From d65628d32eee295e77dfc0147141b49a53a87525 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 20 Mar 2026 23:37:24 +0000
Subject: [PATCH 21/93] python3Packages.pylance: 3.0.0 -> 3.0.1

Diff: https://github.com/lancedb/lance/compare/v3.0.0...v3.0.1

Changelog: https://github.com/lancedb/lance/releases/tag/v3.0.1
---
 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 d324aa4582a4..70be656ae915 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylance";
-  version = "3.0.0";
+  version = "3.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-71PogI877/dLwwlvMBraaC0vQWKtAHI/bmGEIBZVui4=";
+    hash = "sha256-zlD6jHMpgk4gvMjBizZP2VV0zM6iKaatIq6PbBKWaJ8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python";
@@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-scQDRyX3hweYZep+LVAsiVqOvDTEw/ss0/4M3R4ewDU=";
+    hash = "sha256-+4UVY4JjQsVT+S5+j9PEXoFuiZhrrelSEfY8EvXp/Sk=";
   };
 
   nativeBuildInputs = [

From 4c267c9cc9b856630221397c3895299e109ca7af Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 20 Mar 2026 23:44:02 +0000
Subject: [PATCH 22/93] python3Packages.lance-namespace-urllib3-client: 0.5.2
 -> 0.6.1

Diff: https://github.com/lancedb/lance-namespace/compare/v0.5.2...v0.6.1
---
 .../python-modules/lance-namespace-urllib3-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
index 2e9915152c4c..2f71cd77326c 100644
--- a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
+++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "lance-namespace-urllib3-client";
-  version = "0.5.2";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance-namespace";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6Vfy/A9ZrvHM4M/3ZCmq+xv/WxSh9eRaTlbk+ejvSUY=";
+    hash = "sha256-eN50KkYOOs209oB5O7AOMXuYpOjXWU6mccRGPgM/4DQ=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python/lance_namespace_urllib3_client";

From 02a06cb579ee8702ec3fff0897faa8738646634e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 20 Mar 2026 23:44:15 +0000
Subject: [PATCH 23/93] python3Packages.lance-namespace: 0.5.2 -> 0.6.1

Diff: https://github.com/lancedb/lance-namespace/compare/v0.5.2...v0.6.1
---
 pkgs/development/python-modules/lance-namespace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix
index 87fc6c6ae1ff..924c61d190fa 100644
--- a/pkgs/development/python-modules/lance-namespace/default.nix
+++ b/pkgs/development/python-modules/lance-namespace/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "lance-namespace";
-  version = "0.5.2";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance-namespace";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6Vfy/A9ZrvHM4M/3ZCmq+xv/WxSh9eRaTlbk+ejvSUY=";
+    hash = "sha256-eN50KkYOOs209oB5O7AOMXuYpOjXWU6mccRGPgM/4DQ=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python/lance_namespace";

From 8f4ed6ae483777c88325e8a8c421810d6f01b090 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 20 Mar 2026 23:49:44 +0000
Subject: [PATCH 24/93] python3Packages.lancedb: 0.29.2 -> 0.30.1

Diff: https://github.com/lancedb/lancedb/compare/python-v0.29.2...python-v0.30.1

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

diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix
index afa7092d857d..ded3466b2ea0 100644
--- a/pkgs/development/python-modules/lancedb/default.nix
+++ b/pkgs/development/python-modules/lancedb/default.nix
@@ -42,21 +42,21 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "lancedb";
-  version = "0.29.2";
+  version = "0.30.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lancedb";
     tag = "python-v${finalAttrs.version}";
-    hash = "sha256-sOgRGn0romt5xJ70c+GSqNoRAp0D9F9hEq6bm7JRK/Y=";
+    hash = "sha256-LzuzVl6cTkn1Owd91bHi5JS43KZUhd/ZD9biS21MdVs=";
   };
 
   buildAndTestSubdir = "python";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-GQA5RuxpYmrNqNrpW4GLZlXrphflErmR5PeeVcs6ZJQ=";
+    hash = "sha256-U5wpWN6e26187DYeT85l6TxBnUu8rD+UzE98OIkretc=";
   };
 
   build-system = [ rustPlatform.maturinBuildHook ];

From 28567e69dc139dfaefc977697947d5a34b7435ec Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 20 Mar 2026 23:58:15 +0000
Subject: [PATCH 25/93] python3Packages.bitsandbytes: 0.49.1 -> 0.49.2

Diff: https://github.com/bitsandbytes-foundation/bitsandbytes/compare/0.49.1...0.49.2

Changelog: https://github.com/bitsandbytes-foundation/bitsandbytes/releases/tag/0.49.2
---
 .../python-modules/bitsandbytes/default.nix      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix
index 29b135fb27fa..b814a9825022 100644
--- a/pkgs/development/python-modules/bitsandbytes/default.nix
+++ b/pkgs/development/python-modules/bitsandbytes/default.nix
@@ -26,9 +26,6 @@
 }:
 
 let
-  pname = "bitsandbytes";
-  version = "0.49.1";
-
   brokenConditions = lib.attrsets.filterAttrs (_: cond: cond) {
     "CUDA and ROCm are mutually exclusive" = cudaSupport && rocmSupport;
     "CUDA is not targeting Linux" = cudaSupport && !stdenv.hostPlatform.isLinux;
@@ -73,15 +70,16 @@ let
     paths = cuda-common-redist;
   };
 in
-buildPythonPackage {
-  inherit pname version;
+buildPythonPackage (finalAttrs: {
+  pname = "bitsandbytes";
+  version = "0.49.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bitsandbytes-foundation";
     repo = "bitsandbytes";
-    tag = version;
-    hash = "sha256-nNhxDJITXNIZMXuZdzpF5dl1K1kFEVQ0gbTqZnOf/sI=";
+    tag = finalAttrs.version;
+    hash = "sha256-Z7C159ZpdthQppXibzA06rAglfM3Hmwd7LX4bPjk1Eo=";
   };
 
   patches = [
@@ -204,11 +202,11 @@ buildPythonPackage {
   meta = {
     description = "8-bit CUDA functions for PyTorch";
     homepage = "https://github.com/bitsandbytes-foundation/bitsandbytes";
-    changelog = "https://github.com/bitsandbytes-foundation/bitsandbytes/releases/tag/${version}";
+    changelog = "https://github.com/bitsandbytes-foundation/bitsandbytes/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       bcdarwin
       jk
     ];
   };
-}
+})

From 9d6cda03b9e6fdd1f46c5823abef0aee3b3307a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2026 21:21:16 +0000
Subject: [PATCH 26/93] python3Packages.snakemake-interface-logger-plugins:
 2.0.0 -> 2.0.1

---
 .../snakemake-interface-logger-plugins/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
index 3a93f58f0d70..70854d4d851a 100644
--- a/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "snakemake-interface-logger-plugins";
-  version = "2.0.0";
+  version = "2.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-logger-plugins";
     tag = "v${version}";
-    hash = "sha256-GPf8FdoBHpyQADWvJ7jOF4PpLk6/Ui+nXIE/rUSIAg8=";
+    hash = "sha256-yvEjd4xBjjCocGK/HD1j5jcuy+syyXcEJGdsEFA0H40=";
   };
 
   nativeBuildInputs = [ hatchling ];

From a69626f52441e60fb23bddc9e47ffc42895c624d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 22 Mar 2026 23:04:23 +0100
Subject: [PATCH 27/93] 
 coolercontrol.{coolercontrold,coolercontrol-ui-data,coolercontrol-gui}: 4.0.1
 -> 4.1.0

---
 .../system/coolercontrol/coolercontrol-ui-data.nix            | 2 +-
 pkgs/applications/system/coolercontrol/coolercontrold.nix     | 4 ++--
 pkgs/applications/system/coolercontrol/default.nix            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
index 04dc724254ae..c7dfa03f8617 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
@@ -12,7 +12,7 @@ buildNpmPackage {
   sourceRoot = "${src.name}/coolercontrol-ui";
 
   npmDepsFetcherVersion = 2;
-  npmDepsHash = "sha256-NmTNaHm7NGkNWnNbTfLC9/3cSJRR+ir1YS+ot4MJNog=";
+  npmDepsHash = "sha256-AzRw6DuloOFC7VN7yM9czqxosfVIoXAltv2xHUxac7k=";
 
   postBuild = ''
     cp -r dist $out
diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix
index d6a6435ea382..1a2719cf0d34 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrold.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrold";
 
-  cargoHash = "sha256-i6QYJ2kVXpYVbGyY/5EeGbCVCkxLeqf1mgvrXKRdup0=";
+  cargoHash = "sha256-rFwbHsGkKLD9UgkdTbxMIjARmU0Ewal1NIwlbzRL/vc=";
 
   buildInputs = [ libdrm ];
 
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {
       --replace-fail 'Command::new("sh")' 'Command::new("${runtimeShell}")'
 
     # This is supposed to be a "nix-compatible file path", but there is nothing that actually does the substitution
-    substituteInPlace ../../coolercontrold-${version}-vendor/pciid-parser-*/src/lib.rs \
+    substituteInPlace daemon/src/repositories/hwmon/pci_ids.rs \
       --replace-fail '@hwdata@' '${hwdata}'
   '';
 
diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix
index 343f79d3c8c2..62e10a00710f 100644
--- a/pkgs/applications/system/coolercontrol/default.nix
+++ b/pkgs/applications/system/coolercontrol/default.nix
@@ -5,13 +5,13 @@
 }:
 
 let
-  version = "4.0.1";
+  version = "4.1.0";
 
   src = fetchFromGitLab {
     owner = "coolercontrol";
     repo = "coolercontrol";
     tag = version;
-    hash = "sha256-X8KEZARksSwmFEKnGnwZk9aQ0ND6fOsSelCIWPkEjN8=";
+    hash = "sha256-v1enPMezagA3gcYD5EbC1ecTOXEsMLRGWIKzgDxzRWg=";
   };
 
   meta = {

From b82c712327022c12f27034370e08fd25a5b99883 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Tue, 29 Jul 2025 16:50:09 -0700
Subject: [PATCH 28/93] ttypr: init at 0.3.6

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

diff --git a/pkgs/by-name/tt/ttypr/package.nix b/pkgs/by-name/tt/ttypr/package.nix
new file mode 100644
index 000000000000..6a9c0c002d8f
--- /dev/null
+++ b/pkgs/by-name/tt/ttypr/package.nix
@@ -0,0 +1,35 @@
+{
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "ttypr";
+  version = "0.3.6";
+
+  src = fetchFromGitHub {
+    owner = "tanciaku";
+    repo = "ttypr";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-y6FXkNfd+4Nkus+Z6Ah2AJX9iWeXQnIDeKmuLFUZDdQ=";
+  };
+
+  cargoHash = "sha256-bmwvirAbjzD5NJDHJgbPhnNqTdfo8CWJ2JWgFEBz+2Y=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/tanciaku/ttypr/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    description = "Terminal typing practice";
+    longDescription = ''
+      ttypr is a simple, lightweight typing practice application that
+      runs in your terminal, built with Rust and Ratatui.
+    '';
+    homepage = "https://github.com/hotellogical05/ttypr";
+    license = lib.licenses.mit;
+    mainProgram = "ttypr";
+    maintainers = with lib.maintainers; [ yiyu ];
+  };
+})

From f904767ca2e9dbf9a47bf97e904289e56ee0a41a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 22 Mar 2026 23:28:57 +0000
Subject: [PATCH 29/93] python3Packages.kserve: skip failing tests

---
 pkgs/development/python-modules/kserve/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index f091c1301ba2..f16660f4c420 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -176,6 +176,12 @@ buildPythonPackage (finalAttrs: {
   ];
 
   disabledTests = [
+    # AttributeError: 'google._upb._message.FieldDescriptor' object has no attribute 'label'
+    "test_health_handler"
+    "test_list_handler"
+    "test_liveness_handler"
+    "test_server_readiness"
+
     # Started failing since vllm was updated to 0.13.0
     # pydantic_core._pydantic_core.ValidationError: 1 validation error for RerankResponse
     # usage.prompt_tokens

From 0dad55e848f458c9c7fe7fee67ba23d0d3de6838 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 23 Mar 2026 00:59:44 +0100
Subject: [PATCH 30/93] pkgsCross.ghcjs.ghc: fix rts/Types.h missing for GHC >=
 9.12.3

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

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 33f95c9c37eb..d9635b7cfcd2 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -323,6 +323,19 @@
       # Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810
       ++ [ ./ghc-9.6-or-later-docs-sphinx-9.patch ]
 
+      # Fixes rts/Types.h missing from the install when targeting javascript
+      # See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15740, krank:ignore-line
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/27033. krank:ignore-line
+      # TODO(@sternenseemann): patch likely included in 9.12.4
+      ++ lib.optionals (lib.versionAtLeast version "9.12.3" && lib.versionOlder version "9.15") [
+        (fetchpatch {
+          name = "ghc-9.12.3-ghcjs-install-rts-types.h.patch";
+          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5b1be555be4f0989d78c274991c5046d7ac6d25e.patch";
+          hash = "sha256-pv4NDyQ6FlZgmTYZ4Ghis4qggt7nCDMhqGaFxTxVPac=";
+          includes = [ "rts/rts.cabal" ];
+        })
+      ]
+
       ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; });
 
     stdenv = stdenvNoCC;

From 267a4851917d78bd83ccb86f9b4fc4c74eed197a Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 23 Mar 2026 01:00:13 +0100
Subject: [PATCH 31/93] haskell.compiler.ghcHEAD: 9.15.20251225 ->
 9.15.20260322

---
 pkgs/development/compilers/ghc/head.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index e343cd33cef8..b745931a6ca9 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,5 +1,5 @@
 import ./common-hadrian.nix {
-  version = "9.15.20251225";
-  rev = "a3afae0c85fa57479378a5df5bbde2e3a8da8a06";
-  sha256 = "sha256-inZFFKnCb8C7RTlKP2bnHOLfc1GveGi6Wy0uAaLv1Kk=";
+  version = "9.15.20260322";
+  rev = "44f118f09dcde49f64d03e427312df4732f2d4a4";
+  sha256 = "sha256-xby7HKyK5P1Y5DjKbVe62piDCY4Ujb4pbv8AJ7sQ0HI=";
 }

From d288b1bca895acf1b6c6ee20c900195298795a85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 00:35:07 +0000
Subject: [PATCH 32/93] pv: 1.10.4 -> 1.10.5

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

diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix
index 260c3902fae5..9bfb87160eef 100644
--- a/pkgs/by-name/pv/pv/package.nix
+++ b/pkgs/by-name/pv/pv/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pv";
-  version = "1.10.4";
+  version = "1.10.5";
 
   src = fetchurl {
     url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
-    hash = "sha256-fplPm4ZFggookohGgFFXWt8JoeaI2OTY+j7MSHeL98k=";
+    hash = "sha256-qyG0+GYigGRragLhufCWeQkY+JyVK74NBv73XTtS+xU=";
   };
 
   meta = {

From d3203d2dbd03fb2626949adbfd6033ca8ce95864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 22 Mar 2026 17:54:27 -0700
Subject: [PATCH 33/93] canaille: don't test coverage

---
 pkgs/by-name/ca/canaille/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix
index 7d0c5a36a0dd..fa8a97c63beb 100644
--- a/pkgs/by-name/ca/canaille/package.nix
+++ b/pkgs/by-name/ca/canaille/package.nix
@@ -48,7 +48,6 @@ python.pkgs.buildPythonApplication rec {
     [
       pytestCheckHook
       postgresql
-      coverage
       flask-webtest
       pyquery
       pytest-cov-stub

From 0479ff6f0d3106b1ec32ebf2b71ad70633d71849 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 22 Mar 2026 19:08:25 -0700
Subject: [PATCH 34/93] python3Packages.pyliebherrhomeapi: init at 0.3.0

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

diff --git a/pkgs/development/python-modules/pyliebherrhomeapi/default.nix b/pkgs/development/python-modules/pyliebherrhomeapi/default.nix
new file mode 100644
index 000000000000..df6c3ae728ab
--- /dev/null
+++ b/pkgs/development/python-modules/pyliebherrhomeapi/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  pytestCheckHook,
+  pytest-asyncio,
+  pytest-timeout,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pyliebherrhomeapi";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mettolen";
+    repo = "pyliebherrhomeapi";
+    tag = finalAttrs.version;
+    hash = "sha256-J+s9oRKK2DWZV05M1bvDEBqczaJXuif4t3eOJUgrAu0=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    pytest-timeout
+  ];
+
+  pythonImportsCheck = [ "pyliebherrhomeapi" ];
+
+  meta = {
+    description = "Python library for Liebherr Home API";
+    homepage = "https://github.com/mettolen/pyliebherrhomeapi";
+    changelog = "https://github.com/mettolen/pyliebherrhomeapi/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1903ee62e571..b9448d2415ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14094,6 +14094,8 @@ self: super: with self; {
 
   pylibsrtp = callPackage ../development/python-modules/pylibsrtp { };
 
+  pyliebherrhomeapi = callPackage ../development/python-modules/pyliebherrhomeapi { };
+
   pylink-square = callPackage ../development/python-modules/pylink-square { };
 
   pylint = callPackage ../development/python-modules/pylint { };

From 651625b3fa8d8e7919d87686f18b584c88ae3eba Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 22 Mar 2026 19:08:29 -0700
Subject: [PATCH 35/93] home-assistant/component-packages.nix: update

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index af346b199da5..8161ec85e8fa 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3421,7 +3421,8 @@
       ];
     "liebherr" =
       ps: with ps; [
-      ]; # missing inputs: pyliebherrhomeapi
+        pyliebherrhomeapi
+      ];
     "life360" =
       ps: with ps; [
       ];
@@ -7709,6 +7710,7 @@
     "lg_thinq"
     "libre_hardware_monitor"
     "lidarr"
+    "liebherr"
     "life360"
     "lifx"
     "light"

From 7505e6cd4a4904b6d5ef0f8b5f0a61ae3028f304 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 22 Mar 2026 15:35:31 -0700
Subject: [PATCH 36/93] python3Packages.indevolt-api: init at 1.2.2

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

diff --git a/pkgs/development/python-modules/indevolt-api/default.nix b/pkgs/development/python-modules/indevolt-api/default.nix
new file mode 100644
index 000000000000..a71243a448df
--- /dev/null
+++ b/pkgs/development/python-modules/indevolt-api/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  wheel,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "indevolt-api";
+  version = "1.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Xirt";
+    repo = "indevolt-api";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IDX7GgEDLryKTVIQM52hApI5Il+V7ay9usmL5FPc6vc=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  # no tests in upstream repository
+  doCheck = false;
+
+  pythonImportsCheck = [ "indevolt_api" ];
+
+  meta = {
+    description = "Python API client for Indevolt devices";
+    homepage = "https://github.com/Xirt/indevolt-api";
+    changelog = "https://github.com/Xirt/indevolt-api/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 575cdbf09f0e..4a780ea7b50f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7473,6 +7473,8 @@ self: super: with self; {
 
   incremental = callPackage ../development/python-modules/incremental { };
 
+  indevolt-api = callPackage ../development/python-modules/indevolt-api { };
+
   indexed-bzip2 = callPackage ../development/python-modules/indexed-bzip2 { };
 
   indexed-gzip = callPackage ../development/python-modules/indexed-gzip { inherit (pkgs) zlib; };

From 799f1342952f155730d9e61570c255700d6cf0fc Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Sun, 22 Mar 2026 15:36:41 -0700
Subject: [PATCH 37/93] home-assistant: update component-packages.nix

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index fee78b75db8f..a83c6b94aa9c 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2826,7 +2826,8 @@
       ];
     "indevolt" =
       ps: with ps; [
-      ]; # missing inputs: indevolt-api
+        indevolt-api
+      ];
     "indianamichiganpower" =
       ps: with ps; [
       ];
@@ -7642,6 +7643,7 @@
     "immich"
     "improv_ble"
     "incomfort"
+    "indevolt"
     "inels"
     "influxdb"
     "inkbird"

From 9e8675f0c086955c12abe477435c2473ad2276db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 02:25:53 +0000
Subject: [PATCH 38/93] rs-tftpd: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix
index 8e3786f84fc5..81f0fc142a38 100644
--- a/pkgs/by-name/rs/rs-tftpd/package.nix
+++ b/pkgs/by-name/rs/rs-tftpd/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rs-tftpd";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "altugbakan";
     repo = "rs-tftpd";
     tag = finalAttrs.version;
-    hash = "sha256-ObGJVoFI4HTQ2tuoFbMBrub/64X9AMF/oCs1OPXzWJ8=";
+    hash = "sha256-ozp/PAc5rFexr81Sx0MPaBLIyggttjImdt+Vs7BDnfc=";
   };
 
-  cargoHash = "sha256-oQOT4P4/zGXLe7gMetBqTIRDWbroKp8sCChQFgeZ0zs=";
+  cargoHash = "sha256-mu7o0vqI12bR0z9YaBa36JNgVbLVGZfpQpnsCqhckeU=";
 
   buildFeatures = [ "client" ];
 

From 4919484fe1b187f00d1ff10c1215c0a6ea48a2f4 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 17 Mar 2026 01:28:09 +0000
Subject: [PATCH 39/93] clash-rs: 0.9.5 -> 0.9.6

---
 pkgs/by-name/cl/clash-rs/Cargo.patch          | 50 -------------------
 pkgs/by-name/cl/clash-rs/package.nix          | 17 ++-----
 .../cl/clash-rs/unbounded-shifts.patch        | 11 ----
 3 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 pkgs/by-name/cl/clash-rs/Cargo.patch
 delete mode 100644 pkgs/by-name/cl/clash-rs/unbounded-shifts.patch

diff --git a/pkgs/by-name/cl/clash-rs/Cargo.patch b/pkgs/by-name/cl/clash-rs/Cargo.patch
deleted file mode 100644
index af1c5dc5295f..000000000000
--- a/pkgs/by-name/cl/clash-rs/Cargo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1265,7 +1265,7 @@
-  "sha2 0.10.9",
-  "shadowquic",
-  "shadowsocks",
-- "smoltcp 0.12.0 (git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64)",
-+ "smoltcp",
-  "sock2proc",
-  "socket2 0.6.2",
-  "ssh-key",
-@@ -4636,7 +4636,7 @@
-  "etherparse 0.16.0",
-  "futures",
-  "rand 0.8.5",
-- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smoltcp",
-  "spin 0.9.8",
-  "tokio",
-  "tokio-util",
-@@ -7293,20 +7293,6 @@
- ]
- 
- [[package]]
--name = "smoltcp"
--version = "0.12.0"
--source = "git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64#ac32e643a4b7e09161193071526b3ca5a0deedb5"
--dependencies = [
-- "bitflags 1.3.2",
-- "byteorder",
-- "cfg-if",
-- "defmt 0.3.100",
-- "heapless",
-- "log",
-- "managed",
--]
--
--[[package]]
- name = "sock2proc"
- version = "0.1.0"
- source = "git+https://github.com/Watfaq/sock2proc.git?rev=9f9e630#9f9e6304d62285115b2e4fa632527ae563bf0fcc"
-@@ -9797,7 +9783,7 @@
-  "netstack-lwip",
-  "netstack-smoltcp",
-  "rand 0.9.2",
-- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smoltcp",
-  "socket2 0.6.2",
-  "tokio",
-  "tracing",
diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix
index 84066d4088a5..caa92e288d37 100644
--- a/pkgs/by-name/cl/clash-rs/package.nix
+++ b/pkgs/by-name/cl/clash-rs/package.nix
@@ -10,27 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clash-rs";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "Watfaq";
     repo = "clash-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ymxT6AGBDTfiMbpU4Ou/SwAnUZF3vKvtt/BgWRtQTJc=";
+    hash = "sha256-5o98Yj8a30Tn/Cf3QMZ5EaCjCgD3XttqaHHuIjBWg4s=";
   };
 
-  cargoHash = "sha256-G1RLUFnQVX6tbLIF6ql6RDGZUwGPGFBHgx15KT3/tNQ=";
-
-  cargoPatches = [ ./Cargo.patch ];
-
-  patches = [
-    ./unbounded-shifts.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace clash-lib/Cargo.toml \
-      --replace-fail ', git = "https://github.com/smoltcp-rs/smoltcp.git", rev = "ac32e64"' ""
-  '';
+  cargoHash = "sha256-tRAkA64D2UOEqLbkKiSBDbNlvX7tejSJwYF7+VwicAk=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch b/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch
deleted file mode 100644
index 679bb20745fa..000000000000
--- a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/clash-lib/src/lib.rs
-+++ b/clash-lib/src/lib.rs
-@@ -3,7 +3,7 @@
- #![feature(sync_unsafe_cell)]
- #![feature(lazy_get)]
- #![feature(duration_millis_float)]
--#![cfg_attr(not(version("1.87.0")), feature(unbounded_shifts))]
-+#![feature(unbounded_shifts)]
- #![cfg_attr(not(version("1.88.0")), feature(let_chains))]
- 
- use crate::{

From 9d936b37be180b4287f1d27681ca50b4ab6bcd02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 04:47:09 +0000
Subject: [PATCH 40/93] fiddler-everywhere: 7.7.0 -> 7.7.1

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

diff --git a/pkgs/by-name/fi/fiddler-everywhere/package.nix b/pkgs/by-name/fi/fiddler-everywhere/package.nix
index e73408aa05c1..be528a39d3aa 100644
--- a/pkgs/by-name/fi/fiddler-everywhere/package.nix
+++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "fiddler-everywhere";
-  version = "7.7.0";
+  version = "7.7.1";
 
   src = fetchurl {
     url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
-    hash = "sha256-klHlC0WrqUdPbaI5oHSOcfEVFaPZNPSYtRK5fmkvsl4=";
+    hash = "sha256-mwHtT7GAR7CdOVvFPpzqF6j1Ed5kBlJ39RyITg1BgAs=";
   };
 
   appimageContents = appimageTools.extract {

From 3ee412e2678697563cff16e41bac683b080a8697 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 05:16:28 +0000
Subject: [PATCH 41/93] postgresqlPackages.pg_search: 0.22.1 -> 0.22.2

---
 pkgs/servers/sql/postgresql/ext/pg_search.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_search.nix b/pkgs/servers/sql/postgresql/ext/pg_search.nix
index 21541d38b34a..e62c4e77d1cb 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_search.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_search.nix
@@ -49,16 +49,16 @@ let
 in
 buildPgrxExtension (finalAttrs: {
   pname = "pg_search";
-  version = "0.22.1";
+  version = "0.22.2";
 
   src = fetchFromGitHub {
     owner = "paradedb";
     repo = "paradedb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HR0L3KuVDkk2xPyuIH89SWWOX4bqwFDYxaLz6+4h5tI=";
+    hash = "sha256-BqmYuSmA/yrfw8Np1HghOcFs7erv0SiryiGyDpV7CQQ=";
   };
 
-  cargoHash = "sha256-6TUi+DSu3BI63JXvMEksOcu6zjWWUD5dzLxwzv+Jydw=";
+  cargoHash = "sha256-kZfWYk3bx3bKV3GcDikrhg3N7gg31bi86V7dvotLtTE=";
 
   inherit postgresql;
 

From 3d72d0828887b836b41d9c6d186d4edaf25d797a Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sun, 22 Mar 2026 22:51:58 -0700
Subject: [PATCH 42/93] llvmPackages_git: 23.0.0-unstable-2026-03-15 ->
 23.0.0-unstable-2026-03-22

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 4dd2e20ca4c8..994e8bd95282 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -28,9 +28,9 @@ let
     "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
     "22.1.0-rc3".officialRelease.sha256 = "sha256-vGG7lDdDFW427lS384Bl7Pt9QFgK1XVxLmtm878xmxU=";
     "23.0.0-git".gitRelease = {
-      rev = "696e82db339ce6dc907378bd977ec7857cc892e9";
-      rev-version = "23.0.0-unstable-2026-03-15";
-      sha256 = "sha256-rX5GMsPJcKLkePHryT+Ru3X0S6BzM71uRoKT1ftmnO4=";
+      rev = "c911b8492374942bf4cfe35411e90a35d3837f6a";
+      rev-version = "23.0.0-unstable-2026-03-22";
+      sha256 = "sha256-LrA705BjLHt8U2qazT6+tOLglxNxTbwiCdTkYYIzIfU=";
     };
   }
   // llvmVersions;

From 12b7acae92a7cd7121a01b24902f495676f7d686 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 06:15:21 +0000
Subject: [PATCH 43/93] rattler-build: 0.59.0 -> 0.61.0

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

diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix
index f35d9ea45d95..21a8c985cf52 100644
--- a/pkgs/by-name/ra/rattler-build/package.nix
+++ b/pkgs/by-name/ra/rattler-build/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rattler-build";
-  version = "0.59.0";
+  version = "0.61.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "rattler-build";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IpFoK8TA/QhdAjp3jNlNrlSHwxbEFYNujGdtpMmMWkI=";
+    hash = "sha256-IuCfWhj3MQVJghJYkmLxV//VOZ9SSNTbIiyo3KsRbLc=";
   };
 
-  cargoHash = "sha256-MKVVWQS78IbZ6eABj/MLMqxmjhN6IeXIUHjr83sdulI=";
+  cargoHash = "sha256-dgjCTHq0HHv5GX7BrZgH4oUXWbnb8SRBU13Qf9f4Qt0=";
 
   doCheck = false; # test requires network access
 

From 919a9d4f10d250a71ba6b1dc28c5a4442dbc7c55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 07:00:53 +0000
Subject: [PATCH 44/93] jpegli: 0-unstable-2025-02-11 -> 0-unstable-2026-03-20

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

diff --git a/pkgs/by-name/jp/jpegli/package.nix b/pkgs/by-name/jp/jpegli/package.nix
index 65095bff49c0..52c8bb62f7d9 100644
--- a/pkgs/by-name/jp/jpegli/package.nix
+++ b/pkgs/by-name/jp/jpegli/package.nix
@@ -19,13 +19,13 @@
 }:
 stdenv.mkDerivation {
   pname = "jpegli";
-  version = "0-unstable-2025-02-11";
+  version = "0-unstable-2026-03-20";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "jpegli";
-    rev = "bc19ca2393f79bfe0a4a9518f77e4ad33ce1ab7a";
-    hash = "sha256-8th+QHLOoAIbSJwFyaBxUXoCXwj7K7rgg/cCK7LgOb0=";
+    rev = "a069db9215c9aab9f3a685d012b55f1c3a85c164";
+    hash = "sha256-YTp69ycZLdZPMZlCsqbmBcao+SX4RW+mY5lOvbogPHA=";
     fetchSubmodules = true;
   };
 

From 64ccc8a7dad149b8dc363b2e028afe5e83c8e047 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 07:08:51 +0000
Subject: [PATCH 45/93] lepton-jpeg-util: 0.5.3 -> 0.5.8

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

diff --git a/pkgs/by-name/le/lepton-jpeg-util/package.nix b/pkgs/by-name/le/lepton-jpeg-util/package.nix
index 212aeff6362d..6d0006bf695a 100644
--- a/pkgs/by-name/le/lepton-jpeg-util/package.nix
+++ b/pkgs/by-name/le/lepton-jpeg-util/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lepton-jpeg-util";
-  version = "0.5.3";
+  version = "0.5.8";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "lepton_jpeg_rust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DfVgQGGnrOOa/UdkYHSENbtxkbR0cTe08uglUM2hfGI=";
+    hash = "sha256-G46++ZRHdfaSElt9LwI1keDXXE2/VKH2m9+EY+QNOK4=";
   };
 
-  cargoHash = "sha256-AryHUFB6EWSUvKs+lBI16+A27VfRsr6aUtrwsiZxT28=";
+  cargoHash = "sha256-jO+LHoZKn0RORKRw5GIwO8kBoQMjvBrofRYN33OHm/I=";
 
   buildAndTestSubdir = "util";
 

From 1e2a6790ba32e20ec8a7a5ad26327c195f27a11c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 07:10:17 +0000
Subject: [PATCH 46/93] steelix: 25.07-unstable-2026-03-01 ->
 0-unstable-2026-03-19

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

diff --git a/pkgs/by-name/st/steelix/package.nix b/pkgs/by-name/st/steelix/package.nix
index 644e4c2da6fb..5ffda38f0e79 100644
--- a/pkgs/by-name/st/steelix/package.nix
+++ b/pkgs/by-name/st/steelix/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "steelix";
-  version = "25.07-unstable-2026-03-01";
+  version = "0-unstable-2026-03-19";
 
   src = fetchFromGitHub {
     owner = "mattwparas";
     repo = "helix";
-    rev = "69d8222d17d42be19d4610f74c756d9e172cef68";
-    hash = "sha256-QQuflhLeN+1tH2g7ob1N+DSnQaWDsRk0YzyX69QIX1k=";
+    rev = "03ad8a1b026c28f9ecec80c4d67151731ec9d5fc";
+    hash = "sha256-ifMz83gWOfZTxahD+kafCij2Z6SBDgntM/nCdN7OZEs=";
   };
 
-  cargoHash = "sha256-Dx+82EutywNJohvfTgoIQ3B6f2wQS9MkFyOBzXqngXM=";
+  cargoHash = "sha256-iKurrnsJw3x4QHNQYALinO39bw/XVAFJSdN/t8Nzq68=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 3725a34e67b1b622758b31fa1f7eac87c487d99f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 21 Mar 2026 10:33:10 +0000
Subject: [PATCH 47/93] onnxruntime: 1.23.2 -> 1.24.4

Diff: https://github.com/microsoft/onnxruntime/compare/v1.23.2...v1.24.4

Changelog: https://github.com/microsoft/onnxruntime/releases/tag/v1.24.4
---
 pkgs/by-name/on/onnxruntime/package.nix       | 108 +++++--------
 .../on/onnxruntime/protobuf34-nodiscard.patch | 148 +++++++++++++++---
 .../remove-MATH_NO_EXCEPT-macro.patch         |  37 +++++
 3 files changed, 197 insertions(+), 96 deletions(-)
 create mode 100644 pkgs/by-name/on/onnxruntime/remove-MATH_NO_EXCEPT-macro.patch

diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index 859adff2f720..b01633221af1 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -3,10 +3,7 @@
   config,
   stdenv,
   fetchFromGitHub,
-  applyPatches,
-  fetchpatch,
-  fetchurl,
-  abseil-cpp_202407,
+  abseil-cpp_202508,
   cmake,
   cpuinfo,
   eigen,
@@ -59,39 +56,20 @@ let
     hash = "sha256-pjwjrqq6dfiVsXIhbBtbolhiysiFlFTnx5XcX77f+C0=";
   };
 
-  onnx-src = applyPatches {
+  onnx-src = fetchFromGitHub {
     name = "onnx-src";
-    src = fetchFromGitHub {
-      owner = "onnx";
-      repo = "onnx";
-      tag = "v1.18.0";
-      hash = "sha256-UhtF+CWuyv5/Pq/5agLL4Y95YNP63W2BraprhRqJOag=";
-    };
-
-    patches = [
-      # Fix "error: conversion from 'onnx::OpSchema' to non-scalar type 'onnx::OpSchemaRegistry::OpSchemaRegisterOnce'"
-      # https://github.com/microsoft/onnxruntime/issues/26229
-      # Fix from https://github.com/onnx/onnx/pull/7390
-      (fetchpatch {
-        url = "https://github.com/onnx/onnx/commit/595a069aaac07586f111681245bc808ee63551f8.patch";
-        includes = [ "onnx/defs/schema.h" ];
-        hash = "sha256-FFAJuJse4nmNT3ixvEdlqzbr3edY46SqEFv7z/oo6m0=";
-      })
-
-      # Fix "undefined reference to `onnx::RNNShapeInference(onnx::InferenceContext&)'"
-      (fetchpatch {
-        url = "https://github.com/onnx/onnx/commit/6769c41ad64ebca0358da8c7211d2c6d0e627b2b.patch";
-        hash = "sha256-VlTHs0om20kTNvSVQaasSsa5JROliQy4k9BECTsBtbU=";
-      })
-    ];
+    owner = "onnx";
+    repo = "onnx";
+    tag = "v1.20.1";
+    hash = "sha256-XZJXD6sBvVJ6cLPyDkKOW8oSkjqcw9whUqDWd7dxY3c=";
   };
 
   cutlass-src = fetchFromGitHub {
     name = "cutlass-src";
     owner = "NVIDIA";
     repo = "cutlass";
-    tag = "v3.9.2";
-    hash = "sha256-teziPNA9csYvhkG5t2ht8W8x5+1YGGbHm8VKx4JoxgI=";
+    tag = "v4.2.1";
+    hash = "sha256-iP560D5Vwuj6wX1otJhwbvqe/X4mYVeKTpK533Wr5gY=";
   };
 
   dlpack-src = fetchFromGitHub {
@@ -106,30 +84,17 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "onnxruntime";
-  version = "1.23.2";
+  version = "1.24.4";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "onnxruntime";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-hZ2L5+0Enkw4rGDKVpRECnKXP87w6Kbiyp6Fdxwt6hk=";
+    hash = "sha256-CjPgRkPyp7dUPAOo3cePWQvucOlQAwtT4NO5w3NkV+E=";
   };
 
   patches = [
-    # Missing cstdint include (GCC 15 compatibility)
-    (fetchpatch {
-      url = "https://github.com/microsoft/onnxruntime/commit/d6e712c5b7b6260a61e54d1fe40107cf5366ee77.patch";
-      hash = "sha256-FSuPybX8f2VoxvLhcYx4rdChaiK8bSUDR32sN3Efwfc=";
-    })
-
-    # Correct maybe-uninitialized and range-loop-construct warnings
-    # https://github.com/microsoft/onnxruntime/pull/26201
-    (fetchpatch {
-      url = "https://github.com/microsoft/onnxruntime/commit/8ebd0bf1cf02414584d15d7244b07fa97d65ba02.patch";
-      hash = "sha256-vX+kaFiNdmqWI91JELcLpoaVIHBb5EPbI7rCAMYAx04=";
-    })
-
     # Skip execinfo include on musl
     # https://github.com/microsoft/onnxruntime/pull/25726
     ./musl-execinfo.patch
@@ -139,16 +104,36 @@ effectiveStdenv.mkDerivation (finalAttrs: {
 
     # Fix build of unit tests with musl libc
     # https://github.com/microsoft/onnxruntime/issues/9155
-    (fetchurl {
-      url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/462dfe0eb4b66948fe48de44545cc22bb64fdf9f/community/onnxruntime/0001-Remove-MATH_NO_EXCEPT-macro.patch";
-      hash = "sha256-BdeGYevZExWWCuJ1lSw0Roy3h+9EbJgFF8qMwVxSn1A=";
-    })
+    # Patch adapted from https://gitlab.alpinelinux.org/alpine/aports/-/raw/462dfe0eb4b66948fe48de44545cc22bb64fdf9f/community/onnxruntime/0001-Remove-MATH_NO_EXCEPT-macro.patch
+    ./remove-MATH_NO_EXCEPT-macro.patch
 
     # Fix build of ignored outputs after Protobuf 34 added `[[nodiscard]]` to
     # many functions.
     ./protobuf34-nodiscard.patch
   ];
 
+  postPatch = ''
+    substituteInPlace cmake/libonnxruntime.pc.cmake.in \
+      --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_
+    echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake
+  ''
+  + ''
+    substituteInPlace onnxruntime/core/platform/posix/env.cc --replace-fail \
+      "return PathString{};" \
+      "return PathString(\"$out/lib/\");"
+  ''
+  + lib.optionalString rocmSupport ''
+    patchShebangs tools/ci_build/hipify-perl
+  ''
+  # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691
+  + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") ''
+    rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc
+  '';
+
+  postBuild = lib.optionalString pythonSupport ''
+    ${python3Packages.python.interpreter} ../setup.py bdist_wheel
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -261,7 +246,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=unused-variable")
     (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
     (lib.cmakeBool "FETCHCONTENT_QUIET" false)
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202407.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202508.src}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DLPACK" "${dlpack-src}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FLATBUFFERS" "${flatbuffers_23.src}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MP11" "${mp11-src}")
@@ -344,29 +329,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   ];
   hardeningDisable = lib.optional effectiveStdenv.hostPlatform.isMusl "fortify";
 
-  postPatch = ''
-    substituteInPlace cmake/libonnxruntime.pc.cmake.in \
-      --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_
-    echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake
-  ''
-  # https://github.com/microsoft/onnxruntime/blob/c4f3742bb456a33ee9c826ce4e6939f8b84ce5b0/onnxruntime/core/platform/env.h#L249
-  + ''
-    substituteInPlace onnxruntime/core/platform/env.h --replace-fail \
-      "GetRuntimePath() const { return PathString(); }" \
-      "GetRuntimePath() const { return PathString(\"$out/lib/\"); }"
-  ''
-  + lib.optionalString rocmSupport ''
-    patchShebangs tools/ci_build/hipify-perl
-  ''
-  # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691
-  + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") ''
-    rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc
-  '';
-
-  postBuild = lib.optionalString pythonSupport ''
-    ${python3Packages.python.interpreter} ../setup.py bdist_wheel
-  '';
-
   # perform parts of `tools/ci_build/github/linux/copy_strip_binary.sh`
   postInstall = ''
     install -m644 -Dt $out/include \
diff --git a/pkgs/by-name/on/onnxruntime/protobuf34-nodiscard.patch b/pkgs/by-name/on/onnxruntime/protobuf34-nodiscard.patch
index 874a819bf06c..9735e6607b21 100644
--- a/pkgs/by-name/on/onnxruntime/protobuf34-nodiscard.patch
+++ b/pkgs/by-name/on/onnxruntime/protobuf34-nodiscard.patch
@@ -1,8 +1,8 @@
 diff --git a/onnxruntime/core/framework/graph_partitioner.cc b/onnxruntime/core/framework/graph_partitioner.cc
-index 43caf4766d..fabc2a26a0 100644
+index 9cb2111670..8a3ec5bab9 100644
 --- a/onnxruntime/core/framework/graph_partitioner.cc
 +++ b/onnxruntime/core/framework/graph_partitioner.cc
-@@ -957,7 +957,7 @@
+@@ -966,7 +966,7 @@ static Status CreateEpContextModel(const ExecutionProviders& execution_providers
  
      AllocatorPtr allocator = output_buffer_holder->buffer_allocator;
      IAllocatorUniquePtr<void> buffer = IAllocator::MakeUniquePtr<void>(allocator, buffer_size);
@@ -11,7 +11,7 @@ index 43caf4766d..fabc2a26a0 100644
  
      *output_buffer_holder->buffer_size_ptr = buffer_size;
      *output_buffer_holder->buffer_ptr = buffer.release();
-@@ -970,7 +970,7 @@
+@@ -979,7 +979,7 @@ static Status CreateEpContextModel(const ExecutionProviders& execution_providers
      auto out_stream_buf = std::make_unique<epctx::OutStreamBuf>(*output_write_func_holder);
      std::ostream out_stream(out_stream_buf.get());
  
@@ -21,10 +21,10 @@ index 43caf4766d..fabc2a26a0 100644
      ORT_RETURN_IF_ERROR(out_stream_buf->GetStatus());
    } else {
 diff --git a/onnxruntime/python/onnxruntime_pybind_schema.cc b/onnxruntime/python/onnxruntime_pybind_schema.cc
-index cd1d2a8da1..05da1a1447 100644
+index 8cb617fe52..254fc1abf9 100644
 --- a/onnxruntime/python/onnxruntime_pybind_schema.cc
 +++ b/onnxruntime/python/onnxruntime_pybind_schema.cc
-@@ -169,7 +169,7 @@
+@@ -163,7 +163,7 @@ void addOpSchemaSubmodule(py::module& m) {
            "_default_value",
            [](ONNX_NAMESPACE::OpSchema::Attribute* attr) -> py::bytes {
              std::string out;
@@ -34,10 +34,10 @@ index cd1d2a8da1..05da1a1447 100644
            })
        .def_readonly("required", &ONNX_NAMESPACE::OpSchema::Attribute::required);
 diff --git a/onnxruntime/test/ep_graph/test_ep_graph.cc b/onnxruntime/test/ep_graph/test_ep_graph.cc
-index 7e6d157799..f08b09990d 100644
+index 055b255132..3925db8ac7 100644
 --- a/onnxruntime/test/ep_graph/test_ep_graph.cc
 +++ b/onnxruntime/test/ep_graph/test_ep_graph.cc
-@@ -232,7 +232,7 @@
+@@ -261,7 +261,7 @@ TEST(EpGraphTest, SerializeToProto_InputModelHasExternalIni) {
                                                          handle_initializer_data));
  
      std::ofstream ofs(serialized_model_path, std::ios::binary);
@@ -46,7 +46,7 @@ index 7e6d157799..f08b09990d 100644
      ofs.flush();
  
      ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
-@@ -357,7 +357,7 @@
+@@ -395,7 +395,7 @@ TEST(EpGraphTest, SerializeToProto_Mnist) {
                                                          handle_initializer_data));
  
      std::ofstream ofs(serialized_model_path, std::ios::binary);
@@ -55,7 +55,7 @@ index 7e6d157799..f08b09990d 100644
      ofs.flush();
  
      ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
-@@ -487,7 +487,7 @@
+@@ -525,7 +525,7 @@ TEST(EpGraphTest, SerializeToProto_ConstantOfShape) {
                                                          handle_initializer_data));
  
      std::ofstream ofs(serialized_model_path, std::ios::binary);
@@ -64,7 +64,7 @@ index 7e6d157799..f08b09990d 100644
      ofs.flush();
  
      ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
-@@ -552,7 +552,7 @@
+@@ -590,7 +590,7 @@ TEST(EpGraphTest, SerializeToProto_3LayerSubgraphs) {
      ASSERT_CXX_ORTSTATUS_OK(OrtEpUtils::OrtGraphToProto(test_graph->GetOrtGraph(), model_proto));
  
      std::ofstream ofs(serialized_model_path, std::ios::binary);
@@ -73,24 +73,73 @@ index 7e6d157799..f08b09990d 100644
      ofs.flush();
  
      ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
-diff --git a/onnxruntime/test/optimizer/graph_transform_test_builder.cc b/onnxruntime/test/optimizer/graph_transform_test_builder.cc
-index 756cc4159e..8323851385 100644
---- a/onnxruntime/test/optimizer/graph_transform_test_builder.cc
-+++ b/onnxruntime/test/optimizer/graph_transform_test_builder.cc
-@@ -158,7 +158,7 @@
+diff --git a/onnxruntime/test/framework/inference_session_test.cc b/onnxruntime/test/framework/inference_session_test.cc
+index 1c4e7800b7..8ceb05f0f6 100644
+--- a/onnxruntime/test/framework/inference_session_test.cc
++++ b/onnxruntime/test/framework/inference_session_test.cc
+@@ -1045,7 +1045,7 @@ static void TestBindHelper(const std::string& log_str,
+   CreateMatMulModel(p_model, run_provider_type);
  
-   // Serialize the model to a string.
-   std::string model_data;
--  model.ToProto().SerializeToString(&model_data);
-+  ASSERT_TRUE(model.ToProto().SerializeToString(&model_data));
-   std::shared_ptr<IExecutionProvider> ep_shared = ep ? std::move(ep) : nullptr;
+   std::string s1;
+-  p_model->ToProto().SerializeToString(&s1);
++  ASSERT_TRUE(p_model->ToProto().SerializeToString(&s1));
+   std::stringstream sstr(s1);
+   ASSERT_STATUS_OK(session_object.Load(sstr));
+   ASSERT_STATUS_OK(session_object.Initialize());
+@@ -1078,7 +1078,7 @@ TEST(InferenceSessionTests, TestIOBindingReuse) {
+   CreateMatMulModel(p_model, kCpuExecutionProvider);
  
-   auto run_model = [&](TransformerLevel level, std::vector<OrtValue>& fetches,
+   std::string s1;
+-  p_model->ToProto().SerializeToString(&s1);
++  ASSERT_TRUE(p_model->ToProto().SerializeToString(&s1));
+   std::stringstream sstr(s1);
+   ASSERT_TRUE(session_object.Load(sstr).IsOK());
+   ASSERT_STATUS_OK(session_object.Initialize());
+diff --git a/onnxruntime/test/ir/graph_test.cc b/onnxruntime/test/ir/graph_test.cc
+index 4d80cb7047..c69ac46c05 100644
+--- a/onnxruntime/test/ir/graph_test.cc
++++ b/onnxruntime/test/ir/graph_test.cc
+@@ -1244,7 +1244,7 @@ TEST_F(GraphTest, GraphConstruction_CheckGraphInputOutputOrderMaintained) {
+   auto proto = model.ToProto();
+   std::string s1;
+   // std::stringstream s1;
+-  model.ToProto().SerializeToString(&s1);
++  ASSERT_TRUE(model.ToProto().SerializeToString(&s1));
+ 
+   ModelProto model_proto;
+   //  const bool result = model_proto.ParseFromIstream(&s1);
+@@ -1313,7 +1313,7 @@ TEST_F(GraphTest, UnusedInitializerAndNodeArgsAreIgnored) {
+   auto proto = model.ToProto();
+   std::string s1;
+   // std::stringstream s1;
+-  model.ToProto().SerializeToString(&s1);
++  ASSERT_TRUE(model.ToProto().SerializeToString(&s1));
+ 
+   ModelProto model_proto;
+   const bool result = model_proto.ParseFromString(s1);
+@@ -1342,7 +1342,7 @@ TEST_F(GraphTest, UnusedSparseInitializerIsIgnored) {
+     ConstructASimpleAddGraph(*m_graph, nullptr);
+     auto* m_sparse_initializer = m_graph->add_sparse_initializer();
+     ConstructSparseTensor("unused_sparse_initializer", *m_sparse_initializer);
+-    model_proto.SerializeToString(&s1);
++    ASSERT_TRUE(model_proto.SerializeToString(&s1));
+   }
+ 
+   ModelProto model_proto_1;
+@@ -1940,7 +1940,7 @@ TEST_F(GraphTest, SparseInitializerHandling) {
+     ConstructASimpleAddGraph(*m_graph, nullptr);
+     auto* m_sparse_initializer = m_graph->add_sparse_initializer();
+     ConstructSparseTensor(input_initializer_name, *m_sparse_initializer);
+-    model_proto.SerializeToString(&s1);
++    ASSERT_TRUE(model_proto.SerializeToString(&s1));
+   }
+ 
+   ModelProto model_proto_sparse;
 diff --git a/onnxruntime/test/optimizer/nchwc_optimizer_test.cc b/onnxruntime/test/optimizer/nchwc_optimizer_test.cc
-index 538f600404..111692d4ca 100644
+index fc0ba86c7f..b086040212 100644
 --- a/onnxruntime/test/optimizer/nchwc_optimizer_test.cc
 +++ b/onnxruntime/test/optimizer/nchwc_optimizer_test.cc
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ void NchwcOptimizerTester(const std::function<void(NchwcTestHelper& helper)>& bu
  
    // Serialize the model to a string.
    std::string model_data;
@@ -99,3 +148,56 @@ index 538f600404..111692d4ca 100644
  
    auto run_model = [&](TransformerLevel level, std::vector<OrtValue>& fetches) {
      SessionOptions session_options;
+diff --git a/onnxruntime/test/providers/compare_provider_test_utils.cc b/onnxruntime/test/providers/compare_provider_test_utils.cc
+index 6312014387..578d72cb09 100644
+--- a/onnxruntime/test/providers/compare_provider_test_utils.cc
++++ b/onnxruntime/test/providers/compare_provider_test_utils.cc
+@@ -83,7 +83,7 @@ void CompareOpTester::CompareWithCPU(const std::string& target_provider_type,
+ 
+   // first run with cpu
+   std::string s1;
+-  model.ToProto().SerializeToString(&s1);
++  ASSERT_TRUE(model.ToProto().SerializeToString(&s1));
+   std::istringstream model_proto_str(s1);
+ 
+   ASSERT_STATUS_OK(cpu_session_object.Load(model_proto_str));
+@@ -104,7 +104,7 @@ void CompareOpTester::CompareWithCPU(const std::string& target_provider_type,
+   ASSERT_STATUS_OK(target_session_object.RegisterExecutionProvider(std::move(target_execution_provider)));
+ 
+   std::string s2;
+-  tp_model.ToProto().SerializeToString(&s2);
++  ASSERT_TRUE(tp_model.ToProto().SerializeToString(&s2));
+   std::istringstream model_proto_str1(s2);
+   ASSERT_STATUS_OK(target_session_object.Load(model_proto_str1));
+ 
+@@ -159,7 +159,7 @@ void CompareOpTester::CompareEPs(const std::shared_ptr<IExecutionProvider>& sour
+ 
+   // first run with source provider
+   std::string s1;
+-  model.ToProto().SerializeToString(&s1);
++  ASSERT_TRUE(model.ToProto().SerializeToString(&s1));
+   std::istringstream model_proto_str(s1);
+ 
+   ASSERT_STATUS_OK(source_session_object.Load(model_proto_str));
+@@ -181,7 +181,7 @@ void CompareOpTester::CompareEPs(const std::shared_ptr<IExecutionProvider>& sour
+     ASSERT_STATUS_OK(target_session_object.RegisterExecutionProvider(target_execution_provider));
+ 
+     std::string s2;
+-    tp_model.ToProto().SerializeToString(&s2);
++    ASSERT_TRUE(tp_model.ToProto().SerializeToString(&s2));
+     std::istringstream model_proto_str1(s2);
+     ASSERT_STATUS_OK(target_session_object.Load(model_proto_str1));
+ 
+diff --git a/onnxruntime/test/unittest_util/graph_transform_test_builder.cc b/onnxruntime/test/unittest_util/graph_transform_test_builder.cc
+index 5caafa0f37..327463c615 100644
+--- a/onnxruntime/test/unittest_util/graph_transform_test_builder.cc
++++ b/onnxruntime/test/unittest_util/graph_transform_test_builder.cc
+@@ -158,7 +158,7 @@ void TransformerTester(const std::function<void(ModelTestBuilder& helper)>& buil
+ 
+   // Serialize the model to a string.
+   std::string model_data;
+-  model.ToProto().SerializeToString(&model_data);
++  ASSERT_TRUE(model.ToProto().SerializeToString(&model_data));
+   std::shared_ptr<IExecutionProvider> ep_shared = ep ? std::move(ep) : nullptr;
+ 
+   auto run_model = [&](TransformerLevel level, std::vector<OrtValue>& fetches,
diff --git a/pkgs/by-name/on/onnxruntime/remove-MATH_NO_EXCEPT-macro.patch b/pkgs/by-name/on/onnxruntime/remove-MATH_NO_EXCEPT-macro.patch
new file mode 100644
index 000000000000..c10f49929731
--- /dev/null
+++ b/pkgs/by-name/on/onnxruntime/remove-MATH_NO_EXCEPT-macro.patch
@@ -0,0 +1,37 @@
+diff --git a/onnxruntime/test/providers/cpu/math/element_wise_ops_test.cc b/onnxruntime/test/providers/cpu/math/element_wise_ops_test.cc
+index 3fb8cc3e15..ccc9bd543e 100644
+--- a/onnxruntime/test/providers/cpu/math/element_wise_ops_test.cc
++++ b/onnxruntime/test/providers/cpu/math/element_wise_ops_test.cc
+@@ -3797,13 +3797,7 @@ TEST(MathOpTest, Mean_8) {
+   test.Run(OpTester::ExpectResult::kExpectSuccess, "", {kTensorrtExecutionProvider});  // TensorRT: Input batch size is inconsistent
+ }
+ 
+-#ifdef _LIBCPP_VERSION
+-#define MATH_NO_EXCEPT
+-#else
+-#define MATH_NO_EXCEPT noexcept
+-#endif
+-
+-template <float (&op)(float value) MATH_NO_EXCEPT>
++template <float (&op)(float value)>
+ void TrigFloatTest(OpTester& test, std::initializer_list<float> input, float abs_error = -1.0f) {
+   std::vector<int64_t> dims{static_cast<int64_t>(input.size())};
+ 
+@@ -3821,7 +3815,7 @@ void TrigFloatTest(OpTester& test, std::initializer_list<float> input, float abs
+   test.Run();
+ }
+ 
+-template <double (&op)(double value) MATH_NO_EXCEPT>
++template <double (&op)(double value)>
+ void TrigDoubleTest(OpTester& test, std::initializer_list<double> input,
+                     const std::unordered_set<std::string> excluded_provider_types = {}) {
+   std::vector<int64_t> dims{static_cast<int64_t>(input.size())};
+@@ -3835,7 +3829,7 @@ void TrigDoubleTest(OpTester& test, std::initializer_list<double> input,
+   test.Run(OpTester::ExpectResult::kExpectSuccess, "", excluded_provider_types);
+ }
+ 
+-template <float (&op)(float value) MATH_NO_EXCEPT>
++template <float (&op)(float value)>
+ void TrigFloat16Test(OpTester& test, std::initializer_list<float> input) {
+   std::vector<int64_t> dims{static_cast<int64_t>(input.size())};
+ 

From 76eaae5695158c3b3f78aa5c3fc66129422f1a5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 07:13:24 +0000
Subject: [PATCH 48/93] python3Packages.genai-prices: 0.0.55 -> 0.0.56

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

diff --git a/pkgs/development/python-modules/genai-prices/default.nix b/pkgs/development/python-modules/genai-prices/default.nix
index 777e35e4edf9..2b0168e61040 100644
--- a/pkgs/development/python-modules/genai-prices/default.nix
+++ b/pkgs/development/python-modules/genai-prices/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "genai-prices";
-  version = "0.0.55";
+  version = "0.0.56";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "genai-prices";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FxHBVroKC9tgYJ+a429cnv7UVWMBoeTX+BEah7eD9Us=";
+    hash = "sha256-xiyYK+Dzx4aI9pFpO6mWf860br//PBeIl2N4xRuNQPk=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/python";

From 0a0dbe468f37618f918ff399f146581b9e4d2683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 7 Mar 2026 18:24:49 +0100
Subject: [PATCH 49/93] librechat: replace npm deps patch with fetcher version
 2

---
 .../li/librechat/0004-fix-deps-v080.patch     | 68 -------------------
 pkgs/by-name/li/librechat/package.nix         | 15 +---
 2 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 pkgs/by-name/li/librechat/0004-fix-deps-v080.patch

diff --git a/pkgs/by-name/li/librechat/0004-fix-deps-v080.patch b/pkgs/by-name/li/librechat/0004-fix-deps-v080.patch
deleted file mode 100644
index 4f76cd8cb7f8..000000000000
--- a/pkgs/by-name/li/librechat/0004-fix-deps-v080.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/client/package.json b/client/package.json
-index f96aefa2d..ef3050f72 100644
---- a/client/package.json
-+++ b/client/package.json
-@@ -121,7 +121,7 @@
-     "@tanstack/react-query-devtools": "^4.29.0",
-     "@testing-library/dom": "^9.3.0",
-     "@testing-library/jest-dom": "^5.16.5",
--    "@testing-library/react": "^14.0.0",
-+    "@testing-library/react": "^14.3.1",
-     "@testing-library/user-event": "^14.4.3",
-     "@types/jest": "^29.5.14",
-     "@types/js-cookie": "^3.0.6",
-diff --git a/package-lock.json b/package-lock.json
-index 5b484fd55..7cbc13f49 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -20,6 +20,7 @@
-         "@eslint/js": "^9.20.0",
-         "@microsoft/eslint-formatter-sarif": "^3.1.0",
-         "@playwright/test": "^1.50.1",
-+        "@testing-library/react": "^14.3.1",
-         "@types/react-virtualized": "^9.22.0",
-         "caniuse-lite": "^1.0.30001741",
-         "cross-env": "^7.0.3",
-@@ -2718,7 +2719,7 @@
-         "@tanstack/react-query-devtools": "^4.29.0",
-         "@testing-library/dom": "^9.3.0",
-         "@testing-library/jest-dom": "^5.16.5",
--        "@testing-library/react": "^14.0.0",
-+        "@testing-library/react": "^14.3.1",
-         "@testing-library/user-event": "^14.4.3",
-         "@types/jest": "^29.5.14",
-         "@types/js-cookie": "^3.0.6",
-@@ -51744,7 +51745,7 @@
-         "@rollup/plugin-replace": "^5.0.5",
-         "@rollup/plugin-terser": "^0.4.4",
-         "@tanstack/react-query": "^4.28.0",
--        "@testing-library/react": "^14.0.0",
-+        "@testing-library/react": "^16.3.0",
-         "@types/react": "^18.2.11",
-         "@types/react-dom": "^18.2.4",
-         "caniuse-lite": "^1.0.30001741",
-diff --git a/package.json b/package.json
-index 693de111d..5e58ab1f0 100644
---- a/package.json
-+++ b/package.json
-@@ -99,6 +99,7 @@
-     "@eslint/js": "^9.20.0",
-     "@microsoft/eslint-formatter-sarif": "^3.1.0",
-     "@playwright/test": "^1.50.1",
-+    "@testing-library/react": "^14.3.1",
-     "@types/react-virtualized": "^9.22.0",
-     "caniuse-lite": "^1.0.30001741",
-     "cross-env": "^7.0.3",
-diff --git a/packages/client/package.json b/packages/client/package.json
-index 71aac0c29..ab6fabca1 100644
---- a/packages/client/package.json
-+++ b/packages/client/package.json
-@@ -75,7 +75,7 @@
-     "@rollup/plugin-replace": "^5.0.5",
-     "@rollup/plugin-terser": "^0.4.4",
-     "@tanstack/react-query": "^4.28.0",
--    "@testing-library/react": "^14.0.0",
-+    "@testing-library/react": "^16.3.0",
-     "@types/react": "^18.2.11",
-     "@types/react-dom": "^18.2.4",
-     "caniuse-lite": "^1.0.30001741",
diff --git a/pkgs/by-name/li/librechat/package.nix b/pkgs/by-name/li/librechat/package.nix
index f29974398304..c12d63739ca8 100644
--- a/pkgs/by-name/li/librechat/package.nix
+++ b/pkgs/by-name/li/librechat/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildNpmPackage,
-  fetchNpmDeps,
   fetchFromGitHub,
   nodejs_22,
   pkg-config,
@@ -38,20 +37,10 @@ buildNpmPackage rec {
     # directory as well. Again, we patch this to be relative to the current working
     # directory instead.
     ./0003-upload-paths.patch
-    # The npm dependencies are causing issues with the build. The package @testing-library/react
-    # appears to not be included in NPM deps, even though it is present in the project
-    # This patch fixes this by placing the dependency in different files and regenerating the
-    # lock file.
-    ./0004-fix-deps-v080.patch
   ];
 
-  npmDepsHash = "sha256-97cEw6VD7FoVayrxClHuS1iUcQmDw7/aUoUV6ektvOY=";
-  npmDeps = fetchNpmDeps {
-    inherit src;
-    name = "${pname}-${version}-npm-deps-patched";
-    hash = npmDepsHash;
-    patches = [ ./0004-fix-deps-v080.patch ];
-  };
+  npmDepsFetcherVersion = 2;
+  npmDepsHash = "sha256-JXXOJDkh+do8ZOf4KHyiH7igMeC8WkwflMNx1rZRY3g=";
 
   # npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
   nodejs = nodejs_22;

From da5b151f79b40385006060781f266a6b7e19a912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 7 Mar 2026 18:41:57 +0100
Subject: [PATCH 50/93] librechat: remove unneded makeCacheWritable

---
 pkgs/by-name/li/librechat/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/li/librechat/package.nix b/pkgs/by-name/li/librechat/package.nix
index c12d63739ca8..ff9088cdf25b 100644
--- a/pkgs/by-name/li/librechat/package.nix
+++ b/pkgs/by-name/li/librechat/package.nix
@@ -54,9 +54,6 @@ buildNpmPackage rec {
     vips
   ];
 
-  # required for sharp
-  makeCacheWritable = true;
-
   npmBuildScript = "frontend";
   npmPruneFlags = [ "--production" ];
 

From 95b9dc0e54811be395467ce54a7c75114b9d6207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 7 Mar 2026 20:09:41 +0100
Subject: [PATCH 51/93] librechat: migrate to finalAttrs

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

diff --git a/pkgs/by-name/li/librechat/package.nix b/pkgs/by-name/li/librechat/package.nix
index ff9088cdf25b..2aace8ec85e9 100644
--- a/pkgs/by-name/li/librechat/package.nix
+++ b/pkgs/by-name/li/librechat/package.nix
@@ -10,14 +10,14 @@
   nixosTests,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "librechat";
   version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "danny-avila";
     repo = "LibreChat";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DTmb9J2nsMy6f+V6BgRtFgpTwOi9OQnvikSx4QZQ0HI=";
   };
 
@@ -87,4 +87,4 @@ buildNpmPackage rec {
     maintainers = with lib.maintainers; [ niklaskorz ];
     mainProgram = "librechat-server";
   };
-}
+})

From fb853a30fcd9c8f656b37bd6220b6608bea5f1cc Mon Sep 17 00:00:00 2001
From: jokatzke <jokatzke@fastmail.com>
Date: Tue, 10 Feb 2026 16:43:01 +0100
Subject: [PATCH 52/93] python3Packages.pyrsistent: 0.20.0 -> 0.21.0

---
 .../python-modules/pyrsistent/default.nix     | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix
index e06cd4431fa0..5de60c290814 100644
--- a/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/pkgs/development/python-modules/pyrsistent/default.nix
@@ -1,33 +1,31 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  isPy27,
+  fetchFromGitHub,
   setuptools,
-  six,
+  typing-extensions,
   pytestCheckHook,
   hypothesis,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyrsistent";
-  version = "0.20.0";
+  version = "0.21.0";
   pyproject = true;
 
-  disabled = isPy27;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-TEj3j2KrWWxnkIYITQ3RMlSuTz1scqg//fXr3vjyZaQ=";
+  src = fetchFromGitHub {
+    owner = "tobgu";
+    repo = "pyrsistent";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8fLyz8ELOg5GCrBHLSl4iiCgEZ6MuFoBwNKns5AI5Ps=";
   };
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ six ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [
     pytestCheckHook
     hypothesis
+    typing-extensions
   ];
 
   pythonImportsCheck = [ "pyrsistent" ];
@@ -35,6 +33,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/tobgu/pyrsistent/";
     description = "Persistent/Functional/Immutable data structures";
+    changelog = "https://github.com/tobgu/pyrsistent/blob/${finalAttrs.src.tag}/CHANGES.txt";
     license = lib.licenses.mit;
   };
-}
+})

From 0d96729ee4b876a2c28e5338e577d4ab18fb91d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 7 Mar 2026 20:10:01 +0100
Subject: [PATCH 53/93] librechat: 0.8.0 -> 0.8.4

Fixes CVE-2026-31949

Changelogs:

- https://github.com/danny-avila/LibreChat/releases/tag/v0.8.4
- https://github.com/danny-avila/LibreChat/releases/tag/v0.8.3
- https://github.com/danny-avila/LibreChat/releases/tag/v0.8.2
- https://github.com/danny-avila/LibreChat/releases/tag/v0.8.1
---
 pkgs/by-name/li/librechat/0001-npm-pack.patch |  6 ++--
 pkgs/by-name/li/librechat/0002-logs.patch     | 32 +++++++++----------
 pkgs/by-name/li/librechat/package.nix         | 11 +++++--
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/li/librechat/0001-npm-pack.patch b/pkgs/by-name/li/librechat/0001-npm-pack.patch
index 880c67d03c2e..3bb147622d70 100644
--- a/pkgs/by-name/li/librechat/0001-npm-pack.patch
+++ b/pkgs/by-name/li/librechat/0001-npm-pack.patch
@@ -2,7 +2,7 @@ diff --git a/package.json b/package.json
 index 2131951..91e4846 100644
 --- a/package.json
 +++ b/package.json
-@@ -114,5 +114,15 @@
+@@ -114,5 +114,13 @@
        "admin/",
        "packages/"
      ]
@@ -10,9 +10,7 @@ index 2131951..91e4846 100644
 +  "files": [
 +    "api",
 +    "client/dist",
-+    "packages/data-provider",
-+    "packages/data-schemas",
-+    "packages/mcp"
++    "packages"
 +  ],
 +  "bin": {
 +    "librechat-server": "api/server/index.js"
diff --git a/pkgs/by-name/li/librechat/0002-logs.patch b/pkgs/by-name/li/librechat/0002-logs.patch
index 64cc268277c3..dab413703655 100644
--- a/pkgs/by-name/li/librechat/0002-logs.patch
+++ b/pkgs/by-name/li/librechat/0002-logs.patch
@@ -1,26 +1,26 @@
 diff --git a/api/config/meiliLogger.js b/api/config/meiliLogger.js
-index 195b387..d445e54 100644
+index 398672da5..fcd6864f8 100644
 --- a/api/config/meiliLogger.js
 +++ b/api/config/meiliLogger.js
-@@ -2,7 +2,7 @@ const path = require('path');
- const winston = require('winston');
- require('winston-daily-rotate-file');
+@@ -26,7 +26,7 @@ const getLogDir = () => {
+   }
  
--const logDir = path.join(__dirname, '..', 'logs');
-+const logDir = path.join('.', 'logs');
- 
- const { NODE_ENV } = process.env;
+   // Local development: use api/logs relative to this file
+-  return path.join(__dirname, '..', 'logs');
++  return path.join('.', 'logs');
+ };
  
+ const logDir = getLogDir();
 diff --git a/api/config/winston.js b/api/config/winston.js
-index 8f51b99..2ebd041 100644
+index 93b84f7c4..4276bd6c2 100644
 --- a/api/config/winston.js
 +++ b/api/config/winston.js
-@@ -3,7 +3,7 @@ const winston = require('winston');
- require('winston-daily-rotate-file');
- const { redactFormat, redactMessage, debugTraverse, jsonTruncateFormat } = require('./parsers');
+@@ -27,7 +27,7 @@ const getLogDir = () => {
+   }
  
--const logDir = path.join(__dirname, '..', 'logs');
-+const logDir = path.join('.', 'logs');
+   // Local development: use api/logs relative to this file
+-  return path.join(__dirname, '..', 'logs');
++  return path.join('.', 'logs');
+ };
  
- const { NODE_ENV, DEBUG_LOGGING = true, DEBUG_CONSOLE = false, CONSOLE_JSON = false } = process.env;
- 
\ No newline at end of file
+ const logDir = getLogDir();
\ No newline at end of file
diff --git a/pkgs/by-name/li/librechat/package.nix b/pkgs/by-name/li/librechat/package.nix
index 2aace8ec85e9..021a6a216d81 100644
--- a/pkgs/by-name/li/librechat/package.nix
+++ b/pkgs/by-name/li/librechat/package.nix
@@ -12,13 +12,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "librechat";
-  version = "0.8.0";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "danny-avila";
     repo = "LibreChat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DTmb9J2nsMy6f+V6BgRtFgpTwOi9OQnvikSx4QZQ0HI=";
+    hash = "sha256-XiPnTKiSOMezUZuhkaGJ0xHiT7jrz8OYbZrvq5gb/V8=";
   };
 
   patches = [
@@ -40,7 +40,7 @@ buildNpmPackage (finalAttrs: {
   ];
 
   npmDepsFetcherVersion = 2;
-  npmDepsHash = "sha256-JXXOJDkh+do8ZOf4KHyiH7igMeC8WkwflMNx1rZRY3g=";
+  npmDepsHash = "sha256-h15rNYl2QYnh7/cJvA7lrRqmXw8Ri2QKTfTr7w7+mMo=";
 
   # npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
   nodejs = nodejs_22;
@@ -57,6 +57,11 @@ buildNpmPackage (finalAttrs: {
   npmBuildScript = "frontend";
   npmPruneFlags = [ "--production" ];
 
+  # npmConfigHook only patches the root node_modules
+  postConfigure = ''
+    patchShebangs client/node_modules
+  '';
+
   # For reasons beyond my understanding, the api and client directory disappears after the build finishes.
   # Hence, the build fails with broken symlinks and if the symlink is removed,
   # starting LibreChat fails with a "module not found" error.

From 7661b0c0e3e0e294ada48c2c9c44b169ab1f5a6f Mon Sep 17 00:00:00 2001
From: kurogeek <kurogeek@lmvhaus.com>
Date: Sat, 21 Mar 2026 12:55:18 +0700
Subject: [PATCH 54/93] python3Packages.django-money: init at 3.6.0

Co-authored-by: dotlambda <github@dotlambda.de>
---
 .../python-modules/django-money/default.nix   | 57 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-money/default.nix

diff --git a/pkgs/development/python-modules/django-money/default.nix b/pkgs/development/python-modules/django-money/default.nix
new file mode 100644
index 000000000000..f34d7fc17c14
--- /dev/null
+++ b/pkgs/development/python-modules/django-money/default.nix
@@ -0,0 +1,57 @@
+{
+  fetchFromGitHub,
+  buildPythonPackage,
+  setuptools,
+  lib,
+  py-moneyed,
+  django,
+  certifi,
+  pytestCheckHook,
+  pytest-django,
+  pytest-cov-stub,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "django-money";
+  version = "3.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "django-money";
+    repo = "django-money";
+    tag = finalAttrs.version;
+    hash = "sha256-VxAKTtrbDMRhiLxqjVYt7pLGl0sy9F1iwswP/hxQ01k=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    py-moneyed
+  ];
+
+  optional-dependencies = {
+    exchange = [ certifi ];
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-django
+    pytest-cov-stub
+  ]
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
+
+  pythonImportsCheck = [ "djmoney" ];
+
+  disabledTests = [
+    # avoid tests which import mixer, an abandoned library
+    "test_mixer_blend"
+  ];
+
+  meta = {
+    description = "Money fields for Django forms and models";
+    homepage = "https://github.com/django-money/django-money";
+    changelog = "https://github.com/django-money/django-money/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ kurogeek ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d63ceadbc1cb..8e6ef4f1b37b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4276,6 +4276,8 @@ self: super: with self; {
 
   django-modeltranslation = callPackage ../development/python-modules/django-modeltranslation { };
 
+  django-money = callPackage ../development/python-modules/django-money { };
+
   django-mptt = callPackage ../development/python-modules/django-mptt { };
 
   django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { };

From ab07bbd7021bb4e3699e937d9a9706cc438bce4f Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Mon, 23 Mar 2026 10:06:40 +0800
Subject: [PATCH 55/93] wpsoffice-cn(linux): 12.1.2.24730 -> 12.1.2.25838

---
 pkgs/by-name/wp/wpsoffice-cn/sources.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/wp/wpsoffice-cn/sources.nix b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
index b8f44cdb1ccf..93113db695c3 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/sources.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
@@ -1,11 +1,11 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2026-03-18
+# Last updated: 2026-03-23
 {
-  linux-version = "12.1.2.24730";
+  linux-version = "12.1.2.25838";
   darwin-version = "12.1.25205";
   x86_64-linux = {
-    url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/24730/wps-office_12.1.2.24730.AK.preread.sw_625635_amd64.deb";
-    hash = "sha256-kkITeff8xnq2E9OpiMeMr2ixTILhVbTfScESxZ3WXCY=";
+    url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/25838/wps-office_12.1.2.25838.AK.preread.sw_648473_amd64.deb";
+    hash = "sha256-S6LPXU444p8eDljZXTenkAyj8WyAoR3q/1HzhFqJgvc=";
   };
   x86_64-darwin = {
     url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25205/WPS_Office_12.1.25205(25205)_x64.dmg";

From 03ae70618aaeb9bb0ac34a8db65374f9db6c4a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 7 Mar 2026 20:32:35 +0100
Subject: [PATCH 56/93] nixos/librechat: add log directory option instead of
 hardcoding it in the package

---
 nixos/modules/services/web-apps/librechat.nix |  9 +++++++
 pkgs/by-name/li/librechat/0002-logs.patch     | 26 -------------------
 ...ad-paths.patch => 0002-upload-paths.patch} |  0
 pkgs/by-name/li/librechat/package.nix         | 18 +++++++------
 4 files changed, 19 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/li/librechat/0002-logs.patch
 rename pkgs/by-name/li/librechat/{0003-upload-paths.patch => 0002-upload-paths.patch} (100%)

diff --git a/nixos/modules/services/web-apps/librechat.nix b/nixos/modules/services/web-apps/librechat.nix
index 120d6d092268..7313779305d8 100644
--- a/nixos/modules/services/web-apps/librechat.nix
+++ b/nixos/modules/services/web-apps/librechat.nix
@@ -85,6 +85,15 @@ in
             example = 2309;
             description = "The value that will be passed to the PORT environment variable, telling LibreChat what to listen on.";
           };
+          LIBRECHAT_LOG_DIR = lib.mkOption {
+            type = lib.types.str;
+            default = "${cfg.dataDir}/logs";
+            defaultText = lib.literalExpression "/var/lib/librechat/logs";
+            description = ''
+              Logs will be saved into this directory.
+              By default it is relative to `services.librechat.dataDir`.
+            '';
+          };
         };
       };
       example = {
diff --git a/pkgs/by-name/li/librechat/0002-logs.patch b/pkgs/by-name/li/librechat/0002-logs.patch
deleted file mode 100644
index dab413703655..000000000000
--- a/pkgs/by-name/li/librechat/0002-logs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/api/config/meiliLogger.js b/api/config/meiliLogger.js
-index 398672da5..fcd6864f8 100644
---- a/api/config/meiliLogger.js
-+++ b/api/config/meiliLogger.js
-@@ -26,7 +26,7 @@ const getLogDir = () => {
-   }
- 
-   // Local development: use api/logs relative to this file
--  return path.join(__dirname, '..', 'logs');
-+  return path.join('.', 'logs');
- };
- 
- const logDir = getLogDir();
-diff --git a/api/config/winston.js b/api/config/winston.js
-index 93b84f7c4..4276bd6c2 100644
---- a/api/config/winston.js
-+++ b/api/config/winston.js
-@@ -27,7 +27,7 @@ const getLogDir = () => {
-   }
- 
-   // Local development: use api/logs relative to this file
--  return path.join(__dirname, '..', 'logs');
-+  return path.join('.', 'logs');
- };
- 
- const logDir = getLogDir();
\ No newline at end of file
diff --git a/pkgs/by-name/li/librechat/0003-upload-paths.patch b/pkgs/by-name/li/librechat/0002-upload-paths.patch
similarity index 100%
rename from pkgs/by-name/li/librechat/0003-upload-paths.patch
rename to pkgs/by-name/li/librechat/0002-upload-paths.patch
diff --git a/pkgs/by-name/li/librechat/package.nix b/pkgs/by-name/li/librechat/package.nix
index 021a6a216d81..6a09ac2d8aa5 100644
--- a/pkgs/by-name/li/librechat/package.nix
+++ b/pkgs/by-name/li/librechat/package.nix
@@ -29,14 +29,9 @@ buildNpmPackage (finalAttrs: {
     # Also, we set the `bin` property to the server script to benefit from the
     # auto-generated wrapper.
     ./0001-npm-pack.patch
-    # LibreChat tries writing logs to the package directory, which is immutable
-    # in our case. We patch the log directory to target the current working directory
-    # instead, which in case of NixOS will be the service's data directory.
-    ./0002-logs.patch
-    # Similarly to the logs, user uploads are by default written to the package
-    # directory as well. Again, we patch this to be relative to the current working
-    # directory instead.
-    ./0003-upload-paths.patch
+    # User uploads are by default written to the package directory as well.
+    # We patch this to be relative to the current working directory instead.
+    ./0002-upload-paths.patch
   ];
 
   npmDepsFetcherVersion = 2;
@@ -57,6 +52,13 @@ buildNpmPackage (finalAttrs: {
   npmBuildScript = "frontend";
   npmPruneFlags = [ "--production" ];
 
+  makeWrapperArgs = [
+    # Upstream defaults to the immutable package directory.
+    # As a functioning default, we set this to the current working directory (through a relative logs path),
+    # but make it easy for the module to override.
+    "--set-default LIBRECHAT_LOG_DIR ./logs"
+  ];
+
   # npmConfigHook only patches the root node_modules
   postConfigure = ''
     patchShebangs client/node_modules

From d0200948ee45b59d5bcb4fbd77c3996f58ea31cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 7 Mar 2026 20:51:15 +0100
Subject: [PATCH 57/93] nixos/librechat: set config version by default

Looks like after upgrading from 0.8.0 to 0.8.2 this is mandatory.
---
 nixos/modules/services/web-apps/librechat.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/librechat.nix b/nixos/modules/services/web-apps/librechat.nix
index 7313779305d8..932f81404af3 100644
--- a/nixos/modules/services/web-apps/librechat.nix
+++ b/nixos/modules/services/web-apps/librechat.nix
@@ -129,9 +129,11 @@ in
       type = lib.types.submodule {
         freeformType = format.type;
       };
-      default = { };
+      default = {
+        version = "1.2.1";
+      };
       example = {
-        version = "1.0.8";
+        version = "1.2.1";
         cache = true;
         interface = {
           privacyPolicy = {

From 33492d7d3b880f0fe645902149b9d10977014299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 7 Mar 2026 21:11:34 +0100
Subject: [PATCH 58/93] librechat: add changelog

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

diff --git a/pkgs/by-name/li/librechat/package.nix b/pkgs/by-name/li/librechat/package.nix
index 6a09ac2d8aa5..ca147ba877a4 100644
--- a/pkgs/by-name/li/librechat/package.nix
+++ b/pkgs/by-name/li/librechat/package.nix
@@ -90,6 +90,7 @@ buildNpmPackage (finalAttrs: {
   meta = {
     description = "Open-source app for all your AI conversations, fully customizable and compatible with any AI provider";
     homepage = "https://github.com/danny-avila/LibreChat";
+    changelog = "https://www.librechat.ai/changelog/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ niklaskorz ];
     mainProgram = "librechat-server";

From 58002df66d70afab3b0cf98bbe1a3b2c09902543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 7 Mar 2026 21:12:03 +0100
Subject: [PATCH 59/93] librechat: add maintainer gepbird

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

diff --git a/pkgs/by-name/li/librechat/package.nix b/pkgs/by-name/li/librechat/package.nix
index ca147ba877a4..68129fb5e535 100644
--- a/pkgs/by-name/li/librechat/package.nix
+++ b/pkgs/by-name/li/librechat/package.nix
@@ -92,7 +92,10 @@ buildNpmPackage (finalAttrs: {
     homepage = "https://github.com/danny-avila/LibreChat";
     changelog = "https://www.librechat.ai/changelog/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ niklaskorz ];
+    maintainers = with lib.maintainers; [
+      gepbird
+      niklaskorz
+    ];
     mainProgram = "librechat-server";
   };
 })

From 0b18bc63fcd2533b67ba0ac99279c56df5c8baa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0lkecan=20Bozdo=C4=9Fan?= <ilkecan@protonmail.com>
Date: Mon, 23 Mar 2026 13:07:18 +0300
Subject: [PATCH 60/93] zellij: 0.43.1 -> 0.44.0

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

diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index ce80c2fc802d..92662db77b06 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -15,13 +15,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zellij";
-  version = "0.43.1";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pUExOToThqDBrNNKHh8Z+PFkijx22I7gpYXTAywlSxM=";
+    hash = "sha256-9jVBz+in8TrdX5qYXdSBCN3SYhG/JJLIbkq0DC0tm4Q=";
   };
 
   # Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail ', "vendored_curl"' ""
   '';
 
-  cargoHash = "sha256-KWE9K7M2pelow5I2rvEZho9L0kmnSXVLDD9XBpzlEEY=";
+  cargoHash = "sha256-nGMOVq5etxiOfocjTKXAd8sJHFw34T49Ga48Isc8dCg=";
 
   env.OPENSSL_NO_VENDOR = 1;
 

From da682172da2b7217cad7da6cd03da48e9b1c5be9 Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Fri, 20 Mar 2026 11:43:33 +0100
Subject: [PATCH 61/93] varnish[Packages]80: init at 8.0.1

uses varnish-modules 0.27
---
 nixos/tests/all-tests.nix         |  4 ++++
 pkgs/servers/varnish/default.nix  | 40 ++++++++++++++++++++-----------
 pkgs/servers/varnish/modules.nix  |  6 ++++-
 pkgs/servers/varnish/packages.nix |  5 ++++
 pkgs/top-level/all-packages.nix   |  2 ++
 5 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index cb914220e4be..0b8bacdc4407 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1729,6 +1729,10 @@ in
     imports = [ ./varnish.nix ];
     _module.args.package = pkgs.varnish77;
   };
+  varnish80 = runTest {
+    imports = [ ./varnish.nix ];
+    _module.args.package = pkgs.varnish80;
+  };
   vault = runTest ./vault.nix;
   vault-agent = runTest ./vault-agent.nix;
   vault-dev = runTest ./vault-dev.nix;
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index c60e02ff5963..6d50f051655a 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -68,26 +68,32 @@ let
       buildFlags = [ "localstatedir=/var/run" ];
 
       patches =
-        lib.optionals (stdenv.isDarwin && lib.versionAtLeast version "7.7") [
-          # Fix VMOD section attribute on macOS
-          # Unreleased commit on master
-          (fetchpatch2 {
-            url = "https://github.com/varnishcache/varnish-cache/commit/a95399f5b9eda1bfdba6ee6406c30a1ed0720167.patch";
-            hash = "sha256-T7DIkmnq0O+Cr9DTJS4/rOtg3J6PloUo8jHMWoUZYYk=";
-          })
-          # Fix endian.h compatibility on macOS
-          # PR: https://github.com/varnishcache/varnish-cache/pull/4339
-          ./patches/0001-fix-endian-h-compatibility-on-macos.patch
-        ]
+        lib.optionals
+          (stdenv.isDarwin && lib.versionAtLeast version "7.7" && lib.versionOlder version "8.0")
+          [
+            # Fix VMOD section attribute on macOS
+            # Unreleased commit on master
+            (fetchpatch2 {
+              url = "https://github.com/varnishcache/varnish-cache/commit/a95399f5b9eda1bfdba6ee6406c30a1ed0720167.patch";
+              hash = "sha256-T7DIkmnq0O+Cr9DTJS4/rOtg3J6PloUo8jHMWoUZYYk=";
+            })
+            # Fix endian.h compatibility on macOS
+            # PR: https://github.com/varnishcache/varnish-cache/pull/4339
+            ./patches/0001-fix-endian-h-compatibility-on-macos.patch
+          ]
         ++ lib.optionals (stdenv.isDarwin && lib.versionOlder version "7.6") [
           # Fix duplicate OS_CODE definitions on macOS
           # PR: https://github.com/varnishcache/varnish-cache/pull/4347
           ./patches/0002-fix-duplicate-os-code-definitions-on-macos.patch
         ];
 
-      postPatch = ''
-        substituteInPlace bin/varnishtest/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"
-      '';
+      postPatch =
+        lib.optionalString (lib.versionOlder version "8.0") ''
+          substituteInPlace bin/varnishtest/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"
+        ''
+        + lib.optionalString (lib.versionAtLeast version "8.0") ''
+          substituteInPlace bin/varnishtest/vtest2/src/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"
+        '';
 
       postConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
         # prevent cache invalidation
@@ -144,6 +150,7 @@ let
         knownVulnerabilities = lib.optionals (lib.versions.major version == "7") [
           "VSV00018: https://vinyl-cache.org/security/VSV00018.html"
         ];
+        broken = stdenv.isDarwin && version == "8.0.1"; # https://github.com/NixOS/nixpkgs/issues/495368
       };
     };
 in
@@ -158,4 +165,9 @@ in
     version = "7.7.3";
     hash = "sha256-6W7q/Ez+KlWO0vtU8eIr46PZlfRvjADaVF1YOq74AjY=";
   };
+  # EOL 2026-09-15
+  varnish80 = common {
+    version = "8.0.1";
+    hash = "sha256-n1oi1YrNvqw3GhY9683TYSG+XuS8hKoYfrfNDDGP5oI=";
+  };
 }
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index fbbaea22e679..3dc5943fb152 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -22,7 +22,7 @@ let
       src = fetchFromGitHub {
         owner = "varnish";
         repo = "varnish-modules";
-        rev = version;
+        tag = version;
         inherit hash;
       };
 
@@ -59,4 +59,8 @@ in
     version = "0.26.0";
     hash = "sha256-xKMOkqm6/GoBve0AhPqyVMQv/oh5Rtj6uCeg/yId7BU=";
   };
+  modules27 = common {
+    version = "0.27.0";
+    hash = "sha256-1hE+AKsC6Td+Al7LFN6bgPicU8dtWd3A8PP7VKZLvYM=";
+  };
 }
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index 2ba8bc689fcd..7167ca143741 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -3,6 +3,7 @@
   callPackage,
   varnish60,
   varnish77,
+  varnish80,
   lib,
 }:
 {
@@ -24,4 +25,8 @@
     varnish = varnish77;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules26;
   };
+  varnish80Packages = lib.recurseIntoAttrs rec {
+    varnish = varnish80;
+    modules = (callPackages ./modules.nix { inherit varnish; }).modules27;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8c01ff0d16a..f5dbf691ed61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3600,10 +3600,12 @@ with pkgs;
   inherit (callPackages ../servers/varnish { })
     varnish60
     varnish77
+    varnish80
     ;
   inherit (callPackages ../servers/varnish/packages.nix { })
     varnish60Packages
     varnish77Packages
+    varnish80Packages
     ;
   varnishPackages = varnish77Packages;
   varnish = varnishPackages.varnish;

From e738bd66971f52dad3b0030174828c3a20b8c38b Mon Sep 17 00:00:00 2001
From: Oliver Schmidt <os@flyingcircus.io>
Date: Fri, 20 Mar 2026 11:50:38 +0100
Subject: [PATCH 62/93] varnish: point to varnish80 as default package

Also includes release notes.
We will likely move to Vinyl Cache 9 for the 26.05 release due to the
support window in a follow-up change.
---
 doc/release-notes/rl-2605.section.md | 3 +++
 pkgs/top-level/all-packages.nix      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index 06e6b8552d72..87a93a999c1d 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -124,6 +124,9 @@
 
 - `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.
 
+- Varnish Cache has been updated to major version 8, `varnish` now refers to `varnish80`. That release contains breaking changes, see [Upgrading to Varnish-Cache 8.0](https://vinyl-cache.org/docs/8.0/whats-new/upgrading-8.0.html).
+  Note that the Varnish 6 LTS release remains available as `varnish60`.
+
 - `eslint` has been updated from version 9 to version 10. Please see https://eslint.org/blog/2026/02/eslint-v10.0.0-released/ for details about the breaking changes included in the update.
 
 - `minio_legacy_fs` has been removed. If you used that package, migrate your data to be compatible with the newest minio and use the package `minio`.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5dbf691ed61..dbf09e185c43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3607,7 +3607,7 @@ with pkgs;
     varnish77Packages
     varnish80Packages
     ;
-  varnishPackages = varnish77Packages;
+  varnishPackages = varnish80Packages;
   varnish = varnishPackages.varnish;
 
   vncdo = with python3Packages; toPythonApplication vncdo;

From 532fac96953bd4f782d6ad7ad7ebbf1d4bf8dfc2 Mon Sep 17 00:00:00 2001
From: Sav Tripodi <sav@sanico.com.au>
Date: Mon, 23 Mar 2026 11:41:53 +0100
Subject: [PATCH 63/93] hugo: 0.155.3 -> 0.158.0

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

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 95384f923702..3de3901492ed 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -11,22 +11,26 @@
 
 buildGoModule (finalAttrs: {
   pname = "hugo";
-  version = "0.155.3";
+  version = "0.158.0";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2TvzM7veSAGDqomWXHuEnYX8bGVxAxTto0Xzc+vypDY=";
+    hash = "sha256-7/zrJdoJVDVHt/2qKPkfrxjxMMpB2F2i0fCXZLkd7gw=";
   };
 
-  vendorHash = "sha256-Fh38o7wD6/gL4szvT4UmA4lzIStqITjgjulsIQlPmHU=";
+  vendorHash = "sha256-StGdZ1FP6906jFbqoYQgrbEOx1YPCsqE+01ITQgtaEU=";
 
   checkFlags =
     let
       skippedTestPrefixes = [
-        # Workaround for "failed to load modules"
+        # Workaround for integration tests that reach out to the public
+        # internet. Alternative option is to prefetch but it was decided
+        # to continue to use ignores.
+        # ref: https://github.com/NixOS/nixpkgs/pull/501960
         "TestCommands/mod"
+        "TestCommands/hugo__static_issue14507"
         # Server tests are flaky, at least in x86_64-darwin. See #368072
         # We can try testing again after updating the `httpget` helper
         # ref: https://github.com/gohugoio/hugo/blob/v0.140.1/main_test.go#L220-L233

From 82bef9afb3da146b46718a62d2e735a55f8d25d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 10:56:36 +0000
Subject: [PATCH 64/93] python3Packages.nvidia-ml-py: 13.590.48 -> 13.595.45

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

diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix
index 3be09eaad685..faff24b826e5 100644
--- a/pkgs/development/python-modules/nvidia-ml-py/default.nix
+++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nvidia-ml-py";
-  version = "13.590.48";
+  version = "13.595.45";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "nvidia_ml_py";
     inherit (finalAttrs) version;
-    hash = "sha256-gYTRvlKRSsfwmRzRwNlGxl3IioQMdUzRLCdLd7iHYN0=";
+    hash = "sha256-yfNIl/4EQf81vI81uvgPgwogsPTmznHgoyW8Dmas8Hk=";
   };
 
   patches = [

From 6bce09582927e51014abf6d2bbbb750f37331087 Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@uni-jena.de>
Date: Mon, 23 Mar 2026 12:13:43 +0100
Subject: [PATCH 65/93] openmolcas: fix hash after release tag has moved

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

diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix
index e7de35123455..8c40ec27fe9d 100644
--- a/pkgs/by-name/op/openmolcas/package.nix
+++ b/pkgs/by-name/op/openmolcas/package.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Molcas";
     repo = "OpenMolcas";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+DU651GiGZRHdkLuGLCPU/95uOhG+kENCTi1T+8Hz1g=";
+    hash = "sha256-FzO1fvMw+/r6SKiaODlhkmKlbzQ9TXLYXk+xpz/fs2I=";
   };
 
   patches = [

From 984f1f29379aa8f3ef58218530ab5d8dba71df2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 11:18:16 +0000
Subject: [PATCH 66/93] scala-cli: 1.12.4 -> 1.12.5

---
 pkgs/by-name/sc/scala-cli/sources.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json
index 060645f0bb02..6915ac49d239 100644
--- a/pkgs/by-name/sc/scala-cli/sources.json
+++ b/pkgs/by-name/sc/scala-cli/sources.json
@@ -1,21 +1,21 @@
 {
-  "version": "1.12.4",
+  "version": "1.12.5",
   "assets": {
     "aarch64-darwin": {
       "asset": "scala-cli-aarch64-apple-darwin.gz",
-      "sha256": "0hvgmj18xdmkpqh6595cqwkl2b0hrg9c2rchqp6g2nwlqqwas1y4"
+      "sha256": "1sylwkki7qzqa3ksissic2h9jd2s9bw07mqd25jkc1npcagmn9n5"
     },
     "aarch64-linux": {
       "asset": "scala-cli-aarch64-pc-linux.gz",
-      "sha256": "0j1v58r10pqlx3d1xhj8c9sxdgip2qylrcxwknxb9rza4kvsyww0"
+      "sha256": "07w90ld5vs2mcbjlcj4cv6gif7wvz87zlsxn74nzqdy26fmb7k13"
     },
     "x86_64-darwin": {
       "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "19g9jsmkn1pagmgabqjpkhl65sl264c25wjdrf2dcd2gjkzpcvkd"
+      "sha256": "1fy97chlgg77sbq2bxpyvpbzxdflj441v01a0qx6ip8ymz043kyq"
     },
     "x86_64-linux": {
       "asset": "scala-cli-x86_64-pc-linux.gz",
-      "sha256": "1j6rkc9g0ljrf3svws1x03v28c4053d7bqg8ja6bjjld042c8d02"
+      "sha256": "102pvpyk8sgr3sr8b6i8q7p9c6z59cldphnj193nr6hk7bmgxmi1"
     }
   }
 }

From 6da45c91d53dc318df7482a0be7c7bf47515e1e2 Mon Sep 17 00:00:00 2001
From: HHR2020 <76608828+HHR2020@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:19:37 +0800
Subject: [PATCH 67/93] clash-verge-rev: 2.4.6 -> 2.4.7

---
 pkgs/by-name/cl/clash-verge-rev/package.nix   |  8 ++--
 .../cl/clash-verge-rev/patch-cargo-lock.patch | 39 -------------------
 pkgs/by-name/cl/clash-verge-rev/unwrapped.nix |  5 ---
 3 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/by-name/cl/clash-verge-rev/patch-cargo-lock.patch

diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix
index 459f4f5e96a8..003514ae76e8 100644
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@@ -13,17 +13,17 @@
 let
   pname = "clash-verge-rev";
   # Please keep service version in sync
-  version = "2.4.6";
+  version = "2.4.7";
 
   src = fetchFromGitHub {
     owner = "clash-verge-rev";
     repo = "clash-verge-rev";
     tag = "v${version}";
-    hash = "sha256-s/dUy9vYxdUlAahVPkoOHjoF+WCl3xhJOubZtS1PB5o=";
+    hash = "sha256-Jw9GXD0RFFPkqhJuNZaooxIHVDt1ti0a4g863jIwtkY=";
   };
 
-  pnpm-hash = "sha256-7xNaLlnXLty80x1d25pBeLZUu0r3R+87DYoJ6rTHSTA=";
-  vendor-hash = "sha256-1b0vmx0apWSNlaTMR58eufinBuIC7/F3UG3C8X62/gE=";
+  pnpm-hash = "sha256-2iGCe9LmH99hVOWEWkDy7/XH4r/Jlr8rzL5FrCRpn3Q=";
+  vendor-hash = "sha256-EHsGCrphP6SRQ04Q0sIh8CmzMwbvqDQeiL44ItBGIaM=";
 
   service = callPackage ./service.nix {
     inherit
diff --git a/pkgs/by-name/cl/clash-verge-rev/patch-cargo-lock.patch b/pkgs/by-name/cl/clash-verge-rev/patch-cargo-lock.patch
deleted file mode 100644
index f9c2ac1c9f85..000000000000
--- a/pkgs/by-name/cl/clash-verge-rev/patch-cargo-lock.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index d5895c0b..a7954a89 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -7255,7 +7255,7 @@ dependencies = [
-  "once_cell",
-  "parking_lot",
-  "raw-window-handle",
-- "tao-macros 0.1.3 (git+https://github.com/tauri-apps/tao)",
-+ "tao-macros",
-  "unicode-segmentation",
-  "url",
-  "windows 0.61.3",
-@@ -7275,16 +7275,6 @@ dependencies = [
-  "syn 2.0.114",
- ]
- 
--[[package]]
--name = "tao-macros"
--version = "0.1.3"
--source = "git+https://github.com/tauri-apps/tao#a133504b6dc963a5ad7786e01e746dba72236b65"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "syn 2.0.114",
--]
--
- [[package]]
- name = "tap"
- version = "1.0.1"
-@@ -10040,7 +10030,7 @@ dependencies = [
-  "raw-window-handle",
-  "sha2 0.10.9",
-  "soup3",
-- "tao-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tao-macros",
-  "thiserror 2.0.18",
-  "tracing",
-  "url",
diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
index 7b1498977656..646fda10453c 100644
--- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
@@ -46,11 +46,6 @@ rustPlatform.buildRustPackage {
     OPENSSL_NO_VENDOR = 1;
   };
 
-  cargoPatches = [
-    # Duplicate versions of tao-macros make fetchCargoVendor fail, keep one of them.
-    ./patch-cargo-lock.patch
-  ];
-
   postPatch = ''
     # We disable the option to try to use the bleeding-edge version of mihomo
     # If you need a newer version, you can override the mihomo input of the wrapped package

From 0402e4f3b43451fea99357e69f9723635da572ed Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 23 Mar 2026 12:29:37 +0100
Subject: [PATCH 68/93] buildPgrxExtension: move env variables into env for
 structuredAttrs

---
 .../tools/rust/cargo-pgrx/buildPgrxExtension.nix          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix
index 73c7c0d1e350..ecffd2a3f5f5 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix
@@ -176,9 +176,11 @@ lib.extendMkDerivation {
         runHook postInstall
       '';
 
-      PGRX_PG_SYS_SKIP_BINDING_REWRITE = "1";
-      CARGO_BUILD_INCREMENTAL = "false";
-      RUST_BACKTRACE = "full";
+      env = args.env or { } // {
+        PGRX_PG_SYS_SKIP_BINDING_REWRITE = "1";
+        CARGO_BUILD_INCREMENTAL = "false";
+        RUST_BACKTRACE = "full";
+      };
 
       checkNoDefaultFeatures = true;
       checkFeatures =

From cc88efc7d54936d8810efdd07271bcc79a27d019 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 23 Mar 2026 09:49:16 +0000
Subject: [PATCH 69/93] python3Packages.tensorflow-datasets: fix tests

---
 .../tensorflow-datasets/default.nix           | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
index d946d3d11ec7..6de4478928a9 100644
--- a/pkgs/development/python-modules/tensorflow-datasets/default.nix
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -85,6 +85,25 @@ buildPythonPackage (finalAttrs: {
     })
   ];
 
+  postPatch =
+    # AttributeError: 'google._upb._message.FieldDescriptor' object has no attribute 'label'
+    ''
+      substituteInPlace tensorflow_datasets/core/dataset_info.py \
+        --replace-fail \
+          "elif field.label == field.LABEL_REPEATED:" \
+          "elif hasattr(field_value, 'extend'):"
+    ''
+    # TypeError: only 0-dimensional arrays can be converted to Python scalars
+    + ''
+      substituteInPlace tensorflow_datasets/datasets/smallnorb/smallnorb_dataset_builder.py \
+        --replace-fail \
+          "magic = int(np.frombuffer(s, dtype=int32_dtype, count=1))" \
+          "magic = int(np.squeeze(np.frombuffer(s, dtype=int32_dtype, count=1)))" \
+        --replace-fail \
+          "ndim = int(np.frombuffer(s, dtype=int32_dtype, count=1, offset=4))" \
+          "ndim = int(np.squeeze(np.frombuffer(s, dtype=int32_dtype, count=1, offset=4)))"
+    '';
+
   build-system = [ setuptools ];
 
   dependencies = [

From 629fecb3b95b514f142b456cce078415144ceee0 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 23 Mar 2026 12:39:10 +0100
Subject: [PATCH 70/93] qt6Packages.qtmultimedia: move NIX_LDFLAGS into env for
 structuredAttrs

---
 .../libraries/qt-6/modules/qtmultimedia/default.nix         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
index 0b29cd3b5e4e..104bfb752531 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
@@ -72,6 +72,8 @@ qtModule {
     "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderToolsTools"
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-include AudioToolbox/AudioToolbox.h";
-  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AudioToolbox";
+  env = {
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-include AudioToolbox/AudioToolbox.h";
+    NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AudioToolbox";
+  };
 }

From 711ab8f9845d47f27536276c6293ec45b9cca916 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 23 Mar 2026 13:05:10 +0100
Subject: [PATCH 71/93] luaPackages.toml-edit: move NIX_LDFLAGS into env for
 structuredAttrs

---
 pkgs/development/lua-modules/overrides.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 5d401efb4f74..37530b0b0ad2 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -1129,9 +1129,11 @@ in
       hash = "sha256-8lYvdraKEd1nf8dkZuSDQRVJvX56gHCcTZVtyoy/0IM=";
     };
 
-    NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (
-      if lua.pkgs.isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua"
-    );
+    env = old.env // {
+      NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (
+        if lua.pkgs.isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua"
+      );
+    };
 
     nativeBuildInputs = old.nativeBuildInputs ++ [
       cargo

From 9feb2a0ed0eb582d5819652a6fd12f59414a98c5 Mon Sep 17 00:00:00 2001
From: sophronesis <oleksandr.buzynnyi@gmail.com>
Date: Sun, 22 Mar 2026 10:49:41 +0100
Subject: [PATCH 72/93] attyx: init at 0.2.47

---
 pkgs/by-name/at/attyx/build.zig.zon.nix | 18 +++++++
 pkgs/by-name/at/attyx/package.nix       | 62 +++++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 pkgs/by-name/at/attyx/build.zig.zon.nix
 create mode 100644 pkgs/by-name/at/attyx/package.nix

diff --git a/pkgs/by-name/at/attyx/build.zig.zon.nix b/pkgs/by-name/at/attyx/build.zig.zon.nix
new file mode 100644
index 000000000000..6c859495abb9
--- /dev/null
+++ b/pkgs/by-name/at/attyx/build.zig.zon.nix
@@ -0,0 +1,18 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
+{
+  linkFarm,
+  fetchzip,
+  fetchgit,
+}:
+
+linkFarm "zig-packages" [
+  {
+    name = "toml-0.3.2-YDcxkrdYAQB8b9k1q_sp51jt2ymgGLmOX_BD4kQi53Eo";
+    path = fetchgit {
+      url = "https://github.com/lepton9/zig-toml";
+      rev = "8a9b79dde56ac1fc38960ed9c482efb9ff88a6a8";
+      hash = "sha256-LAE/l049Bvh3VKT7XrTYEdj+Ekg3JWO2op37ec58sFU=";
+    };
+  }
+]
diff --git a/pkgs/by-name/at/attyx/package.nix b/pkgs/by-name/at/attyx/package.nix
new file mode 100644
index 000000000000..dd11d48fae91
--- /dev/null
+++ b/pkgs/by-name/at/attyx/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  callPackage,
+
+  pkg-config,
+  zig,
+
+  fontconfig,
+  freetype,
+  glfw,
+  libGL,
+  libx11,
+  libxcursor,
+  libxi,
+  libxrandr,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "attyx";
+  version = "0.2.47";
+
+  src = fetchFromGitHub {
+    owner = "semos-labs";
+    repo = "attyx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fREiPiBTzzJtFEPWOISiZ/BI5lZmPyn80oAXohEEGig=";
+  };
+
+  deps = callPackage ./build.zig.zon.nix { };
+
+  nativeBuildInputs = [
+    pkg-config
+    zig
+  ];
+
+  buildInputs = [
+    fontconfig
+    freetype
+    glfw
+    libGL
+    libx11
+    libxcursor
+    libxi
+    libxrandr
+  ];
+
+  zigBuildFlags = [
+    "--system"
+    "${finalAttrs.deps}"
+  ];
+
+  meta = {
+    description = "Fast GPU-accelerated terminal emulator built with Zig";
+    homepage = "https://github.com/semos-labs/attyx";
+    changelog = "https://github.com/semos-labs/attyx/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sophronesis ];
+    mainProgram = "attyx";
+    platforms = lib.platforms.linux;
+  };
+})

From 4b420e3a4f3cf9fd4b985146016e80acc46b40c0 Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Mon, 23 Mar 2026 14:10:27 +0100
Subject: [PATCH 73/93] netbird: use buildGo125Module

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

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index d0428a66e208..1221a3f558f0 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -3,7 +3,7 @@
   lib,
   nixosTests,
   nix-update-script,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
   installShellFiles,
   pkg-config,
@@ -65,7 +65,9 @@ let
   };
   component = availableComponents.${componentName};
 in
-buildGoModule (finalAttrs: {
+# Vendored gvisor has a build-tag conflict with Go 1.26 (netbirdio/netbird#5290).
+# TODO: revert to 'buildGoModule' when a release includes netbirdio/netbird#5447.
+buildGo125Module (finalAttrs: {
   pname = "netbird-${componentName}";
   version = "0.65.3";
 

From e749b91730e1d4c612294f1e10dd351674d697fa Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 2 Mar 2026 09:32:46 +0100
Subject: [PATCH 74/93] orca-slicer: 2.3.1 -> 2.3.2

---
 pkgs/by-name/or/orca-slicer/package.nix       | 25 +++++++++++++------
 .../patches/dont-link-opencv-world-orca.patch |  5 ++--
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 37268f2bb356..36e1193bc0fa 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -12,6 +12,7 @@
   cgal_5,
   curl,
   dbus,
+  draco,
   eigen,
   expat,
   ffmpeg,
@@ -41,6 +42,7 @@
   libx11,
   libnoise,
   withSystemd ? stdenv.hostPlatform.isLinux,
+  withNvidiaGLWorkaround ? false,
 }:
 let
   wxGTK' =
@@ -48,23 +50,26 @@ let
       withCurl = true;
       withPrivateFonts = true;
       withWebKit = true;
+      withEGL = false;
     }).overrideAttrs
       (old: {
+        buildInputs = old.buildInputs ++ [ libsecret ];
         configureFlags = old.configureFlags ++ [
           # Disable noisy debug dialogs
           "--enable-debug=no"
+          "--enable-secretstore"
         ];
       });
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "orca-slicer";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "SoftFever";
     repo = "OrcaSlicer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RdMBx/onLq58oI1sL0cHmF2SGDfeI9KkPPCbjyMqECI=";
+    hash = "sha256-c1WTODLrXGtyJWkEueOz5jHhPbA/JFcMeAwhpvoKnKo=";
   };
 
   nativeBuildInputs = [
@@ -90,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
     cgal_5
     curl
     dbus
+    draco
     eigen
     expat
     ffmpeg
@@ -196,13 +202,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGL_SILENCE_DEPRECATION")
     (lib.cmakeFeature "CMAKE_EXE_LINKER_FLAGS" "-Wl,--no-as-needed")
     (lib.cmakeBool "ORCA_VERSION_CHECK_DEFAULT" false)
-    (lib.cmakeFeature "LIBNOISE_INCLUDE_DIR" "${libnoise}/include/noise")
-    (lib.cmakeFeature "LIBNOISE_LIBRARY" "${libnoise}/lib/libnoise-static.a")
+    (lib.cmakeFeature "LIBNOISE_INCLUDE_DIR" "${libnoise}/include")
+    (lib.cmakeFeature "LIBNOISE_LIBRARY_RELEASE" "${libnoise}/lib/libnoise-static.a")
     "-Wno-dev"
-
-    # cmake 4 compatibility, remove in next update
-    # see: https://github.com/SoftFever/OrcaSlicer/commit/883607e1d4a0b2bb719f2f4bcd9fd72f8c2174fa
-    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.13")
   ];
 
   # Generate translation files
@@ -216,6 +218,13 @@ stdenv.mkDerivation (finalAttrs: {
         ]
       }"
       --set WEBKIT_DISABLE_COMPOSITING_MODE 1
+      ${lib.optionalString withNvidiaGLWorkaround ''
+        --set __GLX_VENDOR_LIBRARY_NAME mesa
+        --set __EGL_VENDOR_LIBRARY_FILENAMES /run/opengl-driver/share/glvnd/egl_vendor.d/50_mesa.json
+        --set MESA_LOADER_DRIVER_OVERRIDE zink
+        --set GALLIUM_DRIVER zink
+        --set WEBKIT_DISABLE_DMABUF_RENDERER 1
+      ''}
     )
   '';
 
diff --git a/pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch b/pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch
index 8fed51b7f45e..b2bd76f98225 100644
--- a/pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch
+++ b/pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch
@@ -1,14 +1,15 @@
 diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
-index d85c65fd5..07914f69f 100644
+index 5f959145..95d250a7 100644
 --- a/src/libslic3r/CMakeLists.txt
 +++ b/src/libslic3r/CMakeLists.txt
-@@ -557,7 +557,8 @@ target_link_libraries(libslic3r
+@@ -579,7 +579,9 @@ target_link_libraries(libslic3r
          libigl
          libnest2d
          miniz
 -        opencv_world
 +        opencv_core
 +        opencv_imgproc
++        opencv_imgcodecs
      PRIVATE
          ${CMAKE_DL_LIBS}
          ${EXPAT_LIBRARIES}

From 5143dec51a09916c657d9f01470d15a75923fe0a Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Mon, 23 Mar 2026 18:29:28 +0530
Subject: [PATCH 75/93] goupile: 3.12.1 -> 3.12.4

Add missing updateScript

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/go/goupile/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/goupile/package.nix b/pkgs/by-name/go/goupile/package.nix
index 91bf214ed0ab..00887513597c 100644
--- a/pkgs/by-name/go/goupile/package.nix
+++ b/pkgs/by-name/go/goupile/package.nix
@@ -12,6 +12,8 @@
   # https://goupile.org/en/build recommends a Paranoid build
   # which is not bit by bit reproducible, whereas others are
   profile ? "Paranoid",
+
+  nix-update-script,
 }:
 
 assert lib.assertOneOf "profile" profile [
@@ -25,14 +27,14 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "goupile";
-  version = "3.12.1";
+  version = "3.12.4";
 
   # https://github.com/Koromix/rygel/tags
   src = fetchFromGitHub {
     owner = "Koromix";
     repo = "rygel";
     tag = "goupile/${finalAttrs.version}";
-    hash = "sha256-Pn/0tjezVKJedAtqj69avxeIK2l3l9FGioYSyEao12E=";
+    hash = "sha256-2lHCOsvjTZeRkboefIdyh7JoSmes3KgvjFnXKnQ4On4=";
   };
 
   nativeBuildInputs = [
@@ -65,7 +67,10 @@ stdenv'.mkDerivation (finalAttrs: {
   versionCheckProgramArg = "--version";
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  passthru.tests = { inherit (nixosTests) goupile; };
+  passthru = {
+    tests = { inherit (nixosTests) goupile; };
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=goupile/(.*)" ]; };
+  };
 
   meta = {
     changelog = "https://github.com/Koromix/rygel/blob/${finalAttrs.src.rev}/src/goupile/CHANGELOG.md";

From 890c689ae68e0108ebe2a6ecc960985434683ffd Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@uni-jena.de>
Date: Mon, 23 Mar 2026 12:07:58 +0100
Subject: [PATCH 76/93] python3Packages.pyscf: fix numpy/scipy scalar
 conversion issues

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

diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix
index f139162a6b19..06c78b371ff3 100644
--- a/pkgs/development/python-modules/pyscf/default.nix
+++ b/pkgs/development/python-modules/pyscf/default.nix
@@ -22,16 +22,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pyscf";
-  version = "2.12.1";
+  version = "2.12.1-unstable-2026-03-21";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "pyscf";
     repo = "pyscf";
-    tag = "v${version}";
-    hash = "sha256-voiXNoJ7lHQeqroOs9AxqX55NDEhHVNMLeB+XzJgBQM=";
+    rev = "e8642fb7220248bd750c34ef6adf88a9744977ee";
+    hash = "sha256-RVv5vTmTtHDAbgOXHW1DUzYVsf+NvrYh9++WfNGJ07k=";
   };
 
   # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake.

From b8ec97a76dee8c1c88105f78d5fbc0a84e6140d4 Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@uni-jena.de>
Date: Mon, 23 Mar 2026 14:19:07 +0100
Subject: [PATCH 77/93] python3Packages.biopython: fix numpy >= 2.4
 compatibility

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

diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix
index d2d56fded6ce..77c652a0f687 100644
--- a/pkgs/development/python-modules/biopython/default.nix
+++ b/pkgs/development/python-modules/biopython/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  fetchpatch,
   setuptools,
   numpy,
 }:
@@ -16,6 +17,14 @@ buildPythonPackage rec {
     hash = "sha256-k6ULWGpNLOxoqy+Z0D71g8V2HY+6VTXLjoHaeB0Nkv8=";
   };
 
+  patches = [
+    # Numpy 2.4 compatibility
+    (fetchpatch {
+      url = "https://github.com/biopython/biopython/pull/5161.patch";
+      hash = "sha256-oN0nNlhvshIgNrmm+tIeCAJx1U/OqhdL4tj51DV2CHU=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [ numpy ];
@@ -33,8 +42,6 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    # https://github.com/biopython/biopython/issues/5135
-    broken = lib.versionAtLeast numpy.version "2.4";
     description = "Python library for bioinformatics";
     longDescription = ''
       Biopython is a set of freely available tools for biological computation

From 9a93f59d89f9efe2b352fc54a8960fb9fc398ef3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 13:26:01 +0000
Subject: [PATCH 78/93] python3Packages.cron-descriptor: 2.0.6 -> 2.0.8

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

diff --git a/pkgs/development/python-modules/cron-descriptor/default.nix b/pkgs/development/python-modules/cron-descriptor/default.nix
index 5e230ca87932..2e9bbbbc42e0 100644
--- a/pkgs/development/python-modules/cron-descriptor/default.nix
+++ b/pkgs/development/python-modules/cron-descriptor/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "cron-descriptor";
-  version = "2.0.6";
+  version = "2.0.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Salamek";
     repo = "cron-descriptor";
     tag = version;
-    hash = "sha256-f7TQ3wvcHrzefZowUvxl1T0LCGeCnvpPI/IZn4XcDa4=";
+    hash = "sha256-apU+5RMyO6QQ5+i+wgLJtIni6dJoq4oxCqkCo5w9uLo=";
   };
 
   build-system = [ setuptools ];

From de1843a28f73b99c65d95d51ec8a546e0526bc97 Mon Sep 17 00:00:00 2001
From: Artem Leshchev <matshch@avride.ai>
Date: Mon, 23 Mar 2026 08:32:20 -0500
Subject: [PATCH 79/93] python3Packages.tzlocal: fix license

This package had MIT license since v1.4, and before that it was CC0 1.0 Universal, not sure where CDDL came from.
---
 pkgs/development/python-modules/tzlocal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix
index 146167d3bf83..c02cf030eccf 100644
--- a/pkgs/development/python-modules/tzlocal/default.nix
+++ b/pkgs/development/python-modules/tzlocal/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Tzinfo object for the local timezone";
     homepage = "https://github.com/regebro/tzlocal";
     changelog = "https://github.com/regebro/tzlocal/blob/${version}/CHANGES.txt";
-    license = lib.licenses.cddl;
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From 50de50b1c96a7c50c50d1803d2a345839443da67 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Mon, 23 Mar 2026 13:50:45 +0100
Subject: [PATCH 80/93] canaille: 0.2.1 -> 0.2.2

Diff: https://gitlab.com/yaal/canaille/-/compare/0.2.1...0.2.2

Changelog: https://gitlab.com/yaal/canaille/-/blob/0.2.2/CHANGES.rst
---
 pkgs/by-name/ca/canaille/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix
index 7d0c5a36a0dd..19bf0f763766 100644
--- a/pkgs/by-name/ca/canaille/package.nix
+++ b/pkgs/by-name/ca/canaille/package.nix
@@ -12,14 +12,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "canaille";
-  version = "0.2.1";
+  version = "0.2.2";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "yaal";
     repo = "canaille";
     tag = version;
-    hash = "sha256-6Ksvl03HgpVQRhHtKWQwTrPBkaXcVWoejGaMFBAykHM=";
+    hash = "sha256-hJt2BU8Z0XF94skgK5x1TJUZ9bwEt+VJvaeLLyykpsE=";
   };
 
   build-system = with python.pkgs; [
@@ -147,7 +147,7 @@ python.pkgs.buildPythonApplication rec {
   meta = {
     description = "Lightweight Identity and Authorization Management";
     homepage = "https://canaille.readthedocs.io/en/latest/index.html";
-    changelog = "https://gitlab.com/yaal/canaille/-/blob/${src.rev}/CHANGES.rst";
+    changelog = "https://gitlab.com/yaal/canaille/-/blob/${src.tag}/CHANGES.rst";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ erictapen ];

From d280caee932fde6df664476497914a0a3a398413 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 14:05:06 +0000
Subject: [PATCH 81/93] dunst: 1.13.1 -> 1.13.2

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

diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix
index 3b282880c6f5..b180e243947b 100644
--- a/pkgs/by-name/du/dunst/package.nix
+++ b/pkgs/by-name/du/dunst/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dunst";
-  version = "1.13.1";
+  version = "1.13.2";
 
   src = fetchFromGitHub {
     owner = "dunst-project";
     repo = "dunst";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-F7CONYJ95aKNZ+BpWNUerCBMflgJYgSaLAqp6XJ1G5k=";
+    hash = "sha256-Idh/moq+OjD3VpZKJ3blO1JAK7PPX42z15rQz/JZb84=";
   };
 
   nativeBuildInputs = [

From 2b1815167f6260f003bf25fb80e20e9ba8cbeb77 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Mon, 23 Mar 2026 15:24:39 +0100
Subject: [PATCH 82/93] mobilizon: 5.2.2 -> 5.2.3

Changelog: https://framagit.org/framasoft/mobilizon/-/releases/5.2.3
---
 pkgs/by-name/mo/mobilizon/common.nix   |  4 +-
 pkgs/by-name/mo/mobilizon/frontend.nix |  2 +-
 pkgs/by-name/mo/mobilizon/mix.nix      | 92 +++++++++++++-------------
 pkgs/by-name/mo/mobilizon/package.nix  | 14 ++--
 4 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/pkgs/by-name/mo/mobilizon/common.nix b/pkgs/by-name/mo/mobilizon/common.nix
index eceabe6fc7e4..bcc8494681e0 100644
--- a/pkgs/by-name/mo/mobilizon/common.nix
+++ b/pkgs/by-name/mo/mobilizon/common.nix
@@ -2,13 +2,13 @@
 rec {
 
   pname = "mobilizon";
-  version = "5.2.2";
+  version = "5.2.3";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "kaihuri";
     repo = pname;
     tag = version;
-    hash = "sha256-SPkkanqEuxcZ7x0rqRk0pcB2c2rg08DcTO+SWP4cEqk=";
+    hash = "sha256-uMMmRP3T9KlF+S0xDk2rY2bqEjjM8zWJVRbegth4pdw=";
   };
 }
diff --git a/pkgs/by-name/mo/mobilizon/frontend.nix b/pkgs/by-name/mo/mobilizon/frontend.nix
index fa13cd878b9f..6861254546bd 100644
--- a/pkgs/by-name/mo/mobilizon/frontend.nix
+++ b/pkgs/by-name/mo/mobilizon/frontend.nix
@@ -11,7 +11,7 @@ in
 buildNpmPackage {
   inherit (common) pname version src;
 
-  npmDepsHash = "sha256-zcYx7Iv+fWMSr1BeX4C9DXwugRq8z+lNhNcwoCz1Pug=";
+  npmDepsHash = "sha256-nqjqRdIF583cmUd/mg9+PogA8Tpo5mfh0R9IylDpWZg=";
 
   nativeBuildInputs = [ imagemagick ];
 
diff --git a/pkgs/by-name/mo/mobilizon/mix.nix b/pkgs/by-name/mo/mobilizon/mix.nix
index 2c1c2e27e078..f62eed115866 100644
--- a/pkgs/by-name/mo/mobilizon/mix.nix
+++ b/pkgs/by-name/mo/mobilizon/mix.nix
@@ -17,12 +17,12 @@ let
     {
       absinthe = buildMix rec {
         name = "absinthe";
-        version = "1.9.0";
+        version = "1.9.1";
 
         src = fetchHex {
           pkg = "absinthe";
           version = "${version}";
-          sha256 = "db65993420944ad90e932827663d4ab704262b007d4e3900cd69615f14ccc8ce";
+          sha256 = "d93e1aa61d68b974f48d5660104cb911ae045ee3a5d69954d251f91f3dbe2077";
         };
 
         beamDeps = [
@@ -100,12 +100,12 @@ let
 
       bandit = buildMix rec {
         name = "bandit";
-        version = "1.10.1";
+        version = "1.10.3";
 
         src = fetchHex {
           pkg = "bandit";
           version = "${version}";
-          sha256 = "4b4c35f273030e44268ace53bf3d5991dfc385c77374244e2f960876547671aa";
+          sha256 = "99a52d909c48db65ca598e1962797659e3c0f1d06e825a50c3d75b74a5e2db18";
         };
 
         beamDeps = [
@@ -150,12 +150,12 @@ let
 
       castore = buildMix rec {
         name = "castore";
-        version = "1.0.17";
+        version = "1.0.18";
 
         src = fetchHex {
           pkg = "castore";
           version = "${version}";
-          sha256 = "12d24b9d80b910dd3953e165636d68f147a31db945d2dcb9365e441f8b5351e5";
+          sha256 = "f393e4fe6317829b158fb74d86eb681f737d2fe326aa61ccf6293c4104957e34";
         };
 
         beamDeps = [ ];
@@ -176,12 +176,12 @@ let
 
       cldr_utils = buildMix rec {
         name = "cldr_utils";
-        version = "2.29.1";
+        version = "2.29.5";
 
         src = fetchHex {
           pkg = "cldr_utils";
           version = "${version}";
-          sha256 = "3844a0a0ed7f42e6590ddd8bd37eb4b1556b112898f67dea3ba068c29aabd6c2";
+          sha256 = "962d3a2028b232ee0a5373941dc411028a9442f53444a4d5d2c354f687db1835";
         };
 
         beamDeps = [
@@ -245,12 +245,12 @@ let
 
       credo = buildMix rec {
         name = "credo";
-        version = "1.7.15";
+        version = "1.7.17";
 
         src = fetchHex {
           pkg = "credo";
           version = "${version}";
-          sha256 = "291e8645ea3fea7481829f1e1eb0881b8395db212821338e577a90bf225c5607";
+          sha256 = "1eb5645c835f0b6c9b5410f94b5a185057bcf6d62a9c2b476da971cde8749645";
         };
 
         beamDeps = [
@@ -294,12 +294,12 @@ let
 
       db_connection = buildMix rec {
         name = "db_connection";
-        version = "2.8.1";
+        version = "2.9.0";
 
         src = fetchHex {
           pkg = "db_connection";
           version = "${version}";
-          sha256 = "a61a3d489b239d76f326e03b98794fb8e45168396c925ef25feb405ed09da8fd";
+          sha256 = "17d502eacaf61829db98facf6f20808ed33da6ccf495354a41e64fe42f9c509c";
         };
 
         beamDeps = [ telemetry ];
@@ -472,12 +472,12 @@ let
 
       ecto_sql = buildMix rec {
         name = "ecto_sql";
-        version = "3.13.4";
+        version = "3.13.5";
 
         src = fetchHex {
           pkg = "ecto_sql";
           version = "${version}";
-          sha256 = "2b38cf0749ca4d1c5a8bcbff79bbe15446861ca12a61f9fba604486cb6b62a14";
+          sha256 = "aa36751f4e6a2b56ae79efb0e088042e010ff4935fc8684e74c23b1f49e25fdc";
         };
 
         beamDeps = [
@@ -555,12 +555,12 @@ let
 
       ex_cldr = buildMix rec {
         name = "ex_cldr";
-        version = "2.44.1";
+        version = "2.47.2";
 
         src = fetchHex {
           pkg = "ex_cldr";
           version = "${version}";
-          sha256 = "3880cd6137ea21c74250cd870d3330c4a9fdec07fabd5e37d1b239547929e29b";
+          sha256 = "4a7cef380a1c2546166b45d6ee5e8e2f707ea695b12ae6dadd250201588b4f16";
         };
 
         beamDeps = [
@@ -574,12 +574,12 @@ let
 
       ex_cldr_calendars = buildMix rec {
         name = "ex_cldr_calendars";
-        version = "2.4.1";
+        version = "2.4.2";
 
         src = fetchHex {
           pkg = "ex_cldr_calendars";
           version = "${version}";
-          sha256 = "e29b2b186ce2832cc0da1574944cf206dd221da13b3da98c80da62d6ab71b343";
+          sha256 = "ab69fd04bc1ae18baf9d2e57335d4754c5ac263076ea397eb112621702251fe5";
         };
 
         beamDeps = [
@@ -591,12 +591,12 @@ let
 
       ex_cldr_currencies = buildMix rec {
         name = "ex_cldr_currencies";
-        version = "2.16.5";
+        version = "2.17.1";
 
         src = fetchHex {
           pkg = "ex_cldr_currencies";
           version = "${version}";
-          sha256 = "4397179028f0a7389de278afd0239771f39ba8d1984ce072bc9b715fa28f30d3";
+          sha256 = "e266a0a61f4c7d83608154d49b59e4d7485b2aaa7ba1d0e17b3c55910595de51";
         };
 
         beamDeps = [
@@ -607,12 +607,12 @@ let
 
       ex_cldr_dates_times = buildMix rec {
         name = "ex_cldr_dates_times";
-        version = "2.25.2";
+        version = "2.25.6";
 
         src = fetchHex {
           pkg = "ex_cldr_dates_times";
           version = "${version}";
-          sha256 = "3766037b28d0ba576a33ba432f2d5c4c437ed79ab18c343df543e34a23858d0a";
+          sha256 = "926ff5662b849f86088832ee66b61a96aab0fa5a54d5e14240e08ad3030663e2";
         };
 
         beamDeps = [
@@ -639,12 +639,12 @@ let
 
       ex_cldr_numbers = buildMix rec {
         name = "ex_cldr_numbers";
-        version = "2.37.0";
+        version = "2.38.1";
 
         src = fetchHex {
           pkg = "ex_cldr_numbers";
           version = "${version}";
-          sha256 = "adc011aad34ab545e1d53ae248891479efcd25ba51f662822ec7c5083d0122f8";
+          sha256 = "4f95738f1dc4e821485e52226666f7691c9276bf6eba49cba8d23c8a2db05e84";
         };
 
         beamDeps = [
@@ -676,12 +676,12 @@ let
 
       ex_doc = buildMix rec {
         name = "ex_doc";
-        version = "0.39.3";
+        version = "0.40.1";
 
         src = fetchHex {
           pkg = "ex_doc";
           version = "${version}";
-          sha256 = "0590955cf7ad3b625780ee1c1ea627c28a78948c6c0a9b0322bd976a079996e1";
+          sha256 = "bcef0e2d360d93ac19f01a85d58f91752d930c0a30e2681145feea6bd3516e00";
         };
 
         beamDeps = [
@@ -874,12 +874,12 @@ let
 
       floki = buildMix rec {
         name = "floki";
-        version = "0.38.0";
+        version = "0.38.1";
 
         src = fetchHex {
           pkg = "floki";
           version = "${version}";
-          sha256 = "a5943ee91e93fb2d635b612caf5508e36d37548e84928463ef9dd986f0d1abd9";
+          sha256 = "e744bf0db7ee34b2c8b62767f04071107af0516a81144b9a2f73fe0494200e5b";
         };
 
         beamDeps = [ ];
@@ -1502,12 +1502,12 @@ let
 
       oban = buildMix rec {
         name = "oban";
-        version = "2.20.2";
+        version = "2.20.3";
 
         src = fetchHex {
           pkg = "oban";
           version = "${version}";
-          sha256 = "523365ef0217781c061d15f496e3200a5f1b43e08b1a27c34799ef8bfe95815f";
+          sha256 = "075ffbf1279a96bec495bc63d647b08929837d70bcc0427249ffe4d1dddaec33";
         };
 
         beamDeps = [
@@ -1546,12 +1546,12 @@ let
 
       phoenix = buildMix rec {
         name = "phoenix";
-        version = "1.8.3";
+        version = "1.8.5";
 
         src = fetchHex {
           pkg = "phoenix";
           version = "${version}";
-          sha256 = "36169f95cc2e155b78be93d9590acc3f462f1e5438db06e6248613f27c80caec";
+          sha256 = "83b2bb125127e02e9f475c8e3e92736325b5b01b0b9b05407bcb4083b7a32485";
         };
 
         beamDeps = [
@@ -1632,12 +1632,12 @@ let
 
       phoenix_live_view = buildMix rec {
         name = "phoenix_live_view";
-        version = "1.1.19";
+        version = "1.1.27";
 
         src = fetchHex {
           pkg = "phoenix_live_view";
           version = "${version}";
-          sha256 = "d5ad357d6b21562a5b431f0ad09dfe76db9ce5648c6949f1aac334c8c4455d32";
+          sha256 = "415735d0b2c612c9104108b35654e977626a0cb346711e1e4f1ed16e3c827ede";
         };
 
         beamDeps = [
@@ -1757,12 +1757,12 @@ let
 
       postgrex = buildMix rec {
         name = "postgrex";
-        version = "0.21.1";
+        version = "0.22.0";
 
         src = fetchHex {
           pkg = "postgrex";
           version = "${version}";
-          sha256 = "27d8d21c103c3cc68851b533ff99eef353e6a0ff98dc444ea751de43eb48bdac";
+          sha256 = "a68c4261e299597909e03e6f8ff5a13876f5caadaddd0d23af0d0a61afcc5d84";
         };
 
         beamDeps = [
@@ -1968,12 +1968,12 @@ let
 
       swoosh = buildMix rec {
         name = "swoosh";
-        version = "1.20.0";
+        version = "1.23.1";
 
         src = fetchHex {
           pkg = "swoosh";
           version = "${version}";
-          sha256 = "13e610f709bae54851d68afb6862882aa646e5c974bf49e3bf5edd84a73cf213";
+          sha256 = "3193813b462d6dd519e907c680df04988c47bae372b4159e0c4c9f1c42dffea3";
         };
 
         beamDeps = [
@@ -1990,12 +1990,12 @@ let
 
       telemetry = buildRebar3 rec {
         name = "telemetry";
-        version = "1.3.0";
+        version = "1.4.1";
 
         src = fetchHex {
           pkg = "telemetry";
           version = "${version}";
-          sha256 = "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6";
+          sha256 = "2172e05a27531d3d31dd9782841065c50dd5c3c7699d95266b2edd54c2dafa1c";
         };
 
         beamDeps = [ ];
@@ -2003,12 +2003,12 @@ let
 
       tesla = buildMix rec {
         name = "tesla";
-        version = "1.15.3";
+        version = "1.16.0";
 
         src = fetchHex {
           pkg = "tesla";
           version = "${version}";
-          sha256 = "98bb3d4558abc67b92fb7be4cd31bb57ca8d80792de26870d362974b58caeda7";
+          sha256 = "eb3bdfc0c6c8a23b4e3d86558e812e3577acff1cb4acb6cfe2da1985a1035b89";
         };
 
         beamDeps = [
@@ -2053,12 +2053,12 @@ let
 
       tls_certificate_check = buildRebar3 rec {
         name = "tls_certificate_check";
-        version = "1.31.0";
+        version = "1.32.0";
 
         src = fetchHex {
           pkg = "tls_certificate_check";
           version = "${version}";
-          sha256 = "9d2b41b128d5507bd8ad93e1a998e06d0ab2f9a772af343f4c00bf76c6be1532";
+          sha256 = "38e38db768244d808e11ed27f812e7d927ea5f999007b07d0473db44d7f7cc51";
         };
 
         beamDeps = [ ssl_verify_fun ];
@@ -2066,12 +2066,12 @@ let
 
       tz_world = buildMix rec {
         name = "tz_world";
-        version = "1.4.1";
+        version = "1.4.2";
 
         src = fetchHex {
           pkg = "tz_world";
           version = "${version}";
-          sha256 = "9173ba7aa7c5e627e23adfc0c8d001a56a7072d5bdc8d3a94e4cd44e25decba1";
+          sha256 = "ee260d860d475a1a0fa7cd5d76b114007dbbc902144b61d1ca24e6bc23432a4c";
         };
 
         beamDeps = [
diff --git a/pkgs/by-name/mo/mobilizon/package.nix b/pkgs/by-name/mo/mobilizon/package.nix
index 6921b882f3a8..3409d5b8b97c 100644
--- a/pkgs/by-name/mo/mobilizon/package.nix
+++ b/pkgs/by-name/mo/mobilizon/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   callPackage,
-  writeShellScriptBin,
+  writeScript,
   beam,
   mix2nix,
   fetchFromGitHub,
@@ -51,8 +51,8 @@ beamPackages.mixRelease rec {
             repo = "cldr";
             rev = "v${old.version}";
             hash =
-              assert old.version == "2.44.1";
-              "sha256-5XLPQYDW9yV0ZkWbyiB2s213GTccFjdqckBmx09n4eE=";
+              assert old.version == "2.47.2";
+              "sha256-XiShurm4i/Qxop1nE4Z/8tMj5953kUqn+4kBrILxO+Y=";
           };
           postInstall = ''
             cp $src/priv/cldr/locales/* $out/lib/erlang/lib/ex_cldr-${old.version}/priv/cldr/locales/
@@ -141,11 +141,11 @@ beamPackages.mixRelease rec {
 
   passthru = {
     tests = { inherit (nixosTests) mobilizon; };
-    updateScript = writeShellScriptBin "update.sh" ''
-      set -eou pipefail
+    updateScript = writeScript "update-mobilizon" ''
+      set -euo pipefail
 
-      ${lib.getExe mix2nix} '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix
-      ${lib.getExe nixfmt} pkgs/servers/mobilizon/mix.nix
+      ${lib.getExe mix2nix} '${src}/mix.lock' > pkgs/by-name/mo/mobilizon/mix.nix
+      ${lib.getExe nixfmt} pkgs/by-name/mo/mobilizon/mix.nix
     '';
     elixirPackage = beamPackages.elixir;
     inherit mixNixDeps;

From 8eee0524e4908233ac03a354d3828505fb2e9c64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 14:43:38 +0000
Subject: [PATCH 83/93] jsoncons: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix
index 622c0cfa656a..4a4900f50c7e 100644
--- a/pkgs/by-name/js/jsoncons/package.nix
+++ b/pkgs/by-name/js/jsoncons/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jsoncons";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "danielaparker";
     repo = "jsoncons";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-brcOFD6EO6lVL4A+LrZp6CxZFY2mu+i10IQmjwf4XMo=";
+    hash = "sha256-p+LMT0231ZKtxoTqWjUZof3WQu+lLqAS3n20u9dYTzM=";
   };
 
   nativeBuildInputs = [ cmake ];

From 56e90c899b68d8927186e7c7df3d35475de905b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 14:47:21 +0000
Subject: [PATCH 84/93] home-assistant-custom-lovelace-modules.sankey-chart:
 3.10.0 -> 3.10.1

---
 .../custom-lovelace-modules/sankey-chart/package.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
index cfafaacdab11..d8ac0a9b6699 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "sankey-chart";
-  version = "3.10.0";
+  version = "3.10.1";
 
   src = fetchFromGitHub {
     owner = "MindFreeze";
     repo = "ha-sankey-chart";
     rev = "v${version}";
-    hash = "sha256-bGW3nM0YcC/+8xOD+I1zbiOEmrdyGjSZmjViWOBg7xo=";
+    hash = "sha256-3SRPtj86EbXu59kqeUoJyenCBrIIyqQhw0+7LgB0jwI=";
   };
 
-  npmDepsHash = "sha256-381lIUJq5ZKc+h8roSnwBOLd/K1sPLHqhVnq7j6IjD8=";
+  npmDepsHash = "sha256-cCRc1UKixxr11eWC7W6Gw7DNKVhrZ1G7EukkfmyPY2Y=";
 
   installPhase = ''
     runHook preInstall

From 0e673cc6799e63e7153f06f3307ad018ddb2bc97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 14:52:13 +0000
Subject: [PATCH 85/93] gotosocial: 0.21.1 -> 0.21.2

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

diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix
index 96b102eb49f6..7f674be42123 100644
--- a/pkgs/by-name/go/gotosocial/package.nix
+++ b/pkgs/by-name/go/gotosocial/package.nix
@@ -11,13 +11,13 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "gotosocial";
-  version = "0.21.1";
+  version = "0.21.2";
 
   src = fetchFromCodeberg {
     owner = "superseriousbusiness";
     repo = "gotosocial";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LnxEvOLv+NBjdAbxxtilegW/xqBvMzy3CGM75yJsW0s=";
+    hash = "sha256-Z3j5/pXnNTHgBmPEfFgjOJuL03LsPtvAwbuoL9wb5bk=";
   };
 
   vendorHash = null;

From e1fcf5f6053ccea4deef5dcce967c830b51b1687 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Mon, 23 Mar 2026 15:55:56 +0100
Subject: [PATCH 86/93] proton-pass-cli: fix versionCheckHook

---
 pkgs/by-name/pr/proton-pass-cli/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix
index da098da08e9f..79c74a8f9272 100644
--- a/pkgs/by-name/pr/proton-pass-cli/package.nix
+++ b/pkgs/by-name/pr/proton-pass-cli/package.nix
@@ -37,11 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  nativeCheckInputs = [
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
     versionCheckHook
   ];
-  versionCheckProgram = "${placeholder "out"}/bin/pass-cli";
-  versionCheckProgramArg = "--version";
 
   passthru = {
     sources = {

From ac256bbda4dd0f392d9db37ce9c4b120ee22e920 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 23 Mar 2026 07:27:46 +0100
Subject: [PATCH 87/93] python3Packages.pint-xarray: fix build & tests

Should have been part of 543bdb4a2f22

Co-Authored-By: Doron Behar <doron.behar@gmail.com>
---
 .../python-modules/pint-xarray/default.nix     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/development/python-modules/pint-xarray/default.nix b/pkgs/development/python-modules/pint-xarray/default.nix
index 5eab0ba7c153..3c6c404f6c4d 100644
--- a/pkgs/development/python-modules/pint-xarray/default.nix
+++ b/pkgs/development/python-modules/pint-xarray/default.nix
@@ -2,10 +2,12 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   setuptools,
   setuptools-scm,
   numpy,
   pint,
+  toolz,
   xarray,
   pytestCheckHook,
 }:
@@ -27,9 +29,25 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  patches = [
+    # Fixes 2 test failures. The merge commit of PR:
+    # https://github.com/xarray-contrib/pint-xarray/pull/367
+    (fetchpatch2 {
+      url = "https://github.com/xarray-contrib/pint-xarray/commit/296ee2e60c671175507de1fe904fa7e4d0a70586.patch?full_index=1";
+      hash = "sha256-SS2zQ7fIeLzEUTd+8BW1PFBw8+qed0fLslns1jNpLtA=";
+    })
+    # Similarly to the above, fixes 3 more test failures. See:
+    # https://github.com/xarray-contrib/pint-xarray/pull/368
+    (fetchpatch2 {
+      url = "https://github.com/xarray-contrib/pint-xarray/commit/6134b61e2cb6b4c46b7b0974a6e499dff2d9e18e.patch?full_index=1";
+      hash = "sha256-s1AbaXAeL0sGkj/DWV5145FKGHW4eF+a11w1yg5QENA=";
+    })
+  ];
+
   dependencies = [
     numpy
     pint
+    toolz
     xarray
   ];
 

From 183187992153c5f8c6ac05428b39d2001b313492 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 23 Mar 2026 07:41:33 +0100
Subject: [PATCH 88/93] python3Packages.hepuints: fix build

This should have been part of the automatic update done in 34e3f7b34046.

Co-Authored-By: Doron Behar <doron.behar@gmail.com>
---
 pkgs/development/python-modules/hepunits/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix
index b6af6a2d77d8..4be20fde7345 100644
--- a/pkgs/development/python-modules/hepunits/default.nix
+++ b/pkgs/development/python-modules/hepunits/default.nix
@@ -4,6 +4,7 @@
   fetchPypi,
   hatch-vcs,
   hatchling,
+  pint,
   pytestCheckHook,
 }:
 
@@ -22,7 +23,10 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pint
+  ];
 
   meta = {
     description = "Units and constants in the HEP system of units";

From c565a066a5e23c47bbaf7b0f7cee730f756eed91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 15:05:49 +0000
Subject: [PATCH 89/93] apkeditor: 1.4.7 -> 1.4.8

---
 pkgs/by-name/ap/apkeditor/arsclib/default.nix | 6 +++---
 pkgs/by-name/ap/apkeditor/package.nix         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ap/apkeditor/arsclib/default.nix b/pkgs/by-name/ap/apkeditor/arsclib/default.nix
index 3391acbd77b3..eaa0a442c834 100644
--- a/pkgs/by-name/ap/apkeditor/arsclib/default.nix
+++ b/pkgs/by-name/ap/apkeditor/arsclib/default.nix
@@ -9,7 +9,7 @@ let
   self = REAndroidLibrary {
     pname = "arsclib";
     # 1.3.8 is not new enough for APKEditor because of API changes
-    version = "1.3.8-unstable-2026-02-27";
+    version = "1.3.8-unstable-2026-03-21";
     projectName = "ARSCLib";
 
     src = fetchFromGitHub {
@@ -18,8 +18,8 @@ let
       # This is the latest commit at the time of packaging.
       # It can be changed to a stable release ("V${version}")
       # if it is compatible with APKEditor.
-      rev = "b34f2e36d29077400e5b9f24fef9af3a3d9e8100";
-      hash = "sha256-FhIZ9O1af8UcmcDcEWewMNBDr5Knd3BZL5PqEltCqxE=";
+      rev = "f6c2dc2f6db9063445e84f7ede316d4f1f029351";
+      hash = "sha256-IZ2Us7tcuE+L4bfA4JAcF6Idz1Y2S2IfqW4NSbsxr5o=";
     };
 
     mitmCache = gradle.fetchDeps {
diff --git a/pkgs/by-name/ap/apkeditor/package.nix b/pkgs/by-name/ap/apkeditor/package.nix
index e470735467ef..45634a9c0947 100644
--- a/pkgs/by-name/ap/apkeditor/package.nix
+++ b/pkgs/by-name/ap/apkeditor/package.nix
@@ -55,7 +55,7 @@ let
   apkeditor =
     let
       pname = "apkeditor";
-      version = "1.4.7";
+      version = "1.4.8";
       projectName = "APKEditor";
     in
     REAndroidLibrary {
@@ -71,7 +71,7 @@ let
         owner = "REAndroid";
         repo = "APKEditor";
         tag = "V${version}";
-        hash = "sha256-xvb/shZj39yxejoXF8Sruylyj4843SeAc0AIiM5s1rs=";
+        hash = "sha256-1XNefeEPs8SEBw+hY2CzZ+rPojNcAbg1AqvzhVcNyy4=";
       };
 
       patches = [

From 7058eb751ce05a2cfd32f60e9cf6b22d5eacd8e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 16:22:48 +0000
Subject: [PATCH 90/93] python3Packages.urllib3-future: 2.17.901 -> 2.17.903

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

diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix
index 85ed7d6d14a9..9184b6a9b1c4 100644
--- a/pkgs/development/python-modules/urllib3-future/default.nix
+++ b/pkgs/development/python-modules/urllib3-future/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "urllib3-future";
-  version = "2.17.901";
+  version = "2.17.903";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "urllib3.future";
     tag = version;
-    hash = "sha256-QWlxOUHByoz2jbHhm7wRtJe/Xdr9JnlxuifvIdSsXPw=";
+    hash = "sha256-tgAKjtYuVVjkxI6qC7/iFHv/DE+rGSw0+Dye73WTcis=";
   };
 
   postPatch = ''

From e85060f58c63a0589f6e89ff418fa142a6409508 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer Costa <beme@anthropic.com>
Date: Mon, 23 Mar 2026 16:39:28 +0000
Subject: [PATCH 91/93] buildRustCrate: remap rustc store path to break
 rust-src closure leak
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the rust-src component is installed (common with rust-overlay
toolchains via rust-toolchain.toml), rustc unvirtualises libstd source
paths. Panic locations from monomorphised generic std code
(BTreeMap, VecDeque, sync primitives, etc.) then embed the toolchain
store path in .rodata, pulling the entire multi-GB toolchain into the
runtime closure.

This is not an RPATH issue — stdenv's patchelf --shrink-rpath already
cleans that. The reference is a core::panic::Location string.

Remap the rustc store path to /rustc so panic messages stay readable
but no longer create a store-path dependency. This is a no-op for
toolchains without rust-src (the prefix simply never matches).
---
 pkgs/build-support/rust/build-rust-crate/build-crate.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index 24d51ce11382..befe5a1f1f7d 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -31,6 +31,12 @@ let
     (if release then "-C opt-level=3" else "-C debuginfo=2")
     "-C codegen-units=${toString codegenUnits}"
     "--remap-path-prefix=$NIX_BUILD_TOP=/"
+    # When the rust-src component is present (common with rust-overlay
+    # toolchains), rustc unvirtualises libstd source paths. Panic
+    # locations from monomorphised generic std code then embed the
+    # toolchain store path in .rodata, pulling the entire toolchain into
+    # the closure. Remap to a stable placeholder to break the reference.
+    "--remap-path-prefix=${rustc}=/rustc"
     (mkRustcDepArgs dependencies crateRenames)
     (mkRustcFeatureArgs crateFeatures)
   ]

From a523dd74ac01e3d6947a41027f6969d22865c204 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer Costa <beme@anthropic.com>
Date: Mon, 23 Mar 2026 16:10:51 +0000
Subject: [PATCH 92/93] buildRustCrate: make --cap-lints configurable

lib.sh previously hardcoded `--cap-lints allow` in both build_lib and
build_bin. Since rustc only honours the first `--cap-lints` it sees,
appending a different level via `extraRustcOpts` had no effect, making
it impossible to run clippy (or any lint-based tooling) through
buildRustCrate without wrapper scripts that strip the argument.

This adds a `capLints` parameter (default `"allow"`, preserving current
behaviour) that can be set per-crate or via `.override`:

    (myCrate { }).override { capLints = "warn"; }
---
 doc/languages-frameworks/rust.section.md         | 11 +++++++++++
 .../rust/build-rust-crate/build-crate.nix        |  2 ++
 .../rust/build-rust-crate/configure-crate.nix    |  3 ++-
 .../rust/build-rust-crate/default.nix            | 16 ++++++++++++++++
 pkgs/build-support/rust/build-rust-crate/lib.sh  |  4 ++--
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 04b43b5c272f..f78ff222ba0d 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -842,6 +842,17 @@ general. A number of other parameters can be overridden:
   (hello { }).override { extraRustcOpts = "-Z debuginfo=2"; }
   ```
 
+- The lint level cap passed to `rustc` (`allow` by default, which
+  silences all lints). Because `rustc` only honours the first
+  `--cap-lints` it receives, this cannot be changed via
+  `extraRustcOpts`; use this attribute instead. Useful when overriding
+  the `rust` attribute to point at `clippy-driver`, since clippy lints
+  are also capped by this flag:
+
+  ```nix
+  (hello { }).override { capLints = "warn"; }
+  ```
+
 - Phases, just like in any other derivation, can be specified using
   the following attributes: `preUnpack`, `postUnpack`, `prePatch`,
   `patches`, `postPatch`, `preConfigure` (in the case of a Rust crate,
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index 24d51ce11382..25b8532d617e 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -24,6 +24,7 @@
   colors,
   buildTests,
   codegenUnits,
+  capLints,
 }:
 
 let
@@ -73,6 +74,7 @@ in
   LIB_EXT="${stdenv.hostPlatform.extensions.library}"
   LIB_PATH="${libPath}"
   LIB_NAME="${libName}"
+  CAP_LINTS="${capLints}"
 
   CRATE_NAME='${lib.replaceStrings [ "-" ] [ "_" ] libName}'
 
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index 872c0296c115..be4bbbe06dc9 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -29,6 +29,7 @@
   crateVersion,
   extraLinkFlags,
   extraRustcOptsForBuildRs,
+  capLints,
   libName,
   libPath,
   release,
@@ -195,7 +196,7 @@ in
      fi
      noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \
        ${mkRustcFeatureArgs crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \
-       -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors}
+       -L dependency=target/buildDeps ${buildDeps} --cap-lints ${capLints} $EXTRA_BUILD_FLAGS --color ${colors}
 
      mkdir -p target/build/${crateName}.out
      export RUST_BACKTRACE=1
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index c931d920d191..276e51d01b48 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -196,6 +196,16 @@ lib.makeOverridable
       # Example: [ "-Z debuginfo=2" ]
       # Default: []
       extraRustcOptsForBuildRs,
+      # The lint level cap passed to rustc via `--cap-lints`.
+      # See <https://doc.rust-lang.org/rustc/lints/levels.html#capping-lints>.
+      #
+      # rustc honours only the first `--cap-lints` it sees, so appending a
+      # second one via `extraRustcOpts` has no effect. Use this parameter
+      # instead if you need lints to fire (e.g. when running clippy).
+      #
+      # Example: "warn"
+      # Default: "allow"
+      capLints,
       # Whether to enable building tests.
       # Use true to enable.
       # Default: false
@@ -249,12 +259,14 @@ lib.makeOverridable
         "buildTests"
         "codegenUnits"
         "links"
+        "capLints"
       ];
       extraDerivationAttrs = removeAttrs crate processedAttrs;
       nativeBuildInputs_ = nativeBuildInputs;
       buildInputs_ = buildInputs;
       extraRustcOpts_ = extraRustcOpts;
       extraRustcOptsForBuildRs_ = extraRustcOptsForBuildRs;
+      capLints_ = capLints;
       buildTests_ = buildTests;
 
       # crate2nix has a hack for the old bash based build script that did split
@@ -383,6 +395,7 @@ lib.makeOverridable
           lib.optionals (crate ? extraRustcOptsForBuildRs) crate.extraRustcOptsForBuildRs
           ++ extraRustcOptsForBuildRs_
           ++ (lib.optional (edition != null) "--edition ${edition}");
+        capLints = crate.capLints or capLints_;
 
         configurePhase = configureCrate {
           inherit
@@ -403,6 +416,7 @@ lib.makeOverridable
             crateLinks
             extraLinkFlags
             extraRustcOptsForBuildRs
+            capLints
             crateLicense
             crateLicenseFile
             crateReadme
@@ -433,6 +447,7 @@ lib.makeOverridable
             extraRustcOpts
             buildTests
             codegenUnits
+            capLints
             ;
         };
         dontStrip = !release;
@@ -472,6 +487,7 @@ lib.makeOverridable
     verbose = crate_.verbose or true;
     extraRustcOpts = [ ];
     extraRustcOptsForBuildRs = [ ];
+    capLints = "allow";
     features = [ ];
     nativeBuildInputs = [ ];
     buildInputs = [ ];
diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh
index 8082c3e92dc0..5fa9b2f21154 100644
--- a/pkgs/build-support/rust/build-rust-crate/lib.sh
+++ b/pkgs/build-support/rust/build-rust-crate/lib.sh
@@ -15,7 +15,7 @@ build_lib() {
     $lib_src \
     --out-dir target/lib \
     -L dependency=target/deps \
-    --cap-lints allow \
+    --cap-lints $CAP_LINTS \
     $LINK \
     $EXTRA_LINK_ARGS \
     $EXTRA_LINK_ARGS_LIB \
@@ -52,7 +52,7 @@ build_bin() {
     $EXTRA_LINK_ARGS \
     $EXTRA_LINK_ARGS_BINS \
     $EXTRA_LIB \
-    --cap-lints allow \
+    --cap-lints $CAP_LINTS \
     $BUILD_OUT_DIR \
     $EXTRA_BUILD \
     $EXTRA_FEATURES \

From bd7440b03d7721bc263aaf5df9550dd5eac96c7e Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 23 Mar 2026 10:19:16 -0700
Subject: [PATCH 93/93] python3Packages.radios: relax pycountry version
 constraint

pycountry was updated from 24.6.1 to 26.2.16 (#491301), but radios
pins pycountry to ^24.0.0 (i.e. <25). The only pycountry API radios
uses is countries.get(alpha_2=...), which is unchanged in v26.

Upstream has an open PR to bump the constraint (frenck/python-radios#1483)
but no release yet.

Use pythonRelaxDepsHook to drop the upper bound until upstream releases.
---
 pkgs/development/python-modules/radios/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix
index ed4ec2d5cb0e..0ef264185cd6 100644
--- a/pkgs/development/python-modules/radios/default.nix
+++ b/pkgs/development/python-modules/radios/default.nix
@@ -35,6 +35,8 @@ buildPythonPackage rec {
       --replace-fail 'version = "0.0.0"' 'version = "${version}"'
   '';
 
+  pythonRelaxDeps = [ "pycountry" ];
+
   build-system = [
     poetry-core
   ];