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: [72-char CHANGELOG ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260613051401 Ignore-this: a754e4af0de9d81053d590df35ae11543fd6fef934f6b2fac2f29c2cf93b7f3c4cda5c50c5ad99ce makes for easier copying to the long descriptions ] [tweak CHANGELOG with 1.6.0 ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260613043446 Ignore-this: f1482dbc06a8db954527c23d26d16d90fd34db3fbad448444c31f76155c06b6c569a983c1da7d795 ] [nixtamal refresh ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260613040153 Ignore-this: 78a17b7d5676133c88595eaf202bbba6a07193177b81c0d2b1a2e97b2612b1cc9e3f0ca5deeea09c ] [silo: implementation retry ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260612140549 Ignore-this: ec68de932ae48f32d18c363ecda0012cd84d99bddc7f4458c30c9244dc86d57a909cf7645b953fb7 ] [gc track ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260612135751 Ignore-this: 6c83eafe51e118abf3aeeb54c27dd9b7142c2ec37e3c562eb21e668c62e5332b9c101c67155ebafe ] [null hashes are refresh candidates ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260612044033 Ignore-this: 5e2c7bbc92d28b8d4b0044d0a2744857d6d9d449105558472f0b0a19fdf05c85eb6db48eaf264618 ] [Update docs with HACKING.rst ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260611152144 Ignore-this: a5aafc46229b35ba9cf871445762338f985424e165c47235c2ddd3ec63f044498bcd85d24121fcc6 ] [nixtamal upgrade ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260605172441 Ignore-this: 5f1fdeb94dbc3abcaddc85b8fc9a0c68f994f5afa5a91c15ddc24a380c62bd5c4da51a86db7c1963 ] [remove mark-darcs-weak-hash script ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260603152814 Ignore-this: dab93156e571d5aae43c5717600c6b84510e260e8324c2a8df651b89d26f041317c6b20a14e47cc3 ] [schema: 1.1.0 → 1.2.0 ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260603152530 Ignore-this: 9bb774dae6c0206d353b29d6078e4b0821d52b66bf6145552eb7fd3c622baf00046f615ed0bc516e ] [reload manifests on upgrade ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260603151431 Ignore-this: f20e3e1940bc28b03911018712b4ea86560dab3e5cb7aaf719f1961926d0d19da10496b85bfbd003 ] [version: 1.5.4 → 1.6.0 ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260603150215 Ignore-this: a79e0a43012cedc1e981681aa97d391f87b8abfa02e8ea7e1c28970b5e126957d4c1c8b9c5868937 ] [let and ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260603145643 Ignore-this: 32ac5862b4541ed549b92d0d24cf1142b17070e867f25463b68f408d4d6f568e37cb01c107abcf1e ] [gc input prop ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260603145135 Ignore-this: 67ff8d5657fba4c52d786b7ed60fab8b0de75956ed6cf32ec73c53a548e7fb5c2331ee8913d5fb21 ] [retry adding a root to for the silo ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260603144807 Ignore-this: 53021d083f71a09673680a33f942a45c246521ad772ab6bdb1180d00c43376b08d48f434c741a05b ] [nixtamal refresh ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260603144803 Ignore-this: 54c268e70990ef95e1927d12425429f9865a376c856de1beccc62c0e1c626a616566fc597175c16b ] [TAG 1.5.4 ·𐑑𐑴𐑕𐑑𐑩𐑤 **20260515045311 Ignore-this: 967da90bcfb1984fcec3822ec3254506eeed7c1fc2e0ff12363d4874ea62fab85a5d39a89e25685f ] Patch bundle hash: bbdfe2f6797986e9c2d87de6f64b92930dbe7f77