From d89e66b8fca2d6c23cae5768e7ac0ba6518a1281 Mon Sep 17 00:00:00 2001 From: takeokunn Date: Mon, 17 Aug 2026 23:47:15 +0900 Subject: [PATCH] fix(nix): bump cl-parser-kit so its cl-prolog-kit follows resolves The rename pass rewrote this repo's follows key from `inputs.cl-parser-kit.inputs.cl-prolog.follows` to `...inputs.cl-prolog-kit.follows` but left cl-parser-kit pinned at v1.1.1, which predates cl-parser-kit's own migration and still names that input `cl-prolog` (flake.nix:52 at that tag). Nix silently ignores a follows targeting an input name that does not exist, so the deduplication was lost without any error: flake.lock carried cl-prolog v1.4.3 as a separate node alongside cl-prolog-kit v1.5.0, and the old repository was still fetched and built on every evaluation. CI stayed green throughout, which is why this survived review -- a broken follows costs a duplicate fetch, not a build failure. Renaming a follows key and bumping the pin it targets are one change, not two: the key names an input in the *other* flake, so it is only valid against a revision where that name exists. Pinned to cl-parser-kit's current main, which carries the migration; its newest tag, v1.1.1, is pre-migration. After the re-lock flake.lock holds exactly one Prolog node, cl-prolog-kit v1.5.0. --- flake.lock | 124 ++++++++++------------------------------------------- flake.nix | 2 +- 2 files changed, 23 insertions(+), 103 deletions(-) diff --git a/flake.lock b/flake.lock index 25b4090..defcd45 100644 --- a/flake.lock +++ b/flake.lock @@ -133,36 +133,12 @@ } }, "cl-nix-forge_3": { - "inputs": { - "nixpkgs": [ - "cl-parser-kit", - "cl-prolog", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1785825792, - "narHash": "sha256-FjpTPYXj5BINxpgFbNqKQgeB6p/ANR/1N8T4lSHS7kU=", - "owner": "nerima-lisp", - "repo": "cl-nix-forge", - "rev": "df1e772cda1efcdb90297b49ca1a25b396b8bdd7", - "type": "github" - }, - "original": { - "owner": "nerima-lisp", - "ref": "v0.5.0", - "repo": "cl-nix-forge", - "type": "github" - } - }, - "cl-nix-forge_4": { "inputs": { "nixpkgs": [ "cl-prolog-kit", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_4" + "treefmt-nix": "treefmt-nix_3" }, "locked": { "lastModified": 1785825792, @@ -179,13 +155,13 @@ "type": "github" } }, - "cl-nix-forge_5": { + "cl-nix-forge_4": { "inputs": { "nixpkgs": [ "cl-weave", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_6" + "treefmt-nix": "treefmt-nix_5" }, "locked": { "lastModified": 1785825792, @@ -205,7 +181,9 @@ "cl-parser-kit": { "inputs": { "cl-nix-forge": "cl-nix-forge_2", - "cl-prolog": "cl-prolog", + "cl-prolog-kit": [ + "cl-prolog-kit" + ], "cl-weave": [ "cl-weave" ], @@ -215,61 +193,26 @@ "paredit-cli": [ "paredit-cli" ], - "treefmt-nix": "treefmt-nix_3" + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1785931427, - "narHash": "sha256-IR8GbJVuSKS8fTcuQezTVlJJ3nU802shk2fdiHszcig=", + "lastModified": 1786971533, + "narHash": "sha256-ch66xT9MD2WyBOEEEf5/Bw1jchq2/YM+pe+KVvKcTzA=", "owner": "nerima-lisp", "repo": "cl-parser-kit", - "rev": "6379014e6d85bdaecc57157611baa4ddf4b2b206", + "rev": "88d0f0c42d35904010936314191ebf62ac401aa1", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.1.1", "repo": "cl-parser-kit", - "type": "github" - } - }, - "cl-prolog": { - "inputs": { - "cl-nix-forge": "cl-nix-forge_3", - "cl-weave": [ - "cl-parser-kit", - "cl-weave" - ], - "nixpkgs": [ - "cl-parser-kit", - "nixpkgs" - ], - "paredit-cli": [ - "cl-parser-kit", - "paredit-cli" - ], - "treefmt-nix": [ - "cl-parser-kit", - "treefmt-nix" - ] - }, - "locked": { - "lastModified": 1785918678, - "narHash": "sha256-Xr2Ga1qzz08MApO5N4v+bs/wmCC4FdJlYyjsC8TnXxU=", - "owner": "nerima-lisp", - "repo": "cl-prolog", - "rev": "7581f72c7d080afd4c863e1d44010ccb5d7258ad", - "type": "github" - }, - "original": { - "owner": "nerima-lisp", - "ref": "v1.4.3", - "repo": "cl-prolog", + "rev": "88d0f0c42d35904010936314191ebf62ac401aa1", "type": "github" } }, "cl-prolog-kit": { "inputs": { - "cl-nix-forge": "cl-nix-forge_4", + "cl-nix-forge": "cl-nix-forge_3", "cl-weave": [ "cl-weave" ], @@ -279,7 +222,7 @@ "paredit-cli": [ "paredit-cli" ], - "treefmt-nix": "treefmt-nix_5" + "treefmt-nix": "treefmt-nix_4" }, "locked": { "lastModified": 1786948477, @@ -298,14 +241,14 @@ }, "cl-weave": { "inputs": { - "cl-nix-forge": "cl-nix-forge_5", + "cl-nix-forge": "cl-nix-forge_4", "nixpkgs": [ "nixpkgs" ], "paredit-cli": [ "paredit-cli" ], - "treefmt-nix": "treefmt-nix_7" + "treefmt-nix": "treefmt-nix_6" }, "locked": { "lastModified": 1785915502, @@ -360,7 +303,7 @@ "nixpkgs" ], "rust-overlay": "rust-overlay", - "treefmt-nix": "treefmt-nix_8" + "treefmt-nix": "treefmt-nix_7" }, "locked": { "lastModified": 1785902408, @@ -390,7 +333,7 @@ "cl-weave": "cl-weave", "nixpkgs": "nixpkgs", "paredit-cli": "paredit-cli", - "treefmt-nix": "treefmt-nix_9" + "treefmt-nix": "treefmt-nix_8" } }, "rust-overlay": { @@ -440,8 +383,6 @@ "inputs": { "nixpkgs": [ "cl-parser-kit", - "cl-prolog", - "cl-nix-forge", "nixpkgs" ] }, @@ -460,27 +401,6 @@ } }, "treefmt-nix_3": { - "inputs": { - "nixpkgs": [ - "cl-parser-kit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1785360170, - "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_4": { "inputs": { "nixpkgs": [ "cl-prolog-kit", @@ -502,7 +422,7 @@ "type": "github" } }, - "treefmt-nix_5": { + "treefmt-nix_4": { "inputs": { "nixpkgs": [ "cl-prolog-kit", @@ -523,7 +443,7 @@ "type": "github" } }, - "treefmt-nix_6": { + "treefmt-nix_5": { "inputs": { "nixpkgs": [ "cl-weave", @@ -545,7 +465,7 @@ "type": "github" } }, - "treefmt-nix_7": { + "treefmt-nix_6": { "inputs": { "nixpkgs": [ "cl-weave", @@ -566,7 +486,7 @@ "type": "github" } }, - "treefmt-nix_8": { + "treefmt-nix_7": { "inputs": { "nixpkgs": [ "paredit-cli", @@ -587,7 +507,7 @@ "type": "github" } }, - "treefmt-nix_9": { + "treefmt-nix_8": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index d2a1fec..c38934e 100644 --- a/flake.nix +++ b/flake.nix @@ -80,7 +80,7 @@ # independent declarative specification of the ECMA-48 CSI byte-class # grammar (see contrib/cl-prolog-kit-csi-grammar.lisp for the first, built on # cl-prolog-kit's DCG support instead). Never part of the core build/CI. - inputs.cl-parser-kit.url = "github:nerima-lisp/cl-parser-kit/v1.1.1"; + inputs.cl-parser-kit.url = "github:nerima-lisp/cl-parser-kit/88d0f0c42d35904010936314191ebf62ac401aa1"; inputs.cl-parser-kit.inputs.nixpkgs.follows = "nixpkgs"; inputs.cl-parser-kit.inputs.cl-prolog-kit.follows = "cl-prolog-kit"; inputs.cl-parser-kit.inputs.cl-weave.follows = "cl-weave";