From 25604d3e68e4cdfc4d4b6e565eca66d3b32905e0 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Mon, 11 May 2026 11:53:43 -0400
Subject: [PATCH 01/81] lib.strings.makeSearchPath: use concatMap rather than
 map and filter

---
 lib/strings.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 4c78c909b4be..a05a8ed1c192 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -16,6 +16,7 @@ rec {
 
   inherit (builtins)
     compareVersions
+    concatMap
     elem
     elemAt
     filter
@@ -564,7 +565,10 @@ rec {
     :::
   */
   makeSearchPath =
-    subDir: paths: concatStringsSep ":" (map (path: path + "/" + subDir) (filter (x: x != null) paths));
+    subDir: paths:
+    concatStringsSep ":" (
+      concatMap (path: if path != null then [ (path + "/" + subDir) ] else [ ]) paths
+    );
 
   /**
     Construct a Unix-style search path by appending the given

From 00f9c30eaa178d8fe43584c8bc950c549eedbfd6 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Mon, 11 May 2026 13:02:22 -0400
Subject: [PATCH 02/81] lib.strings.makeSearchPathOutput: only map once

---
 lib/strings.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index a05a8ed1c192..3fb5d7994440 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -606,8 +606,14 @@ rec {
     :::
   */
   makeSearchPathOutput =
-    output: subDir: pkgs:
-    makeSearchPath subDir (map (lib.getOutput output) pkgs);
+    output:
+    let
+      getOutput' = lib.getOutput output;
+    in
+    subDir: pkgs:
+    concatStringsSep ":" (
+      concatMap (path: if path != null then [ (getOutput' path + "/" + subDir) ] else [ ]) pkgs
+    );
 
   /**
     Construct a library search path (such as RPATH) containing the

From f765e4f33e141e1d542d9af71098a111b2f01737 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Mon, 11 May 2026 12:25:37 -0400
Subject: [PATCH 03/81] lib.strings.splitStringBy: bring map into the inner
 loop

---
 lib/strings.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 3fb5d7994440..f6ba4ca7e07b 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1804,31 +1804,27 @@ rec {
     predicate: keepSplit: str:
     let
       len = stringLength str;
+      withContext = addContextFrom str;
 
       # Helper function that processes the string character by character
       go =
         pos: currentPart: result:
         # Base case: reached end of string
         if pos == len then
-          result ++ [ currentPart ]
+          result ++ [ (withContext currentPart) ]
         else
           let
             currChar = substring pos 1 str;
             prevChar = if pos > 0 then substring (pos - 1) 1 str else "";
-            isSplit = predicate prevChar currChar;
           in
-          if isSplit then
+          if predicate prevChar currChar then
             # Split here - add current part to results and start a new one
-            let
-              newResult = result ++ [ currentPart ];
-              newCurrentPart = if keepSplit then currChar else "";
-            in
-            go (pos + 1) newCurrentPart newResult
+            go (pos + 1) (if keepSplit then currChar else "") (result ++ [ (withContext currentPart) ])
           else
             # Keep building current part
             go (pos + 1) (currentPart + currChar) result;
     in
-    if len == 0 then [ (addContextFrom str "") ] else map (addContextFrom str) (go 0 "" [ ]);
+    if len == 0 then [ (withContext "") ] else go 0 "" [ ];
 
   /**
     Returns a string without the specified prefix, if the prefix matches.

From de312c12a24051baf1667f6a49859942b4a9e68d Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Mon, 11 May 2026 13:02:50 -0400
Subject: [PATCH 04/81] lib.strings.toShellVar: only check validity of name
 once

---
 lib/strings.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index f6ba4ca7e07b..aec7c852efa8 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1313,8 +1313,11 @@ rec {
     :::
   */
   toShellVar =
-    name: value:
-    lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" (
+    name:
+    if (!isValidPosixName name) then
+      throw "toShellVar: ${name} is not a valid shell variable name"
+    else
+      value:
       if isAttrs value && !isStringLike value then
         "declare -A ${name}=(${
           concatStringsSep " " (lib.mapAttrsToList (n: v: "[${escapeShellArg n}]=${escapeShellArg v}") value)
@@ -1322,8 +1325,7 @@ rec {
       else if isList value then
         "declare -a ${name}=(${escapeShellArgs value})"
       else
-        "${name}=${escapeShellArg value}"
-    );
+        "${name}=${escapeShellArg value}";
 
   /**
     Translate an attribute set `vars` into corresponding shell variable declarations

From 9f5c9ea4a8e8a85e040bbe2e66eb724747cd1fc1 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Mon, 11 May 2026 12:32:02 -0400
Subject: [PATCH 05/81] lib.strings: throw instead of warning when passed a
 path

We've had this warning for years at this point. Doing this will also
give us a free performance win in the next commits.
---
 lib/strings.nix | 99 ++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 55 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index aec7c852efa8..00119e09db3c 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -6,8 +6,6 @@ let
 
   inherit (builtins) length;
 
-  inherit (lib.trivial) warnIf;
-
   asciiTable = import ./ascii-table.nix;
 
 in
@@ -732,15 +730,12 @@ rec {
   */
   normalizePath =
     s:
-    warnIf (isPath s)
-      ''
+    if isPath s then
+      throw ''
         lib.strings.normalizePath: The argument (${toString s}) is a path value, but only strings are supported.
-            Path values are always normalised in Nix, so there's no need to call this function on them.
-            This function also copies the path to the Nix store and returns the store path, the same as "''${path}" will, which may not be what you want.
-            This behavior is deprecated and will throw an error in the future.''
-      (
-        builtins.foldl' (x: y: if y == "/" && hasSuffix "/" x then x else x + y) "" (stringToCharacters s)
-      );
+            Path values are always normalised in Nix, so there's no need to call this function on them.''
+    else
+      builtins.foldl' (x: y: if y == "/" && hasSuffix "/" x then x else x + y) "" (stringToCharacters s);
 
   /**
     Depending on the boolean `cond`, return either the given string
@@ -809,14 +804,12 @@ rec {
     pref: str:
     # Before 23.05, paths would be copied to the store before converting them
     # to strings and comparing. This was surprising and confusing.
-    warnIf (isPath pref)
-      ''
+    if isPath pref then
+      throw ''
         lib.strings.hasPrefix: The first argument (${toString pref}) is a path value, but only strings are supported.
-            There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
-            This function also copies the path to the Nix store, which may not be what you want.
-            This behavior is deprecated and will throw an error in the future.
             You might want to use `lib.path.hasPrefix` instead, which correctly supports paths.''
-      (substring 0 (stringLength pref) str == pref);
+    else
+      substring 0 (stringLength pref) str == pref;
 
   /**
     Determine whether a string has given suffix.
@@ -856,13 +849,13 @@ rec {
     in
     # Before 23.05, paths would be copied to the store before converting them
     # to strings and comparing. This was surprising and confusing.
-    warnIf (isPath suffix)
-      ''
+    if isPath suffix then
+      throw ''
         lib.strings.hasSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported.
-            There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
-            This function also copies the path to the Nix store, which may not be what you want.
-            This behavior is deprecated and will throw an error in the future.''
-      (lenContent >= lenSuffix && substring (lenContent - lenSuffix) lenContent content == suffix);
+        There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
+        This function also copies the path to the Nix store, which may not be what you want.''
+    else
+      lenContent >= lenSuffix && substring (lenContent - lenSuffix) lenContent content == suffix;
 
   /**
     Determine whether a string contains the given infix
@@ -902,13 +895,13 @@ rec {
     infix: content:
     # Before 23.05, paths would be copied to the store before converting them
     # to strings and comparing. This was surprising and confusing.
-    warnIf (isPath infix)
-      ''
+    if isPath infix then
+      throw ''
         lib.strings.hasInfix: The first argument (${toString infix}) is a path value, but only strings are supported.
             There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
-            This function also copies the path to the Nix store, which may not be what you want.
-            This behavior is deprecated and will throw an error in the future.''
-      (builtins.match ".*${escapeRegex infix}.*" "${content}" != null);
+            This function also copies the path to the Nix store, which may not be what you want.''
+    else
+      builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
 
   /**
     Convert a string `s` to a list of characters (i.e. singleton strings).
@@ -1862,22 +1855,20 @@ rec {
     prefix: str:
     # Before 23.05, paths would be copied to the store before converting them
     # to strings and comparing. This was surprising and confusing.
-    warnIf (isPath prefix)
-      ''
+    if isPath prefix then
+      throw ''
         lib.strings.removePrefix: The first argument (${toString prefix}) is a path value, but only strings are supported.
             There is almost certainly a bug in the calling code, since this function never removes any prefix in such a case.
-            This function also copies the path to the Nix store, which may not be what you want.
-            This behavior is deprecated and will throw an error in the future.''
-      (
-        let
-          preLen = stringLength prefix;
-        in
-        if substring 0 preLen str == prefix then
-          # -1 will take the string until the end
-          substring preLen (-1) str
-        else
-          str
-      );
+            This function also copies the path to the Nix store, which may not be what you want.''
+    else
+      let
+        preLen = stringLength prefix;
+      in
+      if substring 0 preLen str == prefix then
+        # -1 will take the string until the end
+        substring preLen (-1) str
+      else
+        str;
 
   /**
     Returns a string without the specified suffix, if the suffix matches.
@@ -1913,22 +1904,20 @@ rec {
     suffix: str:
     # Before 23.05, paths would be copied to the store before converting them
     # to strings and comparing. This was surprising and confusing.
-    warnIf (isPath suffix)
-      ''
+    if isPath suffix then
+      throw ''
         lib.strings.removeSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported.
             There is almost certainly a bug in the calling code, since this function never removes any suffix in such a case.
-            This function also copies the path to the Nix store, which may not be what you want.
-            This behavior is deprecated and will throw an error in the future.''
-      (
-        let
-          sufLen = stringLength suffix;
-          sLen = stringLength str;
-        in
-        if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then
-          substring 0 (sLen - sufLen) str
-        else
-          str
-      );
+            This function also copies the path to the Nix store, which may not be what you want.''
+    else
+      let
+        sufLen = stringLength suffix;
+        sLen = stringLength str;
+      in
+      if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then
+        substring 0 (sLen - sufLen) str
+      else
+        str;
 
   /**
     Returns true if string `v1` denotes a version older than `v2`.

From 94148625b00d3a1d00ffc1ba6f5114a208658739 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Mon, 11 May 2026 13:09:09 -0400
Subject: [PATCH 06/81] lib.strings: check if throw is necessary before taking
 str

If these functions are called with partial function application (like
`lib.hasPrefix ".nix"`), then we can avoid performing the isPath check
multiple times, and only confirm it once. This gives 12% less primops
when recursively importing all nix files in nixpkgs.
---
 lib/strings.nix | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 00119e09db3c..c69319b3c9e5 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -801,15 +801,15 @@ rec {
     :::
   */
   hasPrefix =
-    pref: str:
-    # Before 23.05, paths would be copied to the store before converting them
-    # to strings and comparing. This was surprising and confusing.
+    pref:
     if isPath pref then
+      # Before 23.05, paths would be copied to the store before converting them
+      # to strings and comparing. This was surprising and confusing.
       throw ''
         lib.strings.hasPrefix: The first argument (${toString pref}) is a path value, but only strings are supported.
             You might want to use `lib.path.hasPrefix` instead, which correctly supports paths.''
     else
-      substring 0 (stringLength pref) str == pref;
+      str: substring 0 (stringLength pref) str == pref;
 
   /**
     Determine whether a string has given suffix.
@@ -842,19 +842,20 @@ rec {
     :::
   */
   hasSuffix =
-    suffix: content:
-    let
-      lenContent = stringLength content;
-      lenSuffix = stringLength suffix;
-    in
-    # Before 23.05, paths would be copied to the store before converting them
-    # to strings and comparing. This was surprising and confusing.
+    suffix:
     if isPath suffix then
+      # Before 23.05, paths would be copied to the store before converting them
+      # to strings and comparing. This was surprising and confusing.
       throw ''
         lib.strings.hasSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported.
         There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
         This function also copies the path to the Nix store, which may not be what you want.''
     else
+      content:
+      let
+        lenContent = stringLength content;
+        lenSuffix = stringLength suffix;
+      in
       lenContent >= lenSuffix && substring (lenContent - lenSuffix) lenContent content == suffix;
 
   /**
@@ -892,16 +893,16 @@ rec {
     :::
   */
   hasInfix =
-    infix: content:
-    # Before 23.05, paths would be copied to the store before converting them
-    # to strings and comparing. This was surprising and confusing.
+    infix:
     if isPath infix then
+      # Before 23.05, paths would be copied to the store before converting them
+      # to strings and comparing. This was surprising and confusing.
       throw ''
         lib.strings.hasInfix: The first argument (${toString infix}) is a path value, but only strings are supported.
             There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
             This function also copies the path to the Nix store, which may not be what you want.''
     else
-      builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
+      content: builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
 
   /**
     Convert a string `s` to a list of characters (i.e. singleton strings).
@@ -1852,15 +1853,16 @@ rec {
     :::
   */
   removePrefix =
-    prefix: str:
-    # Before 23.05, paths would be copied to the store before converting them
-    # to strings and comparing. This was surprising and confusing.
+    prefix:
     if isPath prefix then
+      # Before 23.05, paths would be copied to the store before converting them
+      # to strings and comparing. This was surprising and confusing.
       throw ''
         lib.strings.removePrefix: The first argument (${toString prefix}) is a path value, but only strings are supported.
             There is almost certainly a bug in the calling code, since this function never removes any prefix in such a case.
             This function also copies the path to the Nix store, which may not be what you want.''
     else
+      str:
       let
         preLen = stringLength prefix;
       in
@@ -1901,15 +1903,16 @@ rec {
     :::
   */
   removeSuffix =
-    suffix: str:
-    # Before 23.05, paths would be copied to the store before converting them
-    # to strings and comparing. This was surprising and confusing.
+    suffix:
     if isPath suffix then
+      # Before 23.05, paths would be copied to the store before converting them
+      # to strings and comparing. This was surprising and confusing.
       throw ''
         lib.strings.removeSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported.
             There is almost certainly a bug in the calling code, since this function never removes any suffix in such a case.
             This function also copies the path to the Nix store, which may not be what you want.''
     else
+      str:
       let
         sufLen = stringLength suffix;
         sLen = stringLength str;

From 35ba022673a1b3f7e227f33a9c18e14003eb0829 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Mon, 11 May 2026 12:47:41 -0400
Subject: [PATCH 07/81] lib.strings: compute prefix and suffix lengths early

Meaningful if these functions are partially applied. Saves 16% primops,
12% thunks, and 6% memory bytes when recursively importing all the nix
files in nixpkgs. Slightly increases memory usage when partial function
application isn't done, but I think the benefits outweigh the losses
here.
---
 lib/strings.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index c69319b3c9e5..e1c360fc151f 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -802,6 +802,9 @@ rec {
   */
   hasPrefix =
     pref:
+    let
+      lenPrefix = stringLength pref;
+    in
     if isPath pref then
       # Before 23.05, paths would be copied to the store before converting them
       # to strings and comparing. This was surprising and confusing.
@@ -809,7 +812,7 @@ rec {
         lib.strings.hasPrefix: The first argument (${toString pref}) is a path value, but only strings are supported.
             You might want to use `lib.path.hasPrefix` instead, which correctly supports paths.''
     else
-      str: substring 0 (stringLength pref) str == pref;
+      str: substring 0 lenPrefix str == pref;
 
   /**
     Determine whether a string has given suffix.
@@ -843,6 +846,9 @@ rec {
   */
   hasSuffix =
     suffix:
+    let
+      lenSuffix = stringLength suffix;
+    in
     if isPath suffix then
       # Before 23.05, paths would be copied to the store before converting them
       # to strings and comparing. This was surprising and confusing.
@@ -854,7 +860,6 @@ rec {
       content:
       let
         lenContent = stringLength content;
-        lenSuffix = stringLength suffix;
       in
       lenContent >= lenSuffix && substring (lenContent - lenSuffix) lenContent content == suffix;
 
@@ -1854,6 +1859,9 @@ rec {
   */
   removePrefix =
     prefix:
+    let
+      preLen = stringLength prefix;
+    in
     if isPath prefix then
       # Before 23.05, paths would be copied to the store before converting them
       # to strings and comparing. This was surprising and confusing.
@@ -1863,9 +1871,6 @@ rec {
             This function also copies the path to the Nix store, which may not be what you want.''
     else
       str:
-      let
-        preLen = stringLength prefix;
-      in
       if substring 0 preLen str == prefix then
         # -1 will take the string until the end
         substring preLen (-1) str
@@ -1904,6 +1909,9 @@ rec {
   */
   removeSuffix =
     suffix:
+    let
+      sufLen = stringLength suffix;
+    in
     if isPath suffix then
       # Before 23.05, paths would be copied to the store before converting them
       # to strings and comparing. This was surprising and confusing.
@@ -1914,7 +1922,6 @@ rec {
     else
       str:
       let
-        sufLen = stringLength suffix;
         sLen = stringLength str;
       in
       if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then

From 28a5dc3806d241582006e182d401714f59de7597 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Fri, 15 May 2026 23:29:49 -0400
Subject: [PATCH 08/81] lib.strings.normalizePath: use our hasSuffix
 optimization

---
 lib/strings.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index e1c360fc151f..0db098662787 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -729,13 +729,18 @@ rec {
     :::
   */
   normalizePath =
+    let
+      startsWithSlash = hasSuffix "/";
+    in
     s:
     if isPath s then
       throw ''
         lib.strings.normalizePath: The argument (${toString s}) is a path value, but only strings are supported.
             Path values are always normalised in Nix, so there's no need to call this function on them.''
     else
-      builtins.foldl' (x: y: if y == "/" && hasSuffix "/" x then x else x + y) "" (stringToCharacters s);
+      builtins.foldl' (x: y: if y == "/" && startsWithSlash x then x else x + y) "" (
+        stringToCharacters s
+      );
 
   /**
     Depending on the boolean `cond`, return either the given string

From 7a0811c24b36c60d6254271aa003e13f37ced55d Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Fri, 15 May 2026 23:30:21 -0400
Subject: [PATCH 09/81] lib.strings.hasInfix: compute escaped infix early

---
 lib/strings.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 0db098662787..747d15d119c0 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -904,6 +904,9 @@ rec {
   */
   hasInfix =
     infix:
+    let
+      escapedInfix = escapeRegex infix;
+    in
     if isPath infix then
       # Before 23.05, paths would be copied to the store before converting them
       # to strings and comparing. This was surprising and confusing.
@@ -912,7 +915,7 @@ rec {
             There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
             This function also copies the path to the Nix store, which may not be what you want.''
     else
-      content: builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
+      content: builtins.match ".*${escapedInfix}.*" "${content}" != null;
 
   /**
     Convert a string `s` to a list of characters (i.e. singleton strings).

From 9ff4fe0e9394f47391c8fc99a38a1c8e7f10147c Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Fri, 15 May 2026 23:31:25 -0400
Subject: [PATCH 10/81] lib.strings.splitString: use builtins from global scope

These are all already inherited.
---
 lib/strings.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 747d15d119c0..9268f6453820 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1742,9 +1742,7 @@ rec {
   splitString =
     sep: s:
     let
-      splits = builtins.filter builtins.isString (
-        builtins.split (escapeRegex (toString sep)) (toString s)
-      );
+      splits = filter isString (split (escapeRegex (toString sep)) (toString s));
     in
     map (addContextFrom s) splits;
 

From f908b7a78c0751e56a88e0381caf4084c7537540 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Fri, 15 May 2026 23:32:05 -0400
Subject: [PATCH 11/81] lib.strings.versionAtLeast: avoid an extra function
 call

---
 lib/strings.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 9268f6453820..f9b653ff1670 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1999,7 +1999,7 @@ rec {
 
     :::
   */
-  versionAtLeast = v1: v2: !versionOlder v1 v2;
+  versionAtLeast = v1: v2: compareVersions v2 v1 != 1;
 
   /**
     This function takes an argument `x` that's either a derivation or a

From 4a438d1a8ae75fdc07da2aa22cde2491af299f82 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Fri, 15 May 2026 23:38:09 -0400
Subject: [PATCH 12/81] lib.strings.toSentenceCase: use -1 trick instead of
 computing stringLength

---
 lib/strings.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index f9b653ff1670..53dc515ac3f8 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1594,7 +1594,7 @@ rec {
       (
         let
           firstChar = substring 0 1 str;
-          rest = substring 1 (stringLength str) str;
+          rest = substring 1 (-1) str; # -1 takes till the end of the string
         in
         addContextFrom str (toUpper firstChar + toLower rest)
       );

From 2c636c7616026704d4790a0d370051972ee691e6 Mon Sep 17 00:00:00 2001
From: Sam Pointon <sampointon@gmail.com>
Date: Wed, 22 Apr 2026 21:55:16 +0100
Subject: [PATCH 13/81] nixos/pam: allow disabling entirely

In containers, it can be reasonable to have no interactive logins at all
and to run the container entirely 'lights out'. In this setting, PAM is
dead weight, and adds considerably to container image size (mostly by
bringing other things in to the closure). However, presently, there's no
way to get rid of it.

This change adds the coarse tool of entirely disabling PAM. There
_could_ be a warning or even an assertion, but I reasoned that there
might be odd cases where it's desired - and not having PAM is not
something that entirely disables the system, so a hard assertion feels
wrong, and there are plenty of other ways to misconfigure a system if
you go looking for trouble. I am also trying not to get sucked in to the
morass of reforming pam.nix more broadly to make it less cumbersome,
hence the coarsity of the setting.
---
 nixos/modules/security/pam.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 5130987bed1c..4b02ba4f59eb 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -1854,6 +1854,17 @@ in
 
   options = {
 
+    security.pam.enable = lib.mkOption {
+      default = true;
+      type = lib.types.bool;
+
+      description = ''
+        Whether to enable PAM, or entirely disable it.
+
+        Unless you're building a container image, you probably don't want to disable PAM.
+      '';
+    };
+
     security.pam.package = lib.mkPackageOption pkgs "pam" { };
 
     security.pam.loginLimits = lib.mkOption {
@@ -2475,7 +2486,7 @@ in
 
   ###### implementation
 
-  config = {
+  config = lib.mkIf config.security.pam.enable {
     assertions = [
       {
         assertion = config.users.motd == "" || config.users.motdFile == null;

From 62e926d9ae741be74b22968ef38513ab226ac69f Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 14:07:19 -0400
Subject: [PATCH 14/81] by-name-overlay: use lib.flip to memoise {} being
 passed

---
 pkgs/top-level/by-name-overlay.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/by-name-overlay.nix b/pkgs/top-level/by-name-overlay.nix
index e6fe5b721556..b496dc87ee8a 100644
--- a/pkgs/top-level/by-name-overlay.nix
+++ b/pkgs/top-level/by-name-overlay.nix
@@ -19,6 +19,10 @@ let
     mergeAttrsList
     ;
 
+  inherit (lib.trivial)
+    flip
+    ;
+
   # Package files for a single shard
   # Type: String -> String -> AttrsOf Path
   namesForShard =
@@ -49,6 +53,6 @@ self: super:
   # and whether it's defined by this file here or `all-packages.nix`.
   # TODO: This can be removed once `pkgs/by-name` can handle custom `callPackage` arguments without `all-packages.nix` (or any other way of achieving the same result).
   # Because at that point the code in ./stage.nix can be changed to not allow definitions in `all-packages.nix` to override ones from `pkgs/by-name` anymore and throw an error if that happens instead.
-  _internalCallByNamePackageFile = file: self.callPackage file { };
+  _internalCallByNamePackageFile = flip self.callPackage { };
 }
 // mapAttrs (name: self._internalCallByNamePackageFile) packageFiles

From 76d2216159711296b278ea04df668dffcf7f6320 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 15 Jun 2026 20:37:04 -0400
Subject: [PATCH 15/81] pdns: 5.0.5 -> 5.1.1

Changelog: https://doc.powerdns.com/authoritative/changelog/5.1.html#change-5.1.0
Changelog: https://doc.powerdns.com/authoritative/changelog/5.1.html#change-5.1.1
Upgrade Note: https://doc.powerdns.com/authoritative/upgrading.html#to-5-1-0
---
 doc/release-notes/rl-2611.section.md | 2 ++
 pkgs/by-name/pd/pdns/package.nix     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index c760306c0608..b4450f9ff066 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -34,6 +34,8 @@
   `lib.systems.{examples,platforms}.{sheevaplug,pogoplug4}` have been unified into `lib.systems.examples.armv5tel-multiplatform`.
   Note that there is no official support for ARMv5 and it is not possible to build even a simple NixOS configuration out of the box.
 
+- `pdns` has been updated from `5.0.x` to `5.1.x`. Please be sure to review the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-5-1-0) before upgrading. Namely LUA record updates are no longer allowed by default, and the embedded webserver no longer includes a `access-control-allow-origin: *` header by default.
+
 - Support for the legacy U‐Boot image format has been removed from the Linux kernel builders, as it is deprecated upstream and no longer used by any platform in Nixpkgs.
 
 - `rke2` retires ingress-nginx and transitions to Traefik starting in `rke2_1_36`. Because ingress-nginx was retired upstream as of March 2026, Traefik is now the default
diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix
index 72145c0f82c4..15c328fd5a3b 100644
--- a/pkgs/by-name/pd/pdns/package.nix
+++ b/pkgs/by-name/pd/pdns/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns";
-  version = "5.0.5";
+  version = "5.1.1";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-wUT+sjz8LNR+vzNRMq6gr6tgWttP9PMJVb40RQNODe8=";
+    hash = "sha256-CJN5Vc5ES7sKq/32pfGNSD3ViT12FTmBG+F6m2zzO2o=";
   };
   # redact configure flags from version output to reduce closure size
   patches = [ ./version.patch ];

From a298f9b2269e97f8b97c69a56073258caa0a75ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jun 2026 04:51:53 +0000
Subject: [PATCH 16/81] infrastructure-agent: 1.74.4 -> 1.76.2

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

diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix
index 2abcd941c5ff..94ab833a7d90 100644
--- a/pkgs/by-name/in/infrastructure-agent/package.nix
+++ b/pkgs/by-name/in/infrastructure-agent/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "infrastructure-agent";
-  version = "1.74.4";
+  version = "1.76.2";
 
   src = fetchFromGitHub {
     owner = "newrelic";
     repo = "infrastructure-agent";
     rev = finalAttrs.version;
-    hash = "sha256-T7DXHbI2aK6/nx6bYJEEcr2GRBo9+NnB9yami1SN528=";
+    hash = "sha256-r42ochCVPAreDW+ZVeb/zrh8QwDmQL2xXytsZb6PcuU=";
   };
 
-  vendorHash = "sha256-xkoNVXRm8OkVd2f3cSFE1QIF6EHhh8AQh/YZYt22+MU=";
+  vendorHash = "sha256-+ajMZ+kZ+m1vxyAfM+zvzTfcwkN63agdGoXPTNPC2i0=";
 
   ldflags = [
     "-s"

From 2be1c6fc84edfd1dc27f53a6e7810a2276a3069b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 11:02:09 +0000
Subject: [PATCH 17/81] conventional-changelog-cli: 7.2.0 -> 7.2.1

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

diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix
index 6c2ee732f9fe..90094258fa71 100644
--- a/pkgs/by-name/co/conventional-changelog-cli/package.nix
+++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix
@@ -15,20 +15,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "conventional-changelog-cli";
-  version = "7.2.0";
+  version = "7.2.1";
 
   src = fetchFromGitHub {
     owner = "conventional-changelog";
     repo = "conventional-changelog";
     tag = "conventional-changelog-v${finalAttrs.version}";
-    hash = "sha256-0Fee2sfLwxfE/MRLMUUMACTGVxnJJF1MPsWWzleVA3c=";
+    hash = "sha256-1unB4/naGc/V1Fjc7Arn4DjnGvyCdicNFOofdgpvRUI=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-O91ypnycBwkfLSruezx9E5CrytguBdtmvgVhKFjUzvM=";
+    hash = "sha256-khAAFQeWUkALdkEdjW3tvCi5KiF9lN202yhLcj8ey1o=";
   };
 
   nativeBuildInputs = [

From c597db8d07dfef16d0ad5cb72775d649cc859e48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 12:45:23 +0000
Subject: [PATCH 18/81] clap: 1.2.8 -> 1.2.9

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

diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix
index 9e30cb4f96f7..1f99982f11ba 100644
--- a/pkgs/by-name/cl/clap/package.nix
+++ b/pkgs/by-name/cl/clap/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clap";
-  version = "1.2.8";
+  version = "1.2.9";
 
   src = fetchFromGitHub {
     owner = "free-audio";
     repo = "clap";
     rev = finalAttrs.version;
-    hash = "sha256-slvq7p15xCa7l2tvEaGPzDL8w6/8EI0DySC4Zp+c7tQ=";
+    hash = "sha256-iQRy4+FNT2oun2pkl89A/bPZyv2R0YyF35IhkIwA1B0=";
   };
 
   postPatch = ''

From 58539fc78b1b1063556e009e23d8da3da4480d19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 14:17:24 +0000
Subject: [PATCH 19/81] home-assistant-custom-components.cable_modem_monitor:
 3.14.0-beta.10 -> 3.14.0-beta.11

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

diff --git a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix
index 36d1f5b047bf..b6327122d833 100644
--- a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix
@@ -17,12 +17,12 @@
   requests,
 }:
 let
-  version = "3.14.0-beta.10";
+  version = "3.14.0-beta.11";
   src = fetchFromGitHub {
     owner = "solentlabs";
     repo = "cable_modem_monitor";
     tag = "v${version}";
-    hash = "sha256-Tl5MQVaitq1I5CeajVrgwKvs6HT4WEKejPjz2IcfTqw=";
+    hash = "sha256-MvRDXwMfPS4yoOH4+KYj/215yu+FyTECU3UEb1e1//4=";
     fetchLFS = true;
   };
 

From eb7f14f7c26e580c69055d770db96dcee8d7a5ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 16:48:53 +0000
Subject: [PATCH 20/81] python3Packages.qcelemental: 0.50.2 -> 0.50.4

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

diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix
index 5be8226db2f6..a95398c03b61 100644
--- a/pkgs/development/python-modules/qcelemental/default.nix
+++ b/pkgs/development/python-modules/qcelemental/default.nix
@@ -19,12 +19,12 @@
 
 buildPythonPackage rec {
   pname = "qcelemental";
-  version = "0.50.2";
+  version = "0.50.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7gCWNwlCh58UWQM2CRmZIpjVE36vHu/eluMaDpUy6UI=";
+    hash = "sha256-jVOCbTP/FXyqL1yJbBkxHPPJ2vcZyrjG+GBg+V1fdEs=";
   };
 
   build-system = [

From 3035fe80946b8d230f4254e93c744322c9698b90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 18:11:21 +0000
Subject: [PATCH 21/81] flutter: 3.44.2 -> 3.44.3

---
 .../compilers/flutter/versions/3_44/data.json | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/compilers/flutter/versions/3_44/data.json b/pkgs/development/compilers/flutter/versions/3_44/data.json
index 52f3b7f99d34..a62f3f54d04e 100644
--- a/pkgs/development/compilers/flutter/versions/3_44/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_44/data.json
@@ -1,17 +1,17 @@
 {
-  "version": "3.44.2",
-  "engineVersion": "77e2e94772b6eb43759e34ed1ad7da4674e19cab",
+  "version": "3.44.3",
+  "engineVersion": "a4ce257c68517c1410f4b48ac9852ab5642a3f8d",
   "engineSwiftShaderHash": "sha256-qbtCl2nTpmtp9dnaoXc7rF3RqLnAZEmzw1BzPoCRWrc=",
   "engineSwiftShaderRev": "794b0cfce1d828d187637e6d932bae484fbe0976",
   "channel": "stable",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-osNg01cPNOUNUojB7te4IkkRem5Qlobk+Fg9JuVYv6g=",
-      "x86_64-linux": "sha256-osNg01cPNOUNUojB7te4IkkRem5Qlobk+Fg9JuVYv6g="
+      "aarch64-linux": "sha256-/QPVuFrA+YI9GERrlBV5lKMX/iLxoYNZ/lM7RNZdv1k=",
+      "x86_64-linux": "sha256-/QPVuFrA+YI9GERrlBV5lKMX/iLxoYNZ/lM7RNZdv1k="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-DIYumjA31vdtDGolP7z+s9zwpGsGDoqmfXiLmrps88I=",
-      "x86_64-linux": "sha256-DIYumjA31vdtDGolP7z+s9zwpGsGDoqmfXiLmrps88I="
+      "aarch64-linux": "sha256-4OhRZ+kvL9HbroD7oLc9w9OOVHAUSfyDjTUGizotMpE=",
+      "x86_64-linux": "sha256-4OhRZ+kvL9HbroD7oLc9w9OOVHAUSfyDjTUGizotMpE="
     }
   },
   "dartVersion": "3.12.2",
@@ -21,55 +21,55 @@
     "x86_64-darwin": "sha256-OBmfVv4i8iNednmRkdW5UW42A2nGG2ukQROY1dWSC6s=",
     "aarch64-darwin": "sha256-zYdTko53trZlvXDc4OZLTsbS4v3hQdZAm7cWyKwfHAo="
   },
-  "flutterHash": "sha256-of68A9AQ4F7pLKWHpVcmpuO+/V2TK8lJlmsAKrTXGx8=",
+  "flutterHash": "sha256-N606ReswJC4D43MJz1e+32U7DVoaJxnBb98bYPbrK/E=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-q/m4dBXDxBGR4n49NKTMe2D0f7uAHVW/sHLRjpkLCOA=",
-      "aarch64-linux": "sha256-SRUxW2I6pssqxVqHUzx53zEmKgkzXnxgVpejwpvcKpQ=",
-      "x86_64-darwin": "sha256-q/m4dBXDxBGR4n49NKTMe2D0f7uAHVW/sHLRjpkLCOA=",
-      "x86_64-linux": "sha256-SRUxW2I6pssqxVqHUzx53zEmKgkzXnxgVpejwpvcKpQ="
+      "aarch64-darwin": "sha256-1L3PtAFFqf0ydf8pENik8G7T9EECcJ0Mtrwzsh1pkrw=",
+      "aarch64-linux": "sha256-qlCcXOF87bPe9yHjRjF0N0d+hp3w9gt43/iAF5O/xWE=",
+      "x86_64-darwin": "sha256-1L3PtAFFqf0ydf8pENik8G7T9EECcJ0Mtrwzsh1pkrw=",
+      "x86_64-linux": "sha256-qlCcXOF87bPe9yHjRjF0N0d+hp3w9gt43/iAF5O/xWE="
     },
     "fuchsia": {
-      "aarch64-darwin": "sha256-r6gOO+7mApZrTV3fc+F1n36PgTtoz3SWYoaKFh0/WtU=",
-      "aarch64-linux": "sha256-r6gOO+7mApZrTV3fc+F1n36PgTtoz3SWYoaKFh0/WtU=",
-      "x86_64-darwin": "sha256-r6gOO+7mApZrTV3fc+F1n36PgTtoz3SWYoaKFh0/WtU=",
-      "x86_64-linux": "sha256-r6gOO+7mApZrTV3fc+F1n36PgTtoz3SWYoaKFh0/WtU="
+      "aarch64-darwin": "sha256-gROzobDNl6qJUzarJAxSw85KvTbawC5gEJbuW71NxXA=",
+      "aarch64-linux": "sha256-gROzobDNl6qJUzarJAxSw85KvTbawC5gEJbuW71NxXA=",
+      "x86_64-darwin": "sha256-gROzobDNl6qJUzarJAxSw85KvTbawC5gEJbuW71NxXA=",
+      "x86_64-linux": "sha256-gROzobDNl6qJUzarJAxSw85KvTbawC5gEJbuW71NxXA="
     },
     "ios": {
-      "aarch64-darwin": "sha256-f7oMmYJFAhw/FCiQ00RhfakKFfLCGoAok0ZpsbPPhIA=",
-      "aarch64-linux": "sha256-f7oMmYJFAhw/FCiQ00RhfakKFfLCGoAok0ZpsbPPhIA=",
-      "x86_64-darwin": "sha256-f7oMmYJFAhw/FCiQ00RhfakKFfLCGoAok0ZpsbPPhIA=",
-      "x86_64-linux": "sha256-f7oMmYJFAhw/FCiQ00RhfakKFfLCGoAok0ZpsbPPhIA="
+      "aarch64-darwin": "sha256-tM4mM4q0kAoX2oSzUwVlo9BeWUZKRk4RpNKYAwnUEXQ=",
+      "aarch64-linux": "sha256-tM4mM4q0kAoX2oSzUwVlo9BeWUZKRk4RpNKYAwnUEXQ=",
+      "x86_64-darwin": "sha256-tM4mM4q0kAoX2oSzUwVlo9BeWUZKRk4RpNKYAwnUEXQ=",
+      "x86_64-linux": "sha256-tM4mM4q0kAoX2oSzUwVlo9BeWUZKRk4RpNKYAwnUEXQ="
     },
     "linux": {
-      "aarch64-darwin": "sha256-V0pc0WpJWzCl1ig83FUaB3P+NRg8xdsm5LPVcVT900k=",
-      "aarch64-linux": "sha256-V0pc0WpJWzCl1ig83FUaB3P+NRg8xdsm5LPVcVT900k=",
-      "x86_64-darwin": "sha256-Xs/HWx8+Tnsxk51WelEgduyjEX6XGor/5GvXCuZXjTk=",
-      "x86_64-linux": "sha256-Xs/HWx8+Tnsxk51WelEgduyjEX6XGor/5GvXCuZXjTk="
+      "aarch64-darwin": "sha256-pCs3o4/8VC2LgiAut34PJOI8NQtu1rEJZyJkWMhg6l0=",
+      "aarch64-linux": "sha256-pCs3o4/8VC2LgiAut34PJOI8NQtu1rEJZyJkWMhg6l0=",
+      "x86_64-darwin": "sha256-5v2fAMJ/icN2GEQhH0w5ae5WV7lEXOWXlrPb/Xon79Q=",
+      "x86_64-linux": "sha256-5v2fAMJ/icN2GEQhH0w5ae5WV7lEXOWXlrPb/Xon79Q="
     },
     "macos": {
-      "aarch64-darwin": "sha256-sfj4+K2n0ZVVzH/u4paYwtmMkflY48v7U+Hebsr9Xio=",
-      "aarch64-linux": "sha256-sfj4+K2n0ZVVzH/u4paYwtmMkflY48v7U+Hebsr9Xio=",
-      "x86_64-darwin": "sha256-sfj4+K2n0ZVVzH/u4paYwtmMkflY48v7U+Hebsr9Xio=",
-      "x86_64-linux": "sha256-sfj4+K2n0ZVVzH/u4paYwtmMkflY48v7U+Hebsr9Xio="
+      "aarch64-darwin": "sha256-nZIsLqll5/9ylS5pfsJGcA/UB+X/YSWsuswlWhjE6M8=",
+      "aarch64-linux": "sha256-nZIsLqll5/9ylS5pfsJGcA/UB+X/YSWsuswlWhjE6M8=",
+      "x86_64-darwin": "sha256-nZIsLqll5/9ylS5pfsJGcA/UB+X/YSWsuswlWhjE6M8=",
+      "x86_64-linux": "sha256-nZIsLqll5/9ylS5pfsJGcA/UB+X/YSWsuswlWhjE6M8="
     },
     "universal": {
-      "aarch64-darwin": "sha256-opm03AvKM93ytlp5g3dhcg4VEVy+mP64b3cMjZjrhNo=",
-      "aarch64-linux": "sha256-LWQehG2c6y7dduDNj1AuBk5opEEM1mmpUxA3vzU5bOY=",
-      "x86_64-darwin": "sha256-86J99IEGTXPGpCAs8h8xHUbJV8LlUTVx/V3/wwISde8=",
-      "x86_64-linux": "sha256-B7ULNNmsJQtLHIO1q3TaEgZeOh6RVXsp+uCwS4lH/1k="
+      "aarch64-darwin": "sha256-qf0UHXnneO14Sf9X9U8Jfy7WJfQ6ryOIgLv8hKMIBeM=",
+      "aarch64-linux": "sha256-NpzD8n6DlUCQVhlDAQOcGdWLF6/JJMcxoEGrzbqbqsU=",
+      "x86_64-darwin": "sha256-V+nwVS8Na4rAU03CTfBTIWSGENw2Iyfw018/Q47nnCs=",
+      "x86_64-linux": "sha256-HZ8FCqD9jSARA6RNPm7VY9QUY6VRTTGl57n7he2VdHQ="
     },
     "web": {
-      "aarch64-darwin": "sha256-FDWzL3vkCiLzNWpYgCagKemjoCjR60tbQ3w7s6ftZd0=",
-      "aarch64-linux": "sha256-FDWzL3vkCiLzNWpYgCagKemjoCjR60tbQ3w7s6ftZd0=",
-      "x86_64-darwin": "sha256-FDWzL3vkCiLzNWpYgCagKemjoCjR60tbQ3w7s6ftZd0=",
-      "x86_64-linux": "sha256-FDWzL3vkCiLzNWpYgCagKemjoCjR60tbQ3w7s6ftZd0="
+      "aarch64-darwin": "sha256-jvAT+zavITjyMkGZFVjo5iyIGxMrVK5cgmzeAiUkUSM=",
+      "aarch64-linux": "sha256-jvAT+zavITjyMkGZFVjo5iyIGxMrVK5cgmzeAiUkUSM=",
+      "x86_64-darwin": "sha256-jvAT+zavITjyMkGZFVjo5iyIGxMrVK5cgmzeAiUkUSM=",
+      "x86_64-linux": "sha256-jvAT+zavITjyMkGZFVjo5iyIGxMrVK5cgmzeAiUkUSM="
     },
     "windows": {
-      "aarch64-darwin": "sha256-IC/wLP6UU0biw3xvpaP1iDwxO5JNJd79jLiPTMTCadY=",
-      "aarch64-linux": "sha256-IC/wLP6UU0biw3xvpaP1iDwxO5JNJd79jLiPTMTCadY=",
-      "x86_64-darwin": "sha256-ENmFCPikrkPREuEdlI14yfbwzBilgYIZEzhnpm67T/E=",
-      "x86_64-linux": "sha256-ENmFCPikrkPREuEdlI14yfbwzBilgYIZEzhnpm67T/E="
+      "aarch64-darwin": "sha256-RlNVcR72nrdbxyTM1sfir+vYl4o2RR9d1nWXYnR8rWQ=",
+      "aarch64-linux": "sha256-RlNVcR72nrdbxyTM1sfir+vYl4o2RR9d1nWXYnR8rWQ=",
+      "x86_64-darwin": "sha256-/2MR6cysbbqf5+RHa1MQ18EDOgBQscNOoieYjiU+/O0=",
+      "x86_64-linux": "sha256-/2MR6cysbbqf5+RHa1MQ18EDOgBQscNOoieYjiU+/O0="
     }
   },
   "pubspecLock": {

From 75d56b55077450e0c9d56a5a09f8ecfbe0bd9273 Mon Sep 17 00:00:00 2001
From: Cryolitia PukNgae <Cryolitia@gmail.com>
Date: Wed, 10 Jun 2026 21:57:14 +0800
Subject: [PATCH 22/81] fbida: 2.14->2.15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gaétan Lepage <gaetan@glepage.com>
---
 pkgs/by-name/fb/fbida/package.nix | 108 ++++++++++++++++--------------
 1 file changed, 56 insertions(+), 52 deletions(-)

diff --git a/pkgs/by-name/fb/fbida/package.nix b/pkgs/by-name/fb/fbida/package.nix
index 36a76bf05353..f899ac7908e5 100644
--- a/pkgs/by-name/fb/fbida/package.nix
+++ b/pkgs/by-name/fb/fbida/package.nix
@@ -1,91 +1,95 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  libGL,
-  libjpeg,
-  libexif,
-  giflib,
-  libtiff,
-  libpng,
-  libwebp,
-  libdrm,
+  fetchFromGitLab,
+  hexdump,
+  meson,
+  ninja,
+  perl,
   pkg-config,
-  freetype,
-  fontconfig,
-  which,
-  imagemagick,
-  curl,
-  sane-backends,
+  giflib,
+  libdrm,
+  libexif,
+  libiconvReal,
+  libinput,
+  libtsm,
+  libwebp,
+  libxkbcommon,
   libxpm,
-  libepoxy,
+  libxt,
+  motif,
   pixman,
   poppler,
-  libgbm,
-  lirc,
+  udev,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fbida";
-  version = "2.14";
+  version = "2.15-1";
 
-  src = fetchurl {
-    url = "http://dl.bytesex.org/releases/fbida/fbida-${finalAttrs.version}.tar.gz";
-    sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm";
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitLab {
+    owner = "kraxel";
+    repo = "fbida";
+    tag = "fbida-${finalAttrs.version}";
+    hash = "sha256-iwJkFynhz3SJ8MRjUsKtQAjPCBvST1ezsxTw2ZCXBag=";
   };
 
   patches = [
-    # Upstream patch to fix build on -fno-common toolchains.
-    (fetchurl {
-      name = "no-common.patch";
-      url = "https://git.kraxel.org/cgit/fbida/patch/?id=1bb8a8aa29845378903f3c690e17c0867c820da2";
-      sha256 = "0n5vqbp8wd87q60zfwdf22jirggzngypc02ha34gsj1rd6pvwahi";
-    })
     # Prevents using function declaration without explicit parameters.
     ./function-parameters.patch
   ];
 
   nativeBuildInputs = [
+    hexdump
+    meson
+    ninja
+    perl
     pkg-config
-    which
   ];
+
   buildInputs = [
-    libGL
-    libexif
-    libjpeg
-    libpng
     giflib
-    freetype
-    fontconfig
-    libtiff
-    libwebp
-    imagemagick
-    curl
-    sane-backends
     libdrm
+    libexif
+    libiconvReal
+    libinput
+    libtsm
+    libwebp
+    libxkbcommon
     libxpm
-    libepoxy
+    libxt
+    motif
     pixman
     poppler
-    lirc
-    libgbm
+    udev
   ];
 
+  patchPhase = ''
+    runHook prePatch
+
+    patchShebangs scripts/*.pl
+    patchShebangs scripts/*.sh
+
+    sed -i -E \
+      -e '/^jpeg_run[[:space:]]*=.*$/d' \
+      -e "/^jpeg_ver[[:space:]]*=.*$/c\\jpeg_ver = '62'" \
+      meson.build
+
+    runHook postPatch
+  '';
+
   makeFlags = [
-    "prefix=$(out)"
-    "verbose=yes"
-    "STRIP="
-    "JPEG_VER=62"
+    "HOST=nix"
   ];
 
-  postPatch = ''
-    sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile
-    sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile
-  '';
-
   meta = {
     description = "Image viewing and manipulation programs including fbi, fbgs, ida, exiftran and thumbnail.cgi";
     homepage = "https://www.kraxel.org/blog/linux/fbida/";
+    downloadPage = "https://gitlab.com/kraxel/fbida/";
+    changelog = "https://gitlab.com/kraxel/fbida/-/blob/${finalAttrs.src.tag}/Changes?ref_type=tags";
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ pSub ];
     platforms = lib.platforms.linux;

From 0ab368fc96170f4e3753b8cc2800bd461437be2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 19:06:07 +0000
Subject: [PATCH 23/81] cargo-codspeed: 4.7.0 -> 5.0.0

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

diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix
index 98be35c90296..fdabb7383289 100644
--- a/pkgs/by-name/ca/cargo-codspeed/package.nix
+++ b/pkgs/by-name/ca/cargo-codspeed/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-codspeed";
-  version = "4.7.0";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "CodSpeedHQ";
     repo = "codspeed-rust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6XSKAPLcxgnshkMuiSmw13tsE4keJ9h5DpxwidqMLbg=";
+    hash = "sha256-F4QRTNS9mo8juXyCFAlETNEaZZu56bYYr8i464FYPd4=";
   };
 
-  cargoHash = "sha256-1AjODDI114CL/L8ZDFWDfPwxxxY9vgT/miSVsMLLSgE=";
+  cargoHash = "sha256-it/4LSTGajQe5f47LCh9eDAf8ZNyFTGJJ4Z5N6klgNw=";
 
   nativeBuildInputs = [
     curl

From 673e1131ee721a9a9da181697b46f40938ee9f3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 19:08:34 +0000
Subject: [PATCH 24/81] auth0-cli: 1.31.0 -> 1.32.0

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

diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix
index 79aa36b252e0..b38c11bd34ee 100644
--- a/pkgs/by-name/au/auth0-cli/package.nix
+++ b/pkgs/by-name/au/auth0-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "auth0-cli";
-  version = "1.31.0";
+  version = "1.32.0";
 
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6+AMU77eHYy0AwPsHt/tgtzTQkyPfvZZw1yzvWXQX0s=";
+    hash = "sha256-tRr0bCzijVG3+2n67jo7SNe4Oxxci0sRXhQct2645cI=";
   };
 
-  vendorHash = "sha256-MzvoHXO8gDIzNqhQGgDEd8xXWF7971JLTKWt8TCldKI=";
+  vendorHash = "sha256-ZwGIYjaCQikHMoy3bSnvNEk+REnKO6JdCiiSh8L0SDg=";
 
   ldflags = [
     "-s"

From 3f9f62f9c7e916f6895283a6cc36e8217b20aafb Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Tue, 23 Jun 2026 21:38:58 +0200
Subject: [PATCH 25/81] linuxPackages.nvidiaPackages.legacy_470: support up to
 linux 7.1

fix #534698
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 0f6ae68c16d7..52618ba72dca 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -180,8 +180,8 @@ rec {
       # Source corresponding to https://aur.archlinux.org/packages/nvidia-470xx-dkms
       aurPatches = fetchgit {
         url = "https://aur.archlinux.org/nvidia-470xx-utils.git";
-        rev = "7c1c2c124147d960a6c7114eb26a4eadae9b9f3d";
-        hash = "sha256-sNW+I4dkPSudfORLEp1RNGHyQKWBYnBEeGrfJU7SYTs=";
+        rev = "7abbeeb510742be09e1eb806c14bab2833a25783";
+        hash = "sha256-hRBws0o4DWI5fvZRn0OwitXRSR9HCkRkgnvnkiZI6Ko=";
       };
     in
     generic {
@@ -202,6 +202,9 @@ rec {
         "nvidia-470xx-fix-linux-6.14.patch"
         "nvidia-470xx-fix-linux-6.15.patch"
         "nvidia-470xx-fix-linux-6.17.patch"
+        "nvidia-470xx-fix-linux-6.19-part1.patch"
+        "nvidia-470xx-fix-linux-6.19-part2.patch"
+        "nvidia-470xx-fix-linux-7.0.patch"
       ];
       patchFlags = [
         "-p1"

From e68a019d6df9a3237b6c36ef7ad5d8206fbf83e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 19:44:11 +0000
Subject: [PATCH 26/81] charasay: 3.3.1 -> 3.3.3

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

diff --git a/pkgs/by-name/ch/charasay/package.nix b/pkgs/by-name/ch/charasay/package.nix
index 45af04434c20..eda492557bc6 100644
--- a/pkgs/by-name/ch/charasay/package.nix
+++ b/pkgs/by-name/ch/charasay/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "charasay";
-  version = "3.3.1";
+  version = "3.3.3";
 
   src = fetchFromGitHub {
     owner = "latipun7";
     repo = "charasay";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VkDOdZt0Z/kuBwFm5utXYsxT59a1uapU9ouzB1ymmXs=";
+    hash = "sha256-8N3ToXpbDR+g19CT0q1J4QfQstBjS2QfX4IV2D7+ics=";
   };
 
-  cargoHash = "sha256-6AczT5VvOryOlcOMNFxcHqy8K1sm4tbhb6+LsCNHW14=";
+  cargoHash = "sha256-yByNgG8JAdT5jVxe3ijLbmjE1c8YybPkiwMHOvpZPTM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From d3e772f6967e936932f11d276514cab368aad9e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 19:55:19 +0000
Subject: [PATCH 27/81] python3Packages.langchain: 1.3.10 -> 1.3.11

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

diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 7dbe11e56270..ada34e3ea9c7 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -46,7 +46,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langchain";
-  version = "1.3.10";
+  version = "1.3.11";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain==${finalAttrs.version}";
-    hash = "sha256-hB1TpaQjSleS+ysGIB1HxCgeQgUhMDoiDtO3Hjk6SLU=";
+    hash = "sha256-ARLnl+HNsaFW7glyT3CEsNWvp9quvVkCpQvMLxgS2eI=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/langchain_v1";

From 56c0f5a24922c7cc43b66a1f860506815b96f943 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 22:35:45 +0000
Subject: [PATCH 28/81] famly-fetch: 0.5.3 -> 0.6.0

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

diff --git a/pkgs/by-name/fa/famly-fetch/package.nix b/pkgs/by-name/fa/famly-fetch/package.nix
index b9115720c77e..62005ab7fb44 100644
--- a/pkgs/by-name/fa/famly-fetch/package.nix
+++ b/pkgs/by-name/fa/famly-fetch/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "famly-fetch";
-  version = "0.5.3";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jacobbunk";
     repo = "famly-fetch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KsdypUXHU9drghAcDcur8FUUJvm8nIzq00QFdMqPnpc=";
+    hash = "sha256-MU9T8eP/LNOLAQFPOC1EEy58+kcn7G+Hh2R8wC92qnQ=";
   };
 
   build-system = with python3Packages; [

From 5d6a9835a667fc729b087726c1aa7b1c68f7f957 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jun 2026 23:42:23 +0000
Subject: [PATCH 29/81] jx: 3.17.6 -> 3.17.17

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

diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix
index 2a813627aeff..69af58260a74 100644
--- a/pkgs/by-name/jx/jx/package.nix
+++ b/pkgs/by-name/jx/jx/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "3.17.6";
+  version = "3.17.17";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "sha256-s6+Tl3nMESOrp8nzmffkqV1ES9i+mZxd604VTi38GZo=";
+    sha256 = "sha256-Fu8qBiRWLZBK2Qn+fVPi7TVeqK+/ZD5a/c5yvPnypWo=";
   };
 
-  vendorHash = "sha256-1ErjD+1MdbKN4EPaQX0jxNzoN9dB8beH1csdx1IPKl8=";
+  vendorHash = "sha256-tGvreLuxaRswjCGzroCRRDZR4QadQKLrX9Hz3u22VZ0=";
 
   subPackages = [ "cmd" ];
 

From c6d023749315c81e5eb91cdca73d755a1699e4d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 00:51:38 +0000
Subject: [PATCH 30/81] python3Packages.copier: 9.15.2 -> 9.16.0

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

diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix
index 819eddb0ebc1..1635a1bff085 100644
--- a/pkgs/development/python-modules/copier/default.nix
+++ b/pkgs/development/python-modules/copier/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "copier";
-  version = "9.15.2";
+  version = "9.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm $out/tests/demo/doc/ma*ana.txt
     '';
-    hash = "sha256-57FQtXPf9L7dXogf2mmWVViggHkn/2VTKm/B4FFSrfI=";
+    hash = "sha256-A7tfiFyEeQ3JFZkHSbv0EOE3rQzCJ3l1euMU93nKonA=";
   };
 
   env.POETRY_DYNAMIC_VERSIONING_BYPASS = version;

From 64f31b61b75ad651e7c76bc8e3af9d1cc24eba68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 01:07:40 +0000
Subject: [PATCH 31/81] python3Packages.fastapi-pagination: 0.15.14 -> 0.15.15

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

diff --git a/pkgs/development/python-modules/fastapi-pagination/default.nix b/pkgs/development/python-modules/fastapi-pagination/default.nix
index 1c67afa8a62c..705adb2284cb 100644
--- a/pkgs/development/python-modules/fastapi-pagination/default.nix
+++ b/pkgs/development/python-modules/fastapi-pagination/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fastapi-pagination";
-  version = "0.15.14";
+  version = "0.15.15";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
     owner = "uriyyo";
     repo = "fastapi-pagination";
     tag = finalAttrs.version;
-    hash = "sha256-W3SgSne3GgRl2W6l3NWUguvzxigLCVgMLiT/fMIWSAE=";
+    hash = "sha256-G6qF57MWlrZ4Poc+M2YtpKqquhOR/Zh4TnFmL2qZ1Uk=";
   };
 
   build-system = [

From 53885f0a681eebfc43b49baff566d83d32188c23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 01:31:01 +0000
Subject: [PATCH 32/81] git-backup-go: 1.6.1 -> 1.7.0

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

diff --git a/pkgs/by-name/gi/git-backup-go/package.nix b/pkgs/by-name/gi/git-backup-go/package.nix
index 3dcaac1ff9f4..307699a04fbb 100644
--- a/pkgs/by-name/gi/git-backup-go/package.nix
+++ b/pkgs/by-name/gi/git-backup-go/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-backup-go";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "ChappIO";
     repo = "git-backup";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Z32ThzmGkF89wsYqJnP/Koz4/2mulkrvvnUKHE6Crks=";
+    hash = "sha256-xpHrBGgPH2dnbDz49OBntdHbowMhoz3P7k8UlNN7ku8=";
   };
 
-  vendorHash = "sha256-BLnnwwCrJJd8ihpgfdWel7l8aAIVVJBIpE+97J9ojPo=";
+  vendorHash = "sha256-xP2bV3vD4CbMGVT+MK4wJgMbIBZLvyqiMOfgj8Rc38Y=";
 
   ldflags = [ "-X main.Version=${finalAttrs.version}" ];
 

From 7d2980842f28f08e90a22252105b61348e4951f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 03:16:55 +0000
Subject: [PATCH 33/81] python3Packages.spyder-kernels: 3.1.4 -> 3.1.5

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

diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index 94a240c50425..76adcf38238d 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -35,14 +35,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "spyder-kernels";
-  version = "3.1.4";
+  version = "3.1.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spyder-ide";
     repo = "spyder-kernels";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HMkenC9a+UZ0VCFx+q9K6KQ8BdTvpc4nHukhEqCLGXo=";
+    hash = "sha256-FdZKWtMRTLq16rULc4lQx4GywtyZ+ori2z85PgK1geM=";
   };
 
   build-system = [ setuptools ];

From d23916322e6187edd870b200f7115355931c7c04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 04:35:36 +0000
Subject: [PATCH 34/81] lagrange: 1.20.7 -> 1.20.8

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

diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix
index 5d242d0a7d32..569ce0df6398 100644
--- a/pkgs/by-name/la/lagrange/package.nix
+++ b/pkgs/by-name/la/lagrange/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lagrange";
-  version = "1.20.7";
+  version = "1.20.8";
 
   src = fetchFromGitHub {
     owner = "skyjake";
     repo = "lagrange";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/dQfgAGfe66bg6MYTYGv1jhCdGzdp+GbT8FwZnKlrtY=";
+    hash = "sha256-f0LRvpu+e2KaKyTVBO9yJD9LnXRom0w/Ck5oxjF4cBU=";
   };
 
   nativeBuildInputs = [

From 1721595d2ee2fd35f4988a2adfa834c8851fc085 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 08:46:31 +0000
Subject: [PATCH 35/81] pocket-casts: 0.12.1 -> 0.13.0

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

diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix
index 4c598c7e666e..f5b922150081 100644
--- a/pkgs/by-name/po/pocket-casts/package.nix
+++ b/pkgs/by-name/po/pocket-casts/package.nix
@@ -12,16 +12,16 @@ let
 in
 buildNpmPackage rec {
   pname = "pocket-casts";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "felicianotech";
     repo = "pocket-casts-desktop-app";
     rev = "v${version}";
-    hash = "sha256-niVS3rfQetc2GPQCFxpQo+mCxSHAQaWAi2pU0kApxyM=";
+    hash = "sha256-v5R83h+AHpGbh3pXehalEjuD+s5grAowgGfvr7FsJKU=";
   };
 
-  npmDepsHash = "sha256-iLSnXGXbeHA5JuR6WFHlP9cgmmX6/S+1mIEzDjb45w0=";
+  npmDepsHash = "sha256-335PYsGbYwYtMoLi1UkwdX3mPA0DOs79Lm1Kg7V83ZM=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 

From ec4e715bab331e323fbc05a8e08c6c15a943a833 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 09:28:07 +0000
Subject: [PATCH 36/81] webdav: 5.11.10 -> 5.11.11

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

diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix
index 69464f1982f9..b2b09d79782d 100644
--- a/pkgs/by-name/we/webdav/package.nix
+++ b/pkgs/by-name/we/webdav/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "webdav";
-  version = "5.11.10";
+  version = "5.11.11";
 
   src = fetchFromGitHub {
     owner = "hacdias";
     repo = "webdav";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OaaUROSjzgM99sQrnE8bSCdfGPYCJJ5frptogqsJMrM=";
+    hash = "sha256-WU8ZW1ty59ETgiedKdAzV1Sm8uu1nSJp9cSSrPgjyeU=";
   };
 
-  vendorHash = "sha256-/s93KMnfQ+eLFCXaE6GFU8rakCNNQv8cnfHF+teEDJQ=";
+  vendorHash = "sha256-cBfmN+D7zii7Khfv04q0HbiErn8vNMFeYGi17wAfOaE=";
 
   __darwinAllowLocalNetworking = true;
 

From 5aa34f2d48699cd8bb832e91fdc91d08cf874333 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 24 Jun 2026 13:29:20 +0400
Subject: [PATCH 37/81] lagrange: fix updateScript

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

diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix
index 569ce0df6398..639027de1d55 100644
--- a/pkgs/by-name/la/lagrange/package.nix
+++ b/pkgs/by-name/la/lagrange/package.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script { attrPath = "lagrange"; };
   };
 
   meta = {

From f90065c01ca75cf7ad7855495b24f33e4e4effdb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 09:30:45 +0000
Subject: [PATCH 38/81] traefik-certs-dumper: 2.11.3 -> 2.11.4

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

diff --git a/pkgs/by-name/tr/traefik-certs-dumper/package.nix b/pkgs/by-name/tr/traefik-certs-dumper/package.nix
index e1682c3f9ea3..1a8fa921b4ff 100644
--- a/pkgs/by-name/tr/traefik-certs-dumper/package.nix
+++ b/pkgs/by-name/tr/traefik-certs-dumper/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "traefik-certs-dumper";
-  version = "2.11.3";
+  version = "2.11.4";
 
   src = fetchFromGitHub {
     owner = "ldez";
     repo = "traefik-certs-dumper";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-8x/3g2/6XVoR4EVR83aUDh16LSiG8r3buny+4F0qNH4=";
+    sha256 = "sha256-oap1IJc8y9gdQ3YCk9STlnkeAAgGrG67nfid9FY4nnk=";
   };
 
   vendorHash = "sha256-DR1Bo4MwoJy7AZyuLsjkqbUHj12fN01mnyDVXcvmjMI=";

From 32981fe8b7a586d9ad44690f9a79bf29e0953f1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 12:32:31 +0000
Subject: [PATCH 39/81] c2patool: 0.26.67 -> 0.26.68

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

diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix
index 875b10425d84..8580eba1a948 100644
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "c2patool";
-  version = "0.26.67";
+  version = "0.26.68";
 
   src = fetchFromGitHub {
     owner = "contentauth";
     repo = "c2pa-rs";
     tag = "c2patool-v${finalAttrs.version}";
-    hash = "sha256-18gGrIleSpSwHohX+Qn6Zj6kPIzNri53tHIBlED5/LY=";
+    hash = "sha256-0St3EoHvUQtfPF0LOLkbQ3C6NT/R+F9YhQoE0TpDTOc=";
   };
 
-  cargoHash = "sha256-YZKQmekJ0RxtyrLkCeiAry+m7j2jhxm0lsQ+Xi29nEw=";
+  cargoHash = "sha256-lUHRGfI/GW9ZMEor5NPATt/ih6D/AhvGbL4H7FtyzDQ=";
 
   # use the non-vendored openssl
   env.OPENSSL_NO_VENDOR = 1;

From 1f4df3cdf7dfc87b8ea590f96a26740dd6569d18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 13:38:06 +0000
Subject: [PATCH 40/81] psi-plus: 1.5.2139 -> 1.5.2140

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

diff --git a/pkgs/by-name/ps/psi-plus/package.nix b/pkgs/by-name/ps/psi-plus/package.nix
index e3bd2832f90e..884c83922c32 100644
--- a/pkgs/by-name/ps/psi-plus/package.nix
+++ b/pkgs/by-name/ps/psi-plus/package.nix
@@ -42,12 +42,12 @@ assert enablePsiMedia -> enablePlugins;
 stdenv.mkDerivation rec {
   pname = "psi-plus";
 
-  version = "1.5.2139";
+  version = "1.5.2140";
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     tag = version;
-    hash = "sha256-wgR809rOtcKvim2gPm9MeiB67pU+EiRktpW5BCJqWs8=";
+    hash = "sha256-cXgjskHb7Rx4FB+DW/cTlsNtdyWgXN3sBh9WBBCgliA=";
   };
 
   cmakeFlags = [

From ea6ff05458241307e53629a61f1b711d093c1b97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 14:27:46 +0000
Subject: [PATCH 41/81] kodiPackages.jellycon: 1.0.0 -> 1.0.1

---
 pkgs/applications/video/kodi/addons/jellycon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix
index 8c0996f7764f..161d25e9f1d5 100644
--- a/pkgs/applications/video/kodi/addons/jellycon/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix
@@ -17,13 +17,13 @@ in
 buildKodiAddon rec {
   pname = "jellycon";
   namespace = "plugin.video.jellycon";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellycon";
     rev = "v${version}";
-    sha256 = "sha256-1o9mkMjlLDIcokpTqDKmFlCOF1XjrVOxlFfy0bpZolc=";
+    sha256 = "sha256-TLJalH3b1EYoIbnUhnHl8A9EF2Q6dDy0M2hl9je0K54=";
   };
 
   nativeBuildInputs = [

From a646a39bb326a34f3b5123392daed4efe0cd72af Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 24 Jun 2026 16:47:58 +0200
Subject: [PATCH 42/81] maintainers/matrix: add transcaffeine

She's been tirelessly keeping Synapse up-to-date and also worked quite a
lot on the Element packages, so having her officially part of this makes
sense. I confirmed with her in private that she's interested.
---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 1480b3733b92..b9a161f95456 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -510,6 +510,7 @@ with lib.maintainers;
       dandellion
       nickcao
       teutat3s
+      transcaffeine
     ];
     scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
     shortName = "Matrix";

From 4ed9aa9fd26fb33d66ab59bb814b518317c03e9d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 24 Jun 2026 17:09:57 +0200
Subject: [PATCH 43/81] maintainers/matrix: rescope the team

It's absolutely not reasonable to have us maintain random homeserver
implementations and Matrix clients. I don't think anyone is actually
operating and focusing on >1 of these implementations, so restricting
ourselves to the core things & reference implementations makes more
sense to me.
---
 maintainers/team-list.nix                                      | 2 +-
 nixos/modules/services/matrix/dendrite.nix                     | 1 -
 nixos/tests/matrix/pantalaimon.nix                             | 3 ---
 .../networking/instant-messengers/hydrogen-web/unwrapped.nix   | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index b9a161f95456..638ef8e58e9b 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -512,7 +512,7 @@ with lib.maintainers;
       teutat3s
       transcaffeine
     ];
-    scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
+    scope = "Maintain the foundational packages of the Matrix ecosystem.";
     shortName = "Matrix";
   };
 
diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix
index 302bd42b5e37..4a55c30c839b 100644
--- a/nixos/modules/services/matrix/dendrite.nix
+++ b/nixos/modules/services/matrix/dendrite.nix
@@ -341,5 +341,4 @@ in
       };
     };
   };
-  meta.teams = [ lib.teams.matrix ];
 }
diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix
index fdf2c4de7ad3..aac75ab28c9d 100644
--- a/nixos/tests/matrix/pantalaimon.nix
+++ b/nixos/tests/matrix/pantalaimon.nix
@@ -31,9 +31,6 @@ let
 in
 {
   name = "pantalaimon";
-  meta = {
-    maintainers = pkgs.lib.teams.matrix.members;
-  };
 
   nodes.machine =
     { pkgs, ... }:
diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
index b6fc9a80f8a5..adbe9fa9659c 100644
--- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
@@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Lightweight matrix client with legacy and mobile browser support";
     homepage = "https://github.com/element-hq/hydrogen-web";
-    teams = [ lib.teams.matrix ];
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
     inherit (olm.meta) knownVulnerabilities;

From 68b5ed676715901a2d8542103370693c2d732510 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 24 Jun 2026 17:17:33 +0200
Subject: [PATCH 44/81] maintainers/matrix: rm inactive people

This list reflects the current reality better.
---
 maintainers/team-list.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 638ef8e58e9b..043e3f6336cd 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -506,8 +506,6 @@ with lib.maintainers;
   matrix = {
     members = [
       ma27
-      mguentner
-      dandellion
       nickcao
       teutat3s
       transcaffeine

From 5bb7399937f1fa712ee686bea2e7359a0cfddd23 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 24 Jun 2026 12:54:34 +0200
Subject: [PATCH 45/81] fish: 4.7.1 -> 4.8.0

Changelog: https://github.com/fish-shell/fish-shell/releases/tag/4.8.0
Diff: https://github.com/fish-shell/fish-shell/compare/4.7.1...4.8.0
---
 pkgs/by-name/fi/fish/nix-darwin-path.patch | 16 ++++++++--------
 pkgs/by-name/fi/fish/package.nix           |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/fi/fish/nix-darwin-path.patch b/pkgs/by-name/fi/fish/nix-darwin-path.patch
index 8e92dcf1e9ce..cca5b1ccd81d 100644
--- a/pkgs/by-name/fi/fish/nix-darwin-path.patch
+++ b/pkgs/by-name/fi/fish/nix-darwin-path.patch
@@ -1,12 +1,12 @@
 diff --git a/share/config.fish b/share/config.fish
-index 73148ac25..1964e30be 100644
+index b246916a5..05252c35f 100644
 --- a/share/config.fish
 +++ b/share/config.fish
-@@ -175,6 +175,7 @@ and __fish_set_locale
+@@ -132,6 +132,7 @@ and __fish_set_locale
+ # This used to be in etc/config.fish - keep it here to keep the semantics
  #
- if status --is-login
-     if command -sq /usr/libexec/path_helper
-+        and not set -q __NIX_DARWIN_SET_ENVIRONMENT_DONE
-         __fish_macos_set_env PATH /etc/paths '/etc/paths.d'
-         if test -n "$MANPATH"
-             __fish_macos_set_env MANPATH /etc/manpaths '/etc/manpaths.d'
+ if status is-login && command -sq /usr/libexec/path_helper
++    and not set -q __NIX_DARWIN_SET_ENVIRONMENT_DONE
+     __fish_macos_set_env PATH /etc/paths '/etc/paths.d'
+     if test -n "$MANPATH"
+         __fish_macos_set_env MANPATH /etc/manpaths '/etc/manpaths.d'
diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index a991b9b5683c..300538248ede 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -150,13 +150,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fish";
-  version = "4.7.1";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "fish-shell";
     repo = "fish-shell";
     tag = finalAttrs.version;
-    hash = "sha256-u0mBdWkxP4zI6NUhJ0LJrEDrbAAfTDi8IapsWWC9yWc=";
+    hash = "sha256-ttjLM1uBY8sL+jVcxdHUnHYlRFe5jGjnkgBLy17qGso=";
   };
 
   env = {
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-d4YA9fnDQyfyK675nP+tiTqJ1o2jqjwPHU1trXd8MCA=";
+    hash = "sha256-w8MuabpZ5ronQL3iaXbLErxPlTe1Mg8OsRb5foR59II=";
   };
 
   patches = [

From 1260b0727b5458aa7b69ee7cda483a2d5558316d Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 24 Jun 2026 13:41:57 +0200
Subject: [PATCH 46/81] nixos/fish: extract completion generator from the fish
 binary

fish no longer installs share/fish/tools/ and instead embeds the
script in the binary. Extract it via `status get-file` and replace
the patch that stripped the autogenerated header with an inline sed
plus a test that fails the build if the upstream header format
changes.
---
 nixos/modules/programs/fish.nix               | 46 ++++++++++++-------
 .../programs/fish_completion-generator.patch  | 14 ------
 2 files changed, 29 insertions(+), 31 deletions(-)
 delete mode 100644 nixos/modules/programs/fish_completion-generator.patch

diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index 86c29477ebcc..b425ed4028f1 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -262,22 +262,17 @@ in
       (lib.mkIf cfg.generateCompletions {
         etc."fish/generated_completions".source =
           let
-            patchedGenerator = pkgs.stdenv.mkDerivation {
-              name = "fish_patched-completion-generator";
-              srcs = [
-                "${cfg.package}/share/fish/tools/create_manpage_completions.py"
-              ];
-              unpackCmd = "cp $curSrc $(basename $curSrc)";
-              sourceRoot = ".";
-              patches = [ ./fish_completion-generator.patch ]; # to prevent collisions of identical completion files
-              dontBuild = true;
-              installPhase = ''
-                mkdir -p $out
-                cp * $out/
-              '';
-              preferLocalBuild = true;
-              allowSubstitutes = false;
-            };
+            # fish embeds the generator script in the binary, so extract it.
+            generator =
+              pkgs.runCommandLocal "fish_completion-generator"
+                {
+                  nativeBuildInputs = [ cfg.package ];
+                }
+                ''
+                  mkdir -p $out
+                  fish --no-config -c 'status get-file tools/create_manpage_completions.py' \
+                    > $out/create_manpage_completions.py
+                '';
             generateCompletions =
               package:
               pkgs.runCommandLocal
@@ -298,8 +293,25 @@ in
                 ''
                   mkdir -p $out
                   if [ -d $package/share/man ]; then
-                    find -L $package/share/man -type f | xargs ${pkgs.python3.pythonOnBuildForHost.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null
+                    find -L $package/share/man -type f \
+                      | xargs ${pkgs.python3.pythonOnBuildForHost.interpreter} \
+                          ${generator}/create_manpage_completions.py --directory $out \
+                          >/dev/null
                   fi
+
+                  # The generator emits a header comment containing the man page store
+                  # path. Strip it so identical completions from different packages
+                  # don't collide and so we don't retain runtime references to the
+                  # inputs. Fail if generated files lack the expected header so that a
+                  # change in the upstream format gets noticed.
+                  shopt -s nullglob
+                  for f in $out/*.fish; do
+                    if ! grep -q '^# Autogenerated from ' "$f"; then
+                      echo "error: expected '# Autogenerated from' header not found in $f" >&2
+                      exit 1
+                    fi
+                    sed -i '/^# Autogenerated from /d' "$f"
+                  done
                 '';
             packages =
               if
diff --git a/nixos/modules/programs/fish_completion-generator.patch b/nixos/modules/programs/fish_completion-generator.patch
deleted file mode 100644
index fa207e484c99..000000000000
--- a/nixos/modules/programs/fish_completion-generator.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/create_manpage_completions.py
-+++ b/create_manpage_completions.py
-@@ -879,10 +879,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
-                 )
-                 return False
- 
--        # Output the magic word Autogenerated so we can tell if we can overwrite this
--        built_command_output.insert(
--            0, "# " + CMDNAME + "\n# Autogenerated from man page " + manpage_path
--        )
-         # built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABLE PARSER! Was really using Type2 but reporting TypeDeroffManParser
- 
-         for line in built_command_output:
-

From d69bec62c00cba506fa882e20758bc1e30180864 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 24 Jun 2026 13:41:57 +0200
Subject: [PATCH 47/81] fish: fix fishConfig test for embedded web_config

share/fish/tools/ is no longer installed, so extract the embedded
web_config files via `status get-file`.
---
 pkgs/by-name/fi/fish/package.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 300538248ede..1aa932517d06 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -404,10 +404,17 @@ stdenv.mkDerivation (finalAttrs: {
       fishConfig =
         let
           fishScript = writeText "test.fish" ''
-            set -x __fish_bin_dir ${finalAttrs.finalPackage}/bin
-            echo $__fish_bin_dir
-            cp -r ${finalAttrs.finalPackage}/share/fish/tools/web_config/* .
-            chmod -R +w *
+            # webconfig.py locates fish via $fish_bin_dir, which fish_config
+            # normally exports from the read-only $__fish_bin_dir.
+            set -x fish_bin_dir $__fish_bin_dir
+            echo $fish_bin_dir
+
+            # The web_config tool is embedded in the binary, so extract it.
+            for f in (status list-files tools/web_config)
+                mkdir -p (path dirname $f)
+                status get-file $f > $f
+            end
+            cd tools/web_config
 
             # if we don't set `delete=False`, the file will get cleaned up
             # automatically (leading the test to fail because there's no

From 5a0b9ad69038638ebd6d704ab96cd67d74002245 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 15:51:06 +0000
Subject: [PATCH 48/81] aks-mcp-server: 0.0.18 -> 0.0.19

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

diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix
index f8fbc33a5459..49cee658330d 100644
--- a/pkgs/by-name/ak/aks-mcp-server/package.nix
+++ b/pkgs/by-name/ak/aks-mcp-server/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aks-mcp-server";
-  version = "0.0.18";
+  version = "0.0.19";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "aks-mcp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-h/zLbnc2ffcQkx+KE6vglaSG6QAySZSg8EB4zyqH4sg=";
+    hash = "sha256-Zu/caWrTuyzS4ejJ5LTOCyLTsmJOFrkX0kUGM0zDfFs=";
   };
 
-  vendorHash = "sha256-HYIEGnQOVNNVJxzoOiLTXwRFOBvCwikAwqky18VqFSQ=";
+  vendorHash = "sha256-eipcHVKKHBOey2fUGB4lf2pE/wdwGgsbYvCrvDG1JK8=";
 
   subPackages = [ "cmd/aks-mcp" ];
 

From 475a5100f3b63cb163ed32481b2a6e00c45122c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 16:23:08 +0000
Subject: [PATCH 49/81] sandbox-runtime: 0.0.56 -> 0.0.59

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

diff --git a/pkgs/by-name/sa/sandbox-runtime/package.nix b/pkgs/by-name/sa/sandbox-runtime/package.nix
index 290dce870896..82a53d7d1578 100644
--- a/pkgs/by-name/sa/sandbox-runtime/package.nix
+++ b/pkgs/by-name/sa/sandbox-runtime/package.nix
@@ -17,7 +17,7 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "sandbox-runtime";
-  version = "0.0.56";
+  version = "0.0.59";
 
   __structuredAttrs = true;
 
@@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: {
     owner = "anthropic-experimental";
     repo = "sandbox-runtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AAOhKdQJzBq6sisjv3rVVp1UGIGWCewPzVN0fHxpqdk=";
+    hash = "sha256-aHjjIn1niFAEst6T35o4jGbCF1U/W12yh3BjO/lRTFM=";
   };
 
   postPatch =
@@ -37,7 +37,7 @@ buildNpmPackage (finalAttrs: {
 
   strictDeps = true;
 
-  npmDepsHash = "sha256-Fys0ytzS7O9KY50HyFIjW5HeXqL47kicwBwlZXvFjDs=";
+  npmDepsHash = "sha256-k0tkb2GSuy6ZP94JGLmr2qQH1zAHZ5tLaRH3f3Mf/3E=";
 
   postFixup =
     let

From 123802e98a94573d0c4be717421426a9456f80e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 16:49:12 +0000
Subject: [PATCH 50/81] meilisearch: 1.47.0 -> 1.48.2

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

diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix
index 7f3dce98d76e..bc97b1b80576 100644
--- a/pkgs/by-name/me/meilisearch/package.nix
+++ b/pkgs/by-name/me/meilisearch/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "meilisearch";
-  version = "1.47.0";
+  version = "1.48.2";
 
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "meilisearch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LEO8D4OgTjYdBMyOM8RG298+gj2iWN1TVUhYWvOCkns=";
+    hash = "sha256-qRs6U10fnCnGtzd6+GAExLnQ9v3pLT5/yxaAebKVJeY=";
   };
 
   cargoBuildFlags = [ "--package=meilisearch" ];
 
-  cargoHash = "sha256-frYHEeJOmPNAd/tt762qRBbSrXZ3/ZDjc8wZynuEDL4=";
+  cargoHash = "sha256-LJ/NtJ6PYR6rjT1mtGSPoCKmdeIiFUwF9SIHysfEn9w=";
 
   # Default features include mini dashboard which downloads something from the internet.
   buildNoDefaultFeatures = true;

From 41ebb9d8e1cdfeb700901f2924552f44d26e1b1c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 24 Jun 2026 09:48:20 -0700
Subject: [PATCH 51/81] python3Packages.langgraph: disable test w/ a race
 condition on aarch64-Linux

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

diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index f9a107bb4a82..782291c075cd 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -138,11 +138,14 @@ buildPythonPackage (finalAttrs: {
     "tests/test_subgraph_persistence_async.py"
     "tests/test_time_travel.py"
     "tests/test_time_travel_async.py"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # Race condition
+    "tests/test_retry.py::test_error_handler_resumes_after_crash_multiple_nodes"
   ];
 
   # Since `langgraph` is the only unprefixed package, we have to use an explicit match
   passthru = {
-    # python updater script sets the wrong tag
     skipBulkUpdate = true;
     updateScript = nix-update-script {
       extraArgs = [

From 81f1595612eb8beeb813e770091985d26b633f89 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 24 Jun 2026 18:57:59 +0200
Subject: [PATCH 52/81] sd-switch: 0.6.3 -> 0.6.4

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

diff --git a/pkgs/by-name/sd/sd-switch/package.nix b/pkgs/by-name/sd/sd-switch/package.nix
index 488775b3ad23..4e571985f406 100644
--- a/pkgs/by-name/sd/sd-switch/package.nix
+++ b/pkgs/by-name/sd/sd-switch/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.6.3";
+  version = "0.6.4";
 in
 rustPlatform.buildRustPackage {
   pname = "sd-switch";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "~rycee";
     repo = "sd-switch";
     rev = version;
-    hash = "sha256-0cK5Gt/+M7IfPPthmx6Z11FymnsXagyT/PZtboQY72k=";
+    hash = "sha256-OtxoAo+S8iuVa2jhschSQCVQ51fy80zIlYAuZvPpbBw=";
   };
 
-  cargoHash = "sha256-ZIvq+SnnuXr8j6ae5WEf9aZZm20wB4HWQOmOrn08KIc=";
+  cargoHash = "sha256-SEh9Me4Bkxv4T6R31VEBtzutpbfR+PtQXH7PmOfWeuc=";
 
   passthru = {
     updateScript = nix-update-script { };

From 72177a1900f72c1c974ed669c5bb094b0e0c19bc Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Wed, 24 Jun 2026 19:16:07 +0200
Subject: [PATCH 53/81] ci/OWNERS: drop code ownership of various things

I'm not active anymore in:

- emscripten
- make-disk-image
- NGINX

Change-Id: Ibcc76bbd9504cea63bf4cda8c6395c3db74854c3
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 ci/OWNERS | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index cab7f55f947c..16743cfb2da0 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -82,10 +82,6 @@
 # Nixpkgs build-support
 /pkgs/build-support/writers @lassulus
 
-# Nixpkgs make-disk-image
-/doc/build-helpers/images/makediskimage.section.md  @raitobezarius
-/nixos/lib/make-disk-image.nix                 @raitobezarius
-
 # Nix, the package manager
 # @raitobezarius is not "code owner", but is listed here to be notified of changes
 # pertaining to the Nix package manager.
@@ -238,9 +234,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @Artturin @Ericson2314 @lo
 # C compilers
 /pkgs/development/compilers/gcc
 /pkgs/development/compilers/llvm @NixOS/llvm
-/pkgs/development/compilers/emscripten @raitobezarius
 /doc/toolchains/llvm.chapter.md @NixOS/llvm
-/doc/languages-frameworks/emscripten.section.md @raitobezarius
 
 # Audio
 /nixos/modules/services/audio/botamusique.nix @mweinelt
@@ -333,11 +327,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /nixos/tests/kea.nix @mweinelt
 /nixos/tests/knot.nix @mweinelt
 
-# Web servers
-/doc/packages/nginx.section.md @raitobezarius
-/pkgs/servers/http/nginx/ @raitobezarius
-/nixos/modules/services/web-servers/nginx/ @raitobezarius
-
 # D
 /pkgs/build-support/dlang @jtbx @TomaSajt
 

From 92a06e9bbaf8bfb8e2e3da9f3cbfa4c546dd1183 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Wed, 24 Jun 2026 14:09:52 -0400
Subject: [PATCH 54/81] ci/owners: add llakala as owner of key lib files

---
 ci/OWNERS | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index cab7f55f947c..6dce1f5843f9 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -25,27 +25,27 @@
 /shell.nix @infinisil @NixOS/Security
 
 # Libraries
-/lib                        @infinisil @hsjobeki
-/lib/generators.nix         @infinisil @hsjobeki
-/lib/cli.nix                @infinisil @hsjobeki
-/lib/debug.nix              @infinisil @hsjobeki
-/lib/asserts.nix            @infinisil @hsjobeki
-/lib/path/*                 @infinisil @hsjobeki
-/lib/fileset                @infinisil @hsjobeki
-/maintainers/github-teams.json @infinisil
-/maintainers/computed-team-list.nix @infinisil
+/lib                        @infinisil @hsjobeki @llakala
+/lib/generators.nix         @infinisil @hsjobeki @llakala
+/lib/cli.nix                @infinisil @hsjobeki @llakala
+/lib/debug.nix              @infinisil @hsjobeki @llakala
+/lib/asserts.nix            @infinisil @hsjobeki @llakala
+/lib/path/*                 @infinisil @hsjobeki @llakala
+/lib/fileset                @infinisil @hsjobeki @llakala
+/maintainers/github-teams.json @infinisil @llakala
+/maintainers/computed-team-list.nix @infinisil @llakala
 ## Standard environment–related libraries
-/lib/customisation.nix      @alyssais @NixOS/stdenv
-/lib/derivations.nix        @NixOS/stdenv
-/lib/fetchers.nix           @alyssais @NixOS/stdenv
-/lib/meta.nix               @alyssais @NixOS/stdenv
-/lib/meta-types.nix         @infinisil @adisbladis @NixOS/stdenv
-/lib/source-types.nix       @alyssais @NixOS/stdenv
-/lib/systems                @alyssais @NixOS/stdenv
+/lib/customisation.nix      @alyssais @NixOS/stdenv @llakala
+/lib/derivations.nix        @NixOS/stdenv @llakala
+/lib/fetchers.nix           @alyssais @NixOS/stdenv @llakala
+/lib/meta.nix               @alyssais @NixOS/stdenv @llakala
+/lib/meta-types.nix         @infinisil @adisbladis @NixOS/stdenv @llakala
+/lib/source-types.nix       @alyssais @NixOS/stdenv @llakala
+/lib/systems                @alyssais @NixOS/stdenv @llakala
 ## Libraries / Module system
-/lib/modules.nix            @infinisil @roberth @hsjobeki
-/lib/types.nix              @infinisil @roberth @hsjobeki
-/lib/options.nix            @infinisil @roberth @hsjobeki
+/lib/modules.nix            @infinisil @roberth @hsjobeki @llakala
+/lib/types.nix              @infinisil @roberth @hsjobeki @llakala
+/lib/options.nix            @infinisil @roberth @hsjobeki @llakala
 /lib/tests/modules.sh       @infinisil @roberth @hsjobeki
 /lib/tests/modules          @infinisil @roberth @hsjobeki
 
@@ -272,7 +272,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/applications/editors/jetbrains @leona-ya @theCapypara
 
 # Licenses
-/lib/licenses @alyssais @emilazy @jopejoe1
+/lib/licenses @alyssais @emilazy @jopejoe1 @llakala
 
 # Qt
 /pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000

From 03dfff6fc20940d24bb63f67f4136762a32fd7c0 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Wed, 24 Jun 2026 14:10:06 -0400
Subject: [PATCH 55/81] ci/owners: add llakala as owner of key stdenv files

---
 ci/OWNERS | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index 6dce1f5843f9..4302d8effc08 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -63,11 +63,11 @@
 /pkgs/top-level/packages-info.nix                @jopejoe1
 /pkgs/top-level/release-lib.nix                  @jopejoe1
 /pkgs/top-level/release.nix                      @jopejoe1
-/pkgs/stdenv                                     @philiptaron @NixOS/stdenv
-/pkgs/stdenv/generic                             @Ericson2314 @NixOS/stdenv
-/pkgs/stdenv/generic/problems.nix                @infinisil
+/pkgs/stdenv                                     @philiptaron @NixOS/stdenv @llakala
+/pkgs/stdenv/generic                             @Ericson2314 @NixOS/stdenv @llakala
+/pkgs/stdenv/generic/problems.nix                @infinisil @llakala
 /pkgs/test/problems                              @infinisil
-/pkgs/stdenv/generic/check-meta.nix              @infinisil @Ericson2314 @adisbladis @NixOS/stdenv
+/pkgs/stdenv/generic/check-meta.nix              @infinisil @Ericson2314 @adisbladis @NixOS/stdenv @llakala
 /pkgs/stdenv/cross                               @Ericson2314 @NixOS/stdenv
 /pkgs/build-support                              @philiptaron
 /pkgs/build-support/cc-wrapper                   @Ericson2314

From 6a63a4ad8b9013d60097680e545b14e60d11eb23 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Wed, 24 Jun 2026 19:17:49 +0200
Subject: [PATCH 56/81] pkgs/*: drop maintenanceship of various packages

I have effectively renounced on maintaining all these packages and I do
not plan to return them except if I'm forced to.

I am also fine with most of these packages being dropped for next
releases if no maintainer shows up.

Change-Id: I8d167c8029b6991181bd7a094af21c3313af2b51
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 nixos/modules/services/matrix/hebbot.nix                        | 2 +-
 nixos/modules/system/boot/systemd/journald-gateway.nix          | 2 +-
 nixos/modules/system/boot/systemd/journald-remote.nix           | 2 +-
 nixos/modules/system/boot/systemd/journald-upload.nix           | 2 +-
 nixos/tests/listmonk.nix                                        | 2 +-
 nixos/tests/netdata.nix                                         | 1 -
 nixos/tests/systemd-journal-gateway.nix                         | 1 -
 nixos/tests/systemd-journal-upload.nix                          | 1 -
 nixos/tests/web-apps/netbox-upgrade.nix                         | 1 -
 pkgs/applications/virtualization/OVMF/default.nix               | 1 -
 pkgs/by-name/ca/cairo-lang/package.nix                          | 2 +-
 pkgs/by-name/ci/circom/package.nix                              | 2 +-
 pkgs/by-name/cp/cppcodec/package.nix                            | 1 -
 pkgs/by-name/cr/cryptsetup/package.nix                          | 1 -
 pkgs/by-name/di/diffoscope/package.nix                          | 1 -
 pkgs/by-name/gi/git-pw/package.nix                              | 2 +-
 pkgs/by-name/li/libnitrokey/package.nix                         | 1 -
 pkgs/by-name/li/listmonk/package.nix                            | 1 -
 pkgs/by-name/ne/netbox_4_4/package.nix                          | 1 -
 pkgs/by-name/ne/netbox_4_5/package.nix                          | 1 -
 pkgs/by-name/pe/pesign/package.nix                              | 2 +-
 pkgs/by-name/ri/ripe-atlas-tools/package.nix                    | 2 +-
 pkgs/by-name/sb/sbctl/package.nix                               | 1 -
 pkgs/by-name/sh/shim-unsigned/package.nix                       | 1 -
 pkgs/by-name/sq/sq/package.nix                                  | 2 +-
 pkgs/by-name/st/stuffbin/package.nix                            | 2 +-
 pkgs/by-name/th/thelounge/package.nix                           | 1 -
 pkgs/development/compilers/emscripten/default.nix               | 1 -
 pkgs/development/python-modules/amarna/default.nix              | 2 +-
 pkgs/development/python-modules/bubop/default.nix               | 2 +-
 pkgs/development/python-modules/changefinder/default.nix        | 2 +-
 pkgs/development/python-modules/django-pgpubsub/default.nix     | 2 +-
 pkgs/development/python-modules/django-pgtrigger/default.nix    | 1 -
 pkgs/development/python-modules/item-synchronizer/default.nix   | 2 +-
 pkgs/development/python-modules/netdata-pandas/default.nix      | 2 +-
 pkgs/development/python-modules/recordlinkage/default.nix       | 2 +-
 pkgs/development/python-modules/ripe-atlas-cousteau/default.nix | 2 +-
 pkgs/development/python-modules/ripe-atlas-sagan/default.nix    | 2 +-
 pkgs/development/python-modules/rustworkx/default.nix           | 2 +-
 pkgs/development/python-modules/socketio-client/default.nix     | 2 +-
 pkgs/development/python-modules/taskw-ng/default.nix            | 2 +-
 pkgs/servers/http/nginx/generic.nix                             | 1 -
 42 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/nixos/modules/services/matrix/hebbot.nix b/nixos/modules/services/matrix/hebbot.nix
index efd22c906acc..d4c2daf47ab4 100644
--- a/nixos/modules/services/matrix/hebbot.nix
+++ b/nixos/modules/services/matrix/hebbot.nix
@@ -25,7 +25,7 @@ let
     };
 in
 {
-  meta.maintainers = [ lib.maintainers.raitobezarius ];
+  meta.maintainers = [ ];
   options.services.hebbot = {
     enable = mkEnableOption "hebbot";
     package = lib.mkPackageOption pkgs "hebbot" { };
diff --git a/nixos/modules/system/boot/systemd/journald-gateway.nix b/nixos/modules/system/boot/systemd/journald-gateway.nix
index cede0a65f510..28c29df71c41 100644
--- a/nixos/modules/system/boot/systemd/journald-gateway.nix
+++ b/nixos/modules/system/boot/systemd/journald-gateway.nix
@@ -28,7 +28,7 @@ in
     )
   ];
 
-  meta.maintainers = [ lib.maintainers.raitobezarius ];
+  meta.maintainers = [ ];
   options.services.journald.gateway = {
     enable = lib.mkEnableOption "the HTTP gateway to the journal";
 
diff --git a/nixos/modules/system/boot/systemd/journald-remote.nix b/nixos/modules/system/boot/systemd/journald-remote.nix
index 7216c179b3a0..d08c83d303ba 100644
--- a/nixos/modules/system/boot/systemd/journald-remote.nix
+++ b/nixos/modules/system/boot/systemd/journald-remote.nix
@@ -16,7 +16,7 @@ let
   };
 in
 {
-  meta.maintainers = [ lib.maintainers.raitobezarius ];
+  meta.maintainers = [ ];
   options.services.journald.remote = {
     enable = lib.mkEnableOption "receiving systemd journals from the network";
 
diff --git a/nixos/modules/system/boot/systemd/journald-upload.nix b/nixos/modules/system/boot/systemd/journald-upload.nix
index 8cd67918f4f0..b18bfd1c141d 100644
--- a/nixos/modules/system/boot/systemd/journald-upload.nix
+++ b/nixos/modules/system/boot/systemd/journald-upload.nix
@@ -10,7 +10,7 @@ let
   format = pkgs.formats.systemd { };
 in
 {
-  meta.maintainers = [ lib.maintainers.raitobezarius ];
+  meta.maintainers = [ ];
   options.services.journald.upload = {
     enable = lib.mkEnableOption "uploading the systemd journal to a remote server";
 
diff --git a/nixos/tests/listmonk.nix b/nixos/tests/listmonk.nix
index 7d4af8dce31b..7a43d09b7c22 100644
--- a/nixos/tests/listmonk.nix
+++ b/nixos/tests/listmonk.nix
@@ -2,7 +2,7 @@ import ./make-test-python.nix (
   { lib, ... }:
   {
     name = "listmonk";
-    meta.maintainers = with lib.maintainers; [ raitobezarius ];
+    meta.maintainers = [ ];
 
     nodes.machine =
       { pkgs, ... }:
diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix
index 2a85c11f0542..f03894671709 100644
--- a/nixos/tests/netdata.nix
+++ b/nixos/tests/netdata.nix
@@ -6,7 +6,6 @@
   meta = with pkgs.lib.maintainers; {
     maintainers = [
       cransom
-      raitobezarius
     ];
   };
 
diff --git a/nixos/tests/systemd-journal-gateway.nix b/nixos/tests/systemd-journal-gateway.nix
index 52c45033113c..85f007d7a94d 100644
--- a/nixos/tests/systemd-journal-gateway.nix
+++ b/nixos/tests/systemd-journal-gateway.nix
@@ -4,7 +4,6 @@
   meta = with pkgs.lib.maintainers; {
     maintainers = [
       minijackson
-      raitobezarius
     ];
   };
 
diff --git a/nixos/tests/systemd-journal-upload.nix b/nixos/tests/systemd-journal-upload.nix
index af7817bd97d8..747e8c4ffe31 100644
--- a/nixos/tests/systemd-journal-upload.nix
+++ b/nixos/tests/systemd-journal-upload.nix
@@ -4,7 +4,6 @@
   meta = with pkgs.lib.maintainers; {
     maintainers = [
       minijackson
-      raitobezarius
     ];
   };
 
diff --git a/nixos/tests/web-apps/netbox-upgrade.nix b/nixos/tests/web-apps/netbox-upgrade.nix
index ee84a6b34fd8..c965e0c9b0f3 100644
--- a/nixos/tests/web-apps/netbox-upgrade.nix
+++ b/nixos/tests/web-apps/netbox-upgrade.nix
@@ -18,7 +18,6 @@ in
 
   meta.maintainers = with lib.maintainers; [
     minijackson
-    raitobezarius
   ];
 
   node.pkgsReadOnly = false;
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 8435e824b843..42c78bea88a2 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -270,7 +270,6 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
     platforms = metaPlatforms;
     maintainers = with lib.maintainers; [
       adamcstephens
-      raitobezarius
       mjoerg
       sigmasquadron
     ];
diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix
index ff4acf1e2755..1176e47956e4 100644
--- a/pkgs/by-name/ca/cairo-lang/package.nix
+++ b/pkgs/by-name/ca/cairo-lang/package.nix
@@ -45,6 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Turing-complete language for creating provable programs for general computation";
     homepage = "https://github.com/starkware-libs/cairo";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ci/circom/package.nix b/pkgs/by-name/ci/circom/package.nix
index 80b4804393f3..f0614c81400e 100644
--- a/pkgs/by-name/ci/circom/package.nix
+++ b/pkgs/by-name/ci/circom/package.nix
@@ -24,6 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/iden3/circom";
     changelog = "https://github.com/iden3/circom/blob/${finalAttrs.src.rev}/RELEASES.md";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/cp/cppcodec/package.nix b/pkgs/by-name/cp/cppcodec/package.nix
index 5dba1db7c538..494537a4abd7 100644
--- a/pkgs/by-name/cp/cppcodec/package.nix
+++ b/pkgs/by-name/cp/cppcodec/package.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       panicgh
-      raitobezarius
     ];
   };
 })
diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix
index 241d62fd7e9d..21ae5fc76b40 100644
--- a/pkgs/by-name/cr/cryptsetup/package.nix
+++ b/pkgs/by-name/cr/cryptsetup/package.nix
@@ -115,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "cryptsetup";
     maintainers = with lib.maintainers; [
       numinit
-      raitobezarius
     ];
     platforms = with lib.platforms; linux;
     identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "cryptsetup_project" finalAttrs.version;
diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index 63c84ac53015..d44773153194 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -359,7 +359,6 @@ python.pkgs.buildPythonApplication rec {
     maintainers = with lib.maintainers; [
       danielfullmer
       mdaniels5757
-      raitobezarius
     ];
     platforms = lib.platforms.unix;
     mainProgram = "diffoscope";
diff --git a/pkgs/by-name/gi/git-pw/package.nix b/pkgs/by-name/gi/git-pw/package.nix
index ee710113a09d..c39da003e5b8 100644
--- a/pkgs/by-name/gi/git-pw/package.nix
+++ b/pkgs/by-name/gi/git-pw/package.nix
@@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     description = "Tool for integrating Git with Patchwork, the web-based patch tracking system";
     homepage = "https://github.com/getpatchwork/git-pw";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/li/libnitrokey/package.nix b/pkgs/by-name/li/libnitrokey/package.nix
index 4af4e213392e..763806ab3e33 100644
--- a/pkgs/by-name/li/libnitrokey/package.nix
+++ b/pkgs/by-name/li/libnitrokey/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl3;
     maintainers = with lib.maintainers; [
       panicgh
-      raitobezarius
     ];
   };
 })
diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix
index 27da85d559f3..7fc3c88b6425 100644
--- a/pkgs/by-name/li/listmonk/package.nix
+++ b/pkgs/by-name/li/listmonk/package.nix
@@ -78,7 +78,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/knadh/listmonk";
     changelog = "https://github.com/knadh/listmonk/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [
-      raitobezarius
       hougo
     ];
     license = lib.licenses.agpl3Only;
diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix
index 66301f779d14..d96ed7cb01d3 100644
--- a/pkgs/by-name/ne/netbox_4_4/package.nix
+++ b/pkgs/by-name/ne/netbox_4_4/package.nix
@@ -128,7 +128,6 @@ py.pkgs.buildPythonApplication rec {
     ];
     maintainers = with lib.maintainers; [
       minijackson
-      raitobezarius
       transcaffeine
     ];
   };
diff --git a/pkgs/by-name/ne/netbox_4_5/package.nix b/pkgs/by-name/ne/netbox_4_5/package.nix
index 4f8ffa396e77..879603c19e6a 100644
--- a/pkgs/by-name/ne/netbox_4_5/package.nix
+++ b/pkgs/by-name/ne/netbox_4_5/package.nix
@@ -141,7 +141,6 @@ py.pkgs.buildPythonApplication rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       minijackson
-      raitobezarius
       transcaffeine
     ];
   };
diff --git a/pkgs/by-name/pe/pesign/package.nix b/pkgs/by-name/pe/pesign/package.nix
index 5c25ee80dca8..7fd597e164a8 100644
--- a/pkgs/by-name/pe/pesign/package.nix
+++ b/pkgs/by-name/pe/pesign/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Signing tools for PE-COFF binaries. Compliant with the PE and Authenticode specifications";
     homepage = "https://github.com/rhboot/pesign";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
     # efivar is currently Linux-only.
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ri/ripe-atlas-tools/package.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix
index c4757dabb660..9ccb01172af1 100644
--- a/pkgs/by-name/ri/ripe-atlas-tools/package.nix
+++ b/pkgs/by-name/ri/ripe-atlas-tools/package.nix
@@ -100,6 +100,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/RIPE-NCC/ripe-atlas-tools";
     changelog = "https://github.com/RIPE-NCC/ripe-atlas-tools/blob/v${finalAttrs.version}/CHANGES.rst";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix
index 76d79555083d..89a5ffaadfe0 100644
--- a/pkgs/by-name/sb/sbctl/package.nix
+++ b/pkgs/by-name/sb/sbctl/package.nix
@@ -68,7 +68,6 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       Pokeylooted
-      raitobezarius
       Scrumplex
     ];
     # go-uefi does not support darwin at the moment:
diff --git a/pkgs/by-name/sh/shim-unsigned/package.nix b/pkgs/by-name/sh/shim-unsigned/package.nix
index 62f0ce0e4124..1aab9235ab1f 100644
--- a/pkgs/by-name/sh/shim-unsigned/package.nix
+++ b/pkgs/by-name/sh/shim-unsigned/package.nix
@@ -73,7 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [
       baloo
-      raitobezarius
     ];
   };
 })
diff --git a/pkgs/by-name/sq/sq/package.nix b/pkgs/by-name/sq/sq/package.nix
index fd94b6d559bf..adfd7e3b0f90 100644
--- a/pkgs/by-name/sq/sq/package.nix
+++ b/pkgs/by-name/sq/sq/package.nix
@@ -54,6 +54,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://sq.io/";
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/st/stuffbin/package.nix b/pkgs/by-name/st/stuffbin/package.nix
index 9deb17052332..b01d729ec7d4 100644
--- a/pkgs/by-name/st/stuffbin/package.nix
+++ b/pkgs/by-name/st/stuffbin/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     description = "Compress and embed static files and assets into Go binaries and access them with a virtual file system in production";
     homepage = "https://github.com/knadh/stuffbin";
     changelog = "https://github.com/knadh/stuffbin/releases/tag/v${finalAttrs.version}";
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
     license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/by-name/th/thelounge/package.nix b/pkgs/by-name/th/thelounge/package.nix
index c1e2250b1213..54bc2229559d 100644
--- a/pkgs/by-name/th/thelounge/package.nix
+++ b/pkgs/by-name/th/thelounge/package.nix
@@ -88,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/thelounge/thelounge/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [
       winter
-      raitobezarius
     ];
     license = lib.licenses.mit;
     inherit (nodejs-slim.meta) platforms;
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 31c2452b5378..30fc3d274749 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -209,7 +209,6 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
       qknight
-      raitobezarius
       willcohen
     ];
     license = lib.licenses.ncsa;
diff --git a/pkgs/development/python-modules/amarna/default.nix b/pkgs/development/python-modules/amarna/default.nix
index 80aea4deabdc..7bf45d4767b7 100644
--- a/pkgs/development/python-modules/amarna/default.nix
+++ b/pkgs/development/python-modules/amarna/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     mainProgram = "amarna";
     homepage = "https://github.com/crytic/amarna";
     license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bubop/default.nix b/pkgs/development/python-modules/bubop/default.nix
index 9681842fb28a..6bd05f10c73b 100644
--- a/pkgs/development/python-modules/bubop/default.nix
+++ b/pkgs/development/python-modules/bubop/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bergercookie/bubop";
     changelog = "https://github.com/bergercookie/bubop/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/changefinder/default.nix b/pkgs/development/python-modules/changefinder/default.nix
index 4ba0b588350e..c9227d61f38e 100644
--- a/pkgs/development/python-modules/changefinder/default.nix
+++ b/pkgs/development/python-modules/changefinder/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage {
     description = "Online Change-Point Detection library based on ChangeFinder algorithm";
     homepage = "https://github.com/shunsukeaihara/changefinder";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-pgpubsub/default.nix b/pkgs/development/python-modules/django-pgpubsub/default.nix
index e37d3bea14b0..b97794eabe72 100644
--- a/pkgs/development/python-modules/django-pgpubsub/default.nix
+++ b/pkgs/development/python-modules/django-pgpubsub/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/PaulGilmartin/django-pgpubsub";
     changelog = "https://github.com/PaulGilmartin/django-pgpubsub/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-pgtrigger/default.nix b/pkgs/development/python-modules/django-pgtrigger/default.nix
index 09fd92e36f6b..c811e0a7227d 100644
--- a/pkgs/development/python-modules/django-pgtrigger/default.nix
+++ b/pkgs/development/python-modules/django-pgtrigger/default.nix
@@ -34,7 +34,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/Opus10/django-pgtrigger/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
-      raitobezarius
       pyrox0
     ];
   };
diff --git a/pkgs/development/python-modules/item-synchronizer/default.nix b/pkgs/development/python-modules/item-synchronizer/default.nix
index 85f0332c71da..d32fcf634817 100644
--- a/pkgs/development/python-modules/item-synchronizer/default.nix
+++ b/pkgs/development/python-modules/item-synchronizer/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bergercookie/item_synchronizer";
     changelog = "https://github.com/bergercookie/item_synchronizer/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/netdata-pandas/default.nix b/pkgs/development/python-modules/netdata-pandas/default.nix
index cbf8838ef090..3c44e4e3693d 100644
--- a/pkgs/development/python-modules/netdata-pandas/default.nix
+++ b/pkgs/development/python-modules/netdata-pandas/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Library to pull data from the netdata REST API into a pandas dataframe";
     homepage = "https://github.com/netdata/netdata-pandas";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/recordlinkage/default.nix b/pkgs/development/python-modules/recordlinkage/default.nix
index f07d5b3999d1..2264fcec82f3 100644
--- a/pkgs/development/python-modules/recordlinkage/default.nix
+++ b/pkgs/development/python-modules/recordlinkage/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     homepage = "https://recordlinkage.readthedocs.io/";
     changelog = "https://github.com/J535D165/recordlinkage/releases/tag/v${version}";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix
index 25fccc670cb6..9b3b3a068b62 100644
--- a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix
+++ b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/RIPE-NCC/ripe-atlas-cousteau";
     changelog = "https://github.com/RIPE-NCC/ripe-atlas-cousteau/blob/v${version}/CHANGES.rst";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
index 55d3e6f91def..23730a041a47 100644
--- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
+++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Parsing library for RIPE Atlas measurements results";
     homepage = "https://github.com/RIPE-NCC/ripe-atlas-sagan";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix
index a1b11b42e01a..5b34b5b4ce7a 100644
--- a/pkgs/development/python-modules/rustworkx/default.nix
+++ b/pkgs/development/python-modules/rustworkx/default.nix
@@ -85,6 +85,6 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/Qiskit/rustworkx";
     changelog = "https://github.com/Qiskit/rustworkx/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/socketio-client/default.nix b/pkgs/development/python-modules/socketio-client/default.nix
index e6c06494f693..60fa89369eef 100644
--- a/pkgs/development/python-modules/socketio-client/default.nix
+++ b/pkgs/development/python-modules/socketio-client/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Socket.io client library for protocol 1.x";
     homepage = "https://github.com/invisibleroads/socketIO-client";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/taskw-ng/default.nix b/pkgs/development/python-modules/taskw-ng/default.nix
index 5174da5d5039..2ea1554cfc83 100644
--- a/pkgs/development/python-modules/taskw-ng/default.nix
+++ b/pkgs/development/python-modules/taskw-ng/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bergercookie/taskw-ng";
     changelog = "https://github.com/bergercookie/taskw-ng/blob/${src.tag}/CHANGELOG.rst";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ raitobezarius ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 983b003d2748..f65cd0044fbb 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -317,7 +317,6 @@ stdenv.mkDerivation {
           das_j
           fpletz
           helsinki-Jo
-          raitobezarius
         ];
       };
 }

From 7b505ffd34a87026dafff2e5cb4b4adedf42db69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 19:00:49 +0000
Subject: [PATCH 57/81] terraform: 1.15.6 -> 1.15.7

---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 102e4d3a5a39..18d02f13967e 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -200,8 +200,8 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.15.6";
-    hash = "sha256-FH5s0uyRESytv/1xloU3HXuH2ApjBC3FfEqFqIgBgFs=";
+    version = "1.15.7";
+    hash = "sha256-FF3LEovWjEDrKp6e6opRfCt8c4wghva3mjN97vCxq3E=";
     vendorHash = "sha256-3y9+KCmvskJ24X4F6gSLglmsl4hUlvzBb/ep4kcbS8A=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {

From 02b60636282ec042ec78880ed1ef492dd471c40e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 19:10:28 +0000
Subject: [PATCH 58/81] stellarsolver: 2.7 -> 2.8

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

diff --git a/pkgs/by-name/st/stellarsolver/package.nix b/pkgs/by-name/st/stellarsolver/package.nix
index 8122a1908393..79f447a39489 100644
--- a/pkgs/by-name/st/stellarsolver/package.nix
+++ b/pkgs/by-name/st/stellarsolver/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "stellarsolver";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchFromGitHub {
     owner = "rlancaste";
     repo = "stellarsolver";
     rev = finalAttrs.version;
-    sha256 = "sha256-tASjV5MZ1ClumZqu/R61b6XE9CGTuVFfpxyC89fwN9o=";
+    sha256 = "sha256-bc/IkPg5IhkZ0Y5fOlyDi/m+ibHciaaaeC8KWrhkdi0=";
   };
 
   nativeBuildInputs = [ cmake ];

From 9d6d84196363eed9312ce265b6c3b79c5cca72f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 19:41:13 +0000
Subject: [PATCH 59/81] stalwart-cli: 1.0.8 -> 1.0.9

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

diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix
index 296f0e45d95e..3194aa7cce69 100644
--- a/pkgs/by-name/st/stalwart-cli/package.nix
+++ b/pkgs/by-name/st/stalwart-cli/package.nix
@@ -7,14 +7,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stalwart-cli";
-  version = "1.0.8";
+  version = "1.0.9";
   src = fetchFromGitHub {
     owner = "stalwartlabs";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-teQB+6ZPEH3RXxG8WX4L67ckLCTYfMF4xaiz3S074b0=";
+    hash = "sha256-SZefTApX3FT6M7Zr3CAIfZfgkECJb54xTGdoPPII8Q4=";
   };
-  cargoHash = "sha256-yMfWFTXV1gXPqo2OOAN/Fkym9UiHjXDX0tAJOCF2p4U=";
+  cargoHash = "sha256-D6TN5IIlX9PL2+qP0e8QBoalgfgN+xT2poD7wMh5TB8=";
   __structuredAttrs = true;
   # `Result::unwrap()` on an `Err` value: Network(reqwest::Error { kind: Builder, source: General("No CA certificates were loaded from the system") })
   nativeCheckInputs = [ cacert ];

From 5062b8f0a05a0beb5ad75f97b4633d1f791fbe76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 20:34:31 +0000
Subject: [PATCH 60/81] kodiPackages.youtube: 7.4.3 -> 7.4.4

---
 pkgs/applications/video/kodi/addons/youtube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix
index 83075ef1b028..72aecc71388c 100644
--- a/pkgs/applications/video/kodi/addons/youtube/default.nix
+++ b/pkgs/applications/video/kodi/addons/youtube/default.nix
@@ -10,13 +10,13 @@
 buildKodiAddon rec {
   pname = "youtube";
   namespace = "plugin.video.youtube";
-  version = "7.4.3";
+  version = "7.4.4";
 
   src = fetchFromGitHub {
     owner = "anxdpanic";
     repo = "plugin.video.youtube";
     rev = "v${version}";
-    hash = "sha256-FUfDUyaYHIeu9thCx19huLFnDO7Yl3RKIbfUH2I+SQI=";
+    hash = "sha256-epDKZhITQAv3bpS7CGN2Rj35/AamyZo5yzhkfu72ipw=";
   };
 
   propagatedBuildInputs = [

From d42a3b444542201851dceda45de4243a510bf0f1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 24 Jun 2026 20:42:34 +0000
Subject: [PATCH 61/81] python3Packages.flash-attn-4: 4.0.0.beta18 ->
 4.0.0.beta19

Changelog: https://github.com/Dao-AILab/flash-attention/releases/tag/fa4-v4.0.0.beta19
---
 pkgs/development/python-modules/flash-attn-4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flash-attn-4/default.nix b/pkgs/development/python-modules/flash-attn-4/default.nix
index c0735d945196..d17f7bd27c80 100644
--- a/pkgs/development/python-modules/flash-attn-4/default.nix
+++ b/pkgs/development/python-modules/flash-attn-4/default.nix
@@ -21,7 +21,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "flash-attn-4";
-  version = "4.0.0.beta18";
+  version = "4.0.0.beta19";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
     owner = "Dao-AILab";
     repo = "flash-attention";
     tag = "fa4-v${finalAttrs.version}";
-    hash = "sha256-DnlFOdAlge/FAbLI2KH+76hJkgqcHuVEorJ1A4hlpr0=";
+    hash = "sha256-a+VRq4LrD0NJmZCBcQzVdaGACxGxjquLNEIzutrs93M=";
   };
 
   # FA4 is a separate distribution shipped under flash_attn/cute/ with its own pyproject.toml.

From 31bbdb868cfe400183bded6c925b023d9fafcec1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 24 Jun 2026 20:44:20 +0000
Subject: [PATCH 62/81] air-formatter: fix build

---
 pkgs/by-name/ai/air-formatter/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix
index 5e8da6faed95..383a59b4a058 100644
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
   doInstallCheck = true;
 
-  cargoBuildFlags = [ "-p air" ];
+  cargoBuildFlags = [ "--package=air" ];
 
   passthru = {
     updateScript = nix-update-script { };

From a709ca8240d4ecd960f282bd3b64ab6256684f41 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sat, 16 May 2026 00:29:39 -0400
Subject: [PATCH 63/81] lib.strings.splitString: compute escaped separator
 early

Thanks to moving the existing let variable out, this should have
identical performance for non-memoised calls, and improved performance
when caching the separator.
---
 lib/strings.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 53dc515ac3f8..5425a4a66590 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1740,11 +1740,11 @@ rec {
     :::
   */
   splitString =
-    sep: s:
+    sep:
     let
-      splits = filter isString (split (escapeRegex (toString sep)) (toString s));
+      escapedSep = escapeRegex (toString sep);
     in
-    map (addContextFrom s) splits;
+    s: map (addContextFrom s) (filter isString (split escapedSep (toString s)));
 
   /**
     Splits a string into substrings based on a predicate that examines adjacent characters.

From 184d899ccf450c6584b23ca700a195874c9f53df Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sat, 16 May 2026 00:38:18 -0400
Subject: [PATCH 64/81] lib.strings: remove duplicate cmake and meson
 assertions

These are already performed by cmakeOptionType and mesonOption - doing
them twice isn't necessary.
---
 lib/strings.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 5425a4a66590..ca232cc655b8 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -2199,7 +2199,6 @@ rec {
   */
   cmakeBool =
     condition: flag:
-    assert (lib.isString condition);
     assert (lib.isBool flag);
     cmakeOptionType "bool" condition (lib.toUpper (lib.boolToString flag));
 
@@ -2233,11 +2232,7 @@ rec {
 
     :::
   */
-  cmakeFeature =
-    feature: value:
-    assert (lib.isString feature);
-    assert (lib.isString value);
-    cmakeOptionType "string" feature value;
+  cmakeFeature = feature: value: cmakeOptionType "string" feature value;
 
   /**
     Create a `"-D<feature>=<value>"` string that can be passed to typical Meson
@@ -2307,7 +2302,6 @@ rec {
   */
   mesonBool =
     condition: flag:
-    assert (lib.isString condition);
     assert (lib.isBool flag);
     mesonOption condition (lib.boolToString flag);
 
@@ -2344,7 +2338,6 @@ rec {
   */
   mesonEnable =
     feature: flag:
-    assert (lib.isString feature);
     assert (lib.isBool flag);
     mesonOption feature (if flag then "enabled" else "disabled");
 

From f9c9f70a40a99eccafcf2f5fb408bd2958befa6c Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sat, 16 May 2026 00:43:10 -0400
Subject: [PATCH 65/81] lib.strings.cmakeBool: inline two function calls

I can live with a function like boolToString being used, but if we're
immediately modifying its output, we should homeroll it.
---
 lib/strings.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index ca232cc655b8..0bb8e80799f8 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -2200,7 +2200,7 @@ rec {
   cmakeBool =
     condition: flag:
     assert (lib.isBool flag);
-    cmakeOptionType "bool" condition (lib.toUpper (lib.boolToString flag));
+    cmakeOptionType "bool" condition (if flag then "TRUE" else "FALSE");
 
   /**
     Create a `"-D<feature>:STRING=<value>"` string that can be passed to typical

From 4755ddd1262901bc7091595b00bc011a58a3112d Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sat, 16 May 2026 00:58:33 -0400
Subject: [PATCH 66/81] lib.strings.{toSentenceCase,toCamelCase}: don't add
 context unnecessarily

builtins.substring doesn't destroy context - it's not necessary to add
it back.
---
 lib/strings.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 0bb8e80799f8..f57df9d24380 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1596,7 +1596,7 @@ rec {
           firstChar = substring 0 1 str;
           rest = substring 1 (-1) str; # -1 takes till the end of the string
         in
-        addContextFrom str (toUpper firstChar + toLower rest)
+        toUpper firstChar + toLower rest
       );
 
   /**
@@ -1653,7 +1653,7 @@ rec {
         first = if length parts > 0 then toLower (head parts) else "";
         rest = if length parts > 1 then map toSentenceCase (tail parts) else [ ];
       in
-      concatStrings (map (addContextFrom str) ([ first ] ++ rest))
+      concatStrings ([ first ] ++ rest)
     );
 
   /**

From ff92c9d15a51dfe2f01341290b79a22090809dd0 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Wed, 24 Jun 2026 16:53:31 -0400
Subject: [PATCH 67/81] lib.strings.cmakeFeature: beta reduce

---
 lib/strings.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index f57df9d24380..b81a04a6666b 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -2162,8 +2162,9 @@ rec {
         "LIST"
       ];
     in
-    type: feature: value:
+    type:
     assert (elem (toUpper type) types);
+    feature: value:
     assert (isString feature);
     assert (isString value);
     "-D${feature}:${toUpper type}=${value}";
@@ -2232,7 +2233,7 @@ rec {
 
     :::
   */
-  cmakeFeature = feature: value: cmakeOptionType "string" feature value;
+  cmakeFeature = cmakeOptionType "string";
 
   /**
     Create a `"-D<feature>=<value>"` string that can be passed to typical Meson

From acc1ff0d3fdcf3172ae6fef8bd8cacbe45b272b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 21:22:05 +0000
Subject: [PATCH 68/81] terraform-providers.sacloud_sakuracloud: 2.35.1 ->
 2.36.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 5d1d7d0aff23..fa41079e816f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1157,13 +1157,13 @@
     "vendorHash": null
   },
   "sacloud_sakuracloud": {
-    "hash": "sha256-qeFN+JMs/TLV/oPFjMjpUmqv6fTiY+qREXQNYHMk8vY=",
+    "hash": "sha256-mk5tmlx8UZXedRbSKmSg9YqX9MJFWsSrMea1dirL+HI=",
     "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud",
     "owner": "sacloud",
     "repo": "terraform-provider-sakuracloud",
-    "rev": "v2.35.1",
+    "rev": "v2.36.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-w2NSJv6BY7S5KHeBttxqY2cMR+yPvr2IsC5X4aJAo3A="
+    "vendorHash": "sha256-vBcPWjugjqyuUdvxNQN1oC8V5D2SeW2WR0/c6OlgaXU="
   },
   "sap-cloud-infrastructure_sci": {
     "hash": "sha256-eQA4mY+Rx5PLbTgGqfefYFc5gZKIvt1w2eag8ipE0PI=",

From 94065373e762f21ccf77bc24603ce648684ede6b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 25 Jun 2026 00:00:59 +0200
Subject: [PATCH 69/81] nerva: 1.26.0 -> 1.29.0

Diff: https://github.com/praetorian-inc/nerva/compare/v1.26.0...v1.29.0

Changelog: https://github.com/praetorian-inc/nerva/blob/v1.29.0/CHANGELOG.md
---
 pkgs/by-name/ne/nerva/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix
index df78aa467715..7158a56e9fb9 100644
--- a/pkgs/by-name/ne/nerva/package.nix
+++ b/pkgs/by-name/ne/nerva/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "nerva";
-  version = "1.26.0";
+  version = "1.29.0";
 
   src = fetchFromGitHub {
     owner = "praetorian-inc";
     repo = "nerva";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tVm8HX5hAIIB9E813pl2rJiYoixlF2laeaulkBkPpUk=";
+    hash = "sha256-CnxSimoBuUFyzq1qh08wG9Tx3JqClS3ujtgJAVuWprE=";
   };
 
   vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8=";

From 261b8489a08855971e056b3a220db7d8e4cf6883 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 16:40:17 -0400
Subject: [PATCH 70/81] lib.lists.foldl': avoid builtins lookups

---
 lib/lists.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index abd9aceed0e3..7fb9d21a1f2e 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -6,8 +6,9 @@ let
   inherit (lib.strings) toInt;
   inherit (lib.trivial)
     compare
-    min
     id
+    min
+    seq
     warn
     ;
   inherit (lib.attrsets) mapAttrs attrNames attrValues;
@@ -276,11 +277,14 @@ rec {
     :::
   */
   foldl' =
+    let
+      inherit (builtins) foldl';
+    in
     op: acc:
     # The builtin `foldl'` is a bit lazier than one might expect.
     # See https://github.com/NixOS/nix/pull/7158.
     # In particular, the initial accumulator value is not forced before the first iteration starts.
-    builtins.seq acc (builtins.foldl' op acc);
+    seq acc (foldl' op acc);
 
   /**
     Map with index starting from 0

From 097288cc6f01f55e3bedd7c67fde5f633e21b11a Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 16:41:29 -0400
Subject: [PATCH 71/81] lib.lists.take: rewrite to not call `sublist`

---
 lib/lists.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 7fb9d21a1f2e..fc26a68af50b 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1508,7 +1508,12 @@ rec {
 
     :::
   */
-  take = count: sublist 0 count;
+  take =
+    count: list:
+    let
+      len = length list;
+    in
+    genList (elemAt list) (if count > len then len else count);
 
   /**
     Returns the last (at most) N elements of a list.

From 3621649b191156d757a3a0ec858248dfe926e7cb Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 16:42:12 -0400
Subject: [PATCH 72/81] lib.lists.drop: rewrite to not call `sublist`

---
 lib/lists.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index fc26a68af50b..f48cf19ea3f2 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1581,7 +1581,12 @@ rec {
 
     :::
   */
-  drop = count: list: sublist count (length list) list;
+  drop =
+    count: list:
+    let
+      len = length list;
+    in
+    genList (n: elemAt list (n + count)) (if count > len then 0 else len - count);
 
   /**
     Remove the last (at most) N elements of a list.

From bb3308e01eb581dac83f0370c4a0e5ab564799e2 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 16:53:18 -0400
Subject: [PATCH 73/81] lib.lists.takeEnd: rewrite to not call `sublist`

---
 lib/lists.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index f48cf19ea3f2..0892406f6815 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1547,7 +1547,13 @@ rec {
 
     :::
   */
-  takeEnd = n: xs: drop (max 0 (length xs - n)) xs;
+  takeEnd =
+    count: list:
+    let
+      len = length list;
+      start = if count > len then 0 else len - count;
+    in
+    genList (i: elemAt list (start + i)) (if start > len then 0 else len - start);
 
   /**
     Remove the first (at most) N elements of a list.

From 09b8cbd5d969132436b9e7f19f3e0378f0b0d2b1 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 16:57:27 -0400
Subject: [PATCH 74/81] lib.lists.dropEnd: rewrite to not use `sublist`

---
 lib/lists.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 0892406f6815..68f3ccb74613 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -12,7 +12,6 @@ let
     warn
     ;
   inherit (lib.attrsets) mapAttrs attrNames attrValues;
-  inherit (lib) max;
 in
 rec {
 
@@ -1626,7 +1625,19 @@ rec {
     ```
     :::
   */
-  dropEnd = n: xs: take (max 0 (length xs - n)) xs;
+  dropEnd =
+    n: list:
+    let
+      len = length list;
+    in
+    genList (elemAt list) (
+      if n > len then
+        0
+      else if n < 0 then
+        len
+      else
+        len - n
+    );
 
   /**
     Whether the first list is a prefix of the second list.

From 986cf9adb8cb5a1076b4aee7844fe619eabfda71 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 17:00:46 -0400
Subject: [PATCH 75/81] lib.lists.init: rewrite to not call `take`

---
 lib/lists.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 68f3ccb74613..860bf5560797 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1875,7 +1875,7 @@ rec {
   init =
     list:
     assert lib.assertMsg (list != [ ]) "lists.init: list must not be empty!";
-    take (length list - 1) list;
+    genList (elemAt list) (length list - 1);
 
   /**
     Returns the image of the cross product of some lists by a function.

From 0f096eb287273bb5c943cb40178ce9b6c4bba047 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 21 May 2026 17:08:34 -0400
Subject: [PATCH 76/81] lib.lists.flatten: save function call when recursing

---
 lib/lists.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 860bf5560797..8766d3f25d21 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -445,7 +445,7 @@ rec {
 
     :::
   */
-  flatten = x: if isList x then concatMap (y: flatten y) x else [ x ];
+  flatten = x: if isList x then concatMap flatten x else [ x ];
 
   /**
     Remove elements equal to `e` from a list.  Useful for `buildInputs`.

From 099a322b3a539ecc8876561c8ffd0cbc38e481ca Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 18 Jun 2026 11:49:23 -0400
Subject: [PATCH 77/81] lib.lists.listDfs: compare to [] instead of checking
 length

---
 lib/lists.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 8766d3f25d21..78c173a63bfa 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1184,13 +1184,13 @@ rec {
           c = filter (x: before x us) visited;
           b = partition (x: before x us) rest;
         in
-        if stopOnCycles && (length c > 0) then
+        if stopOnCycles && c != [ ] then
           {
             cycle = us;
             loops = c;
             inherit visited rest;
           }
-        else if length b.right == 0 then
+        else if b.right == [ ] then
           # nothing is before us
           {
             minimal = us;

From 7d2f66c0ad076a35343fce74dec06d289e008367 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 18 Jun 2026 12:42:33 -0400
Subject: [PATCH 78/81] lib.lists.toposort: avoid extra function calls while
 recursing

---
 lib/lists.nix | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 78c173a63bfa..75cdf3cbf499 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1247,27 +1247,33 @@ rec {
     :::
   */
   toposort =
-    before: list:
+    before:
     let
-      dfsthis = listDfs true before list;
-      toporest = toposort before (dfsthis.visited ++ dfsthis.rest);
+      dfs = listDfs true before;
+      recurse =
+        list:
+        let
+          dfsthis = dfs list;
+          toporest = recurse (dfsthis.visited ++ dfsthis.rest);
+        in
+        if length list < 2 then
+          # finish
+          { result = list; }
+        else if dfsthis ? cycle then
+          # there's a cycle, starting from the current vertex, return it
+          {
+            cycle = reverseList ([ dfsthis.cycle ] ++ dfsthis.visited);
+            inherit (dfsthis) loops;
+          }
+        else if toporest ? cycle then
+          # there's a cycle somewhere else in the graph, return it
+          toporest
+        # Slow, but short. Can be made a bit faster with an explicit stack.
+        else
+          # there are no cycles
+          { result = [ dfsthis.minimal ] ++ toporest.result; };
     in
-    if length list < 2 then
-      # finish
-      { result = list; }
-    else if dfsthis ? cycle then
-      # there's a cycle, starting from the current vertex, return it
-      {
-        cycle = reverseList ([ dfsthis.cycle ] ++ dfsthis.visited);
-        inherit (dfsthis) loops;
-      }
-    else if toporest ? cycle then
-      # there's a cycle somewhere else in the graph, return it
-      toporest
-    # Slow, but short. Can be made a bit faster with an explicit stack.
-    else
-      # there are no cycles
-      { result = [ dfsthis.minimal ] ++ toporest.result; };
+    recurse;
 
   /**
     Sort a list based on a comparator function which compares two

From 4e2f331f872ba43e43fc62792ce4c96827fd4c7a Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 18 Jun 2026 12:44:57 -0400
Subject: [PATCH 79/81] lib.lists.toposort: avoid reversing element causing a
 cycle

---
 lib/lists.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 75cdf3cbf499..9863c064426d 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1262,7 +1262,7 @@ rec {
         else if dfsthis ? cycle then
           # there's a cycle, starting from the current vertex, return it
           {
-            cycle = reverseList ([ dfsthis.cycle ] ++ dfsthis.visited);
+            cycle = reverseList dfsthis.visited ++ [ dfsthis.cycle ];
             inherit (dfsthis) loops;
           }
         else if toporest ? cycle then

From 4b623fa2b84721dfacfa603a8f4d0489fba954fa Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sun, 21 Jun 2026 18:46:26 -0400
Subject: [PATCH 80/81] lib.lists.reverseList: avoid subtraction

---
 lib/lists.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 9863c064426d..a5ee7c5a880d 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1125,9 +1125,10 @@ rec {
   reverseList =
     xs:
     let
-      l = length xs;
+      # subtract one to save an __sub call on every element
+      lastIndex = length xs - 1;
     in
-    genList (n: elemAt xs (l - n - 1)) l;
+    genList (n: elemAt xs (lastIndex - n)) (lastIndex + 1);
 
   /**
     Depth-First Search (DFS) for lists `list != []`.

From 126e4a5985caf3dd94e989f2c6ed870899025443 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jun 2026 23:02:18 +0000
Subject: [PATCH 81/81] snyk: 1.1305.1 -> 1.1305.2

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

diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix
index b60357ea0718..be783876f93b 100644
--- a/pkgs/by-name/sn/snyk/package.nix
+++ b/pkgs/by-name/sn/snyk/package.nix
@@ -10,13 +10,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "snyk";
-  version = "1.1305.1";
+  version = "1.1305.2";
 
   src = fetchFromGitHub {
     owner = "snyk";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xOB2ZY4R5BE9a9bZ4+16h4K2O5OmGz6W0YwbPU/ZBWY=";
+    hash = "sha256-c32eVfRJRgABrGErHeWsXiHNd5UlL/MiTwkhJhtSZ3k=";
 
     # TODO: Remove once https://github.com/snyk/cli/pull/6924 is released.
     postFetch = ''
@@ -26,7 +26,7 @@ buildNpmPackage (finalAttrs: {
 
   npmDepsFetcherVersion = 3;
 
-  npmDepsHash = "sha256-pSnkANyHygjUqexCkxh/zsrB1143onYexeOUFQHN6sU=";
+  npmDepsHash = "sha256-EUK5iD5ElTtdLyewNJjOsY/4/vzfBBctqHY281p9Aow=";
 
   nodejs = nodejs_24;