New patches:

[unrevert
anon**20260430213800
 Ignore-this: 76ddbf3c57f0582a0d73d5e791b5d9d9bf291d82f93b0c6c8ce49174cc9ce4d0b1f6601786c5b17a
] conflictor [
hunk ./lib/lock_loader.ml 275
-			pf ppf {|	fetch-url = {name, kind, hash}: pkgs.fetchurl {@.|};
-			pf ppf {|		inherit name;@.|};
+			pf ppf {|	fetch-url = {input-name, name, kind, hash}: pkgs.fetchurl ({@.|};
]
:
hunk ./lib/lock_loader.ml 275
-			pf ppf {|	fetch-url = {name, kind, hash}: pkgs.fetchurl {@.|};
+			pf ppf {|	fetch-url = {name, kind, hash}: pkgs.fetchurl ({@.|};
conflictor [
hunk ./lib/lock_loader.ml 279
-			pf ppf {|	} // lib.optionalAttrs (builtins.length kind.ms > 0) { urls = kind.ms; };@.|};
+			pf ppf {|	}@.|};
+			pf ppf {|	// lib.optionalAttrs (name != null) {inherit name;}@.|};
+			pf ppf {|	// lib.optionalAttrs (builtins.length kind.ms > 0) {urls = kind.ms;});@.|};
]
:
hunk ./lib/lock_loader.ml 279
-			pf ppf {|	} // lib.optionalAttrs (builtins.length kind.ms > 0) { urls = kind.ms; };@.|};
+			pf ppf {|	} // lib.optionalAttrs (builtins.length kind.ms > 0) { urls = kind.ms; });@.|};
conflictor [
hunk ./lib/lock_loader.ml 284
-			pf ppf {|	fetch-zip = {name, kind, hash}: pkgs.fetchzip {@.|};
-			pf ppf {|		inherit name;@.|};
+			pf ppf {|	fetch-zip = {input-name, name, kind, hash}: pkgs.fetchzip ({@.|};
]
:
hunk ./lib/lock_loader.ml 284
-			pf ppf {|	fetch-zip = {name, kind, hash}: pkgs.fetchzip {@.|};
+			pf ppf {|	fetch-zip = {name, kind, hash}: pkgs.fetchzip ({@.|};
conflictor [
hunk ./lib/lock_loader.ml 288
-			pf ppf {|	} // lib.optionalAttrs (builtins.length kind.ms > 0) { urls = kind.ms; };@.|};
+			pf ppf {|	}@.|};
+			pf ppf {|	// lib.optionalAttrs (name != null) {inherit name;}@.|};
+			pf ppf {|	// lib.optionalAttrs (builtins.length kind.ms > 0) {urls = kind.ms;});@.|};
]
:
hunk ./lib/lock_loader.ml 288
-			pf ppf {|	} // lib.optionalAttrs (builtins.length kind.ms > 0) { urls = kind.ms; };@.|};
+			pf ppf {|	} // lib.optionalAttrs (builtins.length kind.ms > 0) { urls = kind.ms; });@.|};
conflictor [
hunk ./lib/lock_loader.ml 299
-			pf ppf {|			"Upstream pkgs.fetchgit doesn’t yet support mirrors for 「${name}」"@.|};
-			pf ppf {|			pkgs.fetchgit {@.|};
+			pf ppf {|			"Upstream pkgs.fetchgit doesn’t yet support mirrors for 「${input-name}」"@.|};
+			pf ppf {|			pkgs.fetchgit ({@.|};
]
:
hunk ./lib/lock_loader.ml 300
-			pf ppf {|			pkgs.fetchgit {@.|};
+			pf ppf {|			pkgs.fetchgit ({@.|};
duplicate
hunk ./lib/lock_loader.ml 311
-			pf ppf {|			});@.|};
+			pf ppf {|			};@.|};
:
hunk ./lib/lock_loader.ml 311
-			pf ppf {|			};@.|};
+			pf ppf {|			});@.|};

Context:

[TAG 1.8.2
·𐑑𐑴𐑕𐑑𐑩𐑤 <toastal@posteo.net>**20260705190705
 Ignore-this: b3c0f577644cf6efa4a96705c59e1e276efa7ecc44f493f6e14e8d5042b243573eea93e595ca8498
 
 • clean up Nix code by putting more inputs in the correct buckets
] 
[TAG 1.8.2
·𐑑𐑴𐑕𐑑𐑩𐑤 <toastal@posteo.net>**20260626200055
 Ignore-this: 9a19076b975ebaf5f0b478a8cb825a5a77013fda8faf52d3c69a02bd400fc939b7cf39d97d5141eb
 
 • clean up Nix code by putting more inputs in the correct buckets
] 
Patch bundle hash:
bbdfe2f6797986e9c2d87de6f64b92930dbe7f77