From ab07980d83cbe791cebbb4272269af1730f71f4b Mon Sep 17 00:00:00 2001 From: takeokunn Date: Wed, 7 Oct 2026 13:42:15 +0900 Subject: [PATCH 1/2] chore: follow latest toolkit releases --- flake.lock | 114 +++++++++++++++++++++++++++++++---------------------- flake.nix | 50 +++++++++++++++-------- 2 files changed, 99 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index 1a850d2c..843ae087 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "cl-boundary-kit": { "flake": false, "locked": { - "lastModified": 1784980104, - "narHash": "sha256-TVaLVsz0/Sqp3Xlfzimbk31dEAupPyXtvVOG/+ER2co=", + "lastModified": 1785937199, + "narHash": "sha256-FAuQIpnySCV4KoPm2ugbq/9uMsBGBO5XzF0SE3o0MTI=", "owner": "nerima-lisp", "repo": "cl-boundary-kit", - "rev": "472a38dfbd33792587b2b1f652c53256a189029f", + "rev": "62e4a7df3e52061c38b7ff4f596436bdda985f71", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v0.6.0", + "ref": "v2.3.0", "repo": "cl-boundary-kit", "type": "github" } @@ -258,34 +258,51 @@ "cl-cli": { "flake": false, "locked": { - "lastModified": 1785002244, - "narHash": "sha256-Yt5PdWA/hHBR0KA7zpogvFpUUQ2QyKDyynwtSGDHNAI=", + "lastModified": 1790404112, + "narHash": "sha256-qUsAMAUqWvshDnriY8sLrZa6tspSQAaNjRJWZQqAEpw=", "owner": "nerima-lisp", "repo": "cl-cli", - "rev": "59c0f4fad14178047d0d0ac4f19c2e6ff8362f31", + "rev": "40f2072b423658031a3bf2bdaf48cc769d4a70f6", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.0.1", + "ref": "v1.4.0", "repo": "cl-cli", "type": "github" } }, + "cl-codec-kit": { + "flake": false, + "locked": { + "lastModified": 1790500690, + "narHash": "sha256-vr00pg1SeZ0BJKeSiM2bmxwC2YK5VwDiSYq5bNVRj14=", + "owner": "nerima-lisp", + "repo": "cl-codec-kit", + "rev": "5885db990560b1aa3992a88daceea010b9adc1d2", + "type": "github" + }, + "original": { + "owner": "nerima-lisp", + "ref": "v0.6.0", + "repo": "cl-codec-kit", + "type": "github" + } + }, "cl-concurrent-kit": { "flake": false, "locked": { - "lastModified": 1785553683, - "narHash": "sha256-WNo6csaaldthSjLwzzj2/kJQ72QWJG2kvqTPDmrqR8s=", + "lastModified": 1785940791, + "narHash": "sha256-4ZXzAIMn4x+/zhx+jOW/Vr61oT/lc+PJIWzAE5y2Qsw=", "owner": "nerima-lisp", "repo": "cl-concurrent-kit", - "rev": "c129a0b4be03ef2b1671ab208f9b390573eb0412", + "rev": "0ef20d36a0a12800f231172227bd94034611c639", "type": "github" }, "original": { "owner": "nerima-lisp", + "ref": "v0.6.1", "repo": "cl-concurrent-kit", - "rev": "c129a0b4be03ef2b1671ab208f9b390573eb0412", "type": "github" } }, @@ -309,33 +326,33 @@ "cl-date-kit": { "flake": false, "locked": { - "lastModified": 1785553683, - "narHash": "sha256-fbQ2JU/mmDql+yAmD/sSZfQwf6M4Wx1JvyaMQxDRLJI=", + "lastModified": 1790450959, + "narHash": "sha256-tB9CMfpnp0suzaXLRey5EKTbXvJ+3M64Uf0lhYD0c84=", "owner": "nerima-lisp", "repo": "cl-date-kit", - "rev": "040f6bf936c0dd946a0049eaa715e4c1c6a40eb5", + "rev": "021c00df3f4dd18cad7206221125d1596db2fae5", "type": "github" }, "original": { "owner": "nerima-lisp", + "ref": "v1.1.1", "repo": "cl-date-kit", - "rev": "040f6bf936c0dd946a0049eaa715e4c1c6a40eb5", "type": "github" } }, "cl-host-kit": { "flake": false, "locked": { - "lastModified": 1785433376, - "narHash": "sha256-sivxc+tzylWHzkRhIn6yAj8CFCTsoG+gFx7B2q6aBT4=", + "lastModified": 1785923957, + "narHash": "sha256-pUR7Gi9Fdwg9WR1Mpjl+yBAb8FHAAieG8lTLYwfVJOc=", "owner": "nerima-lisp", "repo": "cl-host-kit", - "rev": "e1b5bd199c93bc083e8dee58d0a70c233d1d9e86", + "rev": "ec565470b634605e23b0d6eef0645eb15e8e3356", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v0.2.1", + "ref": "v0.3.1", "repo": "cl-host-kit", "type": "github" } @@ -343,16 +360,16 @@ "cl-json-kit": { "flake": false, "locked": { - "lastModified": 1784983583, - "narHash": "sha256-e2Y1Ajgtbqnv4xBCtTUdL0gCxlyJyNb3XQzyJsuyR0I=", + "lastModified": 1785923850, + "narHash": "sha256-0TBp7mlj0VF2krHZ83tsBtMKoiI38kpm8n56B/Ie37k=", "owner": "nerima-lisp", "repo": "cl-json-kit", - "rev": "62a3164ab812badf7dcbf94f4b4e4eda2ecd5fb1", + "rev": "dace990f643d1dd07639ce57a2559c5143850cce", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.0.0", + "ref": "v1.2.0", "repo": "cl-json-kit", "type": "github" } @@ -360,16 +377,16 @@ "cl-log-kit": { "flake": false, "locked": { - "lastModified": 1784998499, - "narHash": "sha256-MY41YW9Lw2ZaB7cctcvl4vIXXGrsOF/tXPbl4mn3ix8=", + "lastModified": 1785930087, + "narHash": "sha256-zFbU9a8KLHThzQRn7jqSL0SoTj7ImeP3Q5lJmsOzBQM=", "owner": "nerima-lisp", "repo": "cl-log-kit", - "rev": "53d1d81309e446afc805e0fe081628089223248b", + "rev": "580ebe23e4106edb8dcc89c0d4732f585c17e3f9", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.0.0", + "ref": "v2.2.0", "repo": "cl-log-kit", "type": "github" } @@ -377,16 +394,16 @@ "cl-parser-kit": { "flake": false, "locked": { - "lastModified": 1784998474, - "narHash": "sha256-rqY2m2oCJX2/wVRQ98pNYxH5+QUPfuDqEyiK89D+h+g=", + "lastModified": 1785931427, + "narHash": "sha256-IR8GbJVuSKS8fTcuQezTVlJJ3nU802shk2fdiHszcig=", "owner": "nerima-lisp", "repo": "cl-parser-kit", - "rev": "8316a9c9a4d39bc95cd2a7d33738750a12314ccc", + "rev": "6379014e6d85bdaecc57157611baa4ddf4b2b206", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.0.0", + "ref": "v1.1.1", "repo": "cl-parser-kit", "type": "github" } @@ -394,16 +411,16 @@ "cl-process-kit": { "flake": false, "locked": { - "lastModified": 1785012035, - "narHash": "sha256-6vy6K+ZUYt9zcu3IUSohRjYNT1jMX/xtXJX3CewsUpA=", + "lastModified": 1790572250, + "narHash": "sha256-vU3PHcoEA72BBK37uvjsdkuApxNR4FZ9KV27VyMWM5c=", "owner": "nerima-lisp", "repo": "cl-process-kit", - "rev": "359d127e84d1e876e253419953253a34db033070", + "rev": "1276a8b8db6120ac15a0911c255a586b3a030ca1", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.0.1", + "ref": "v3.4.0", "repo": "cl-process-kit", "type": "github" } @@ -428,16 +445,16 @@ "cl-regex-kit": { "flake": false, "locked": { - "lastModified": 1785436580, - "narHash": "sha256-Dsruu9HMpsufKCdx9PfciYUTXm1c2GgBQ0dBr8jYlvQ=", + "lastModified": 1790521261, + "narHash": "sha256-4BAunpX2NMUgt5usfJWp1dRqc0H01Is3MrGMGkquKio=", "owner": "nerima-lisp", "repo": "cl-regex-kit", - "rev": "6a149805c65ddc6b78b42950509a82935943ddd9", + "rev": "da83905cad2bcb28518ebb28cac6628c654bb328", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v0.2.0", + "ref": "v2.2.0", "repo": "cl-regex-kit", "type": "github" } @@ -445,16 +462,16 @@ "cl-tty-kit": { "flake": false, "locked": { - "lastModified": 1784998133, - "narHash": "sha256-83+D9zLCiFwyhjwcgFx6s8LflB/R46Fn1Youg8SyJMA=", + "lastModified": 1786289076, + "narHash": "sha256-BITAAgbpxMVWgSCZPLWWO6gxh4KcPcHDy518Sbn0K8I=", "owner": "nerima-lisp", "repo": "cl-tty-kit", - "rev": "0dfde1c30049797b39f5d3d75d1eae605f92c4ca", + "rev": "add24964a286720baa9e08722f4b611fcefdf22f", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.0.0", + "ref": "v1.6.1", "repo": "cl-tty-kit", "type": "github" } @@ -462,16 +479,16 @@ "cl-weave": { "flake": false, "locked": { - "lastModified": 1784975289, - "narHash": "sha256-Je74eEojj79RuBQpVF8vSygjlSEhjnmMq8abgyB4sGc=", + "lastModified": 1790778646, + "narHash": "sha256-x2bYA/A2q9q1QOccPG1faD6J6Hn+/9YCd3xKQFrNefY=", "owner": "nerima-lisp", "repo": "cl-weave", - "rev": "41020b897003fc1e3097cd62643f83ee8334c3be", + "rev": "32671560d3d15d4ecf33b9d8af862ea60737841b", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.0.0", + "ref": "v1.4.0", "repo": "cl-weave", "type": "github" } @@ -510,6 +527,7 @@ "cl-cc-type": "cl-cc-type", "cl-cc-vm": "cl-cc-vm", "cl-cli": "cl-cli", + "cl-codec-kit": "cl-codec-kit", "cl-concurrent-kit": "cl-concurrent-kit", "cl-dataflow-kit": "cl-dataflow-kit", "cl-date-kit": "cl-date-kit", diff --git a/flake.nix b/flake.nix index 56d03cbe..da0db67f 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,11 @@ flake = false; }; cl-weave = { - url = "github:nerima-lisp/cl-weave/v1.0.0"; + url = "github:nerima-lisp/cl-weave/v1.4.0"; + flake = false; + }; + cl-codec-kit = { + url = "github:nerima-lisp/cl-codec-kit/v0.6.0"; flake = false; }; # cl-parser-kit backs packages/parse's tokenizer/combinator/Pratt layer, @@ -45,7 +49,7 @@ # behind packages/cli, and cl-tty-kit provides the ANSI/screen/input # primitives for the interactive REPL. cl-parser-kit = { - url = "github:nerima-lisp/cl-parser-kit/v1.0.0"; + url = "github:nerima-lisp/cl-parser-kit/v1.1.1"; flake = false; }; cl-dataflow-kit = { @@ -53,29 +57,29 @@ flake = false; }; cl-boundary-kit = { - url = "github:nerima-lisp/cl-boundary-kit/v0.6.0"; + url = "github:nerima-lisp/cl-boundary-kit/v2.3.0"; flake = false; }; # cl-log-kit backs cl-boundary-kit's logging boundary (split out of # cl-boundary-kit itself); pulled in the same way as the toolkits above. cl-log-kit = { - url = "github:nerima-lisp/cl-log-kit/v1.0.0"; + url = "github:nerima-lisp/cl-log-kit/v2.2.0"; flake = false; }; cl-cli = { - url = "github:nerima-lisp/cl-cli/v1.0.1"; + url = "github:nerima-lisp/cl-cli/v1.4.0"; flake = false; }; cl-tty-kit = { - url = "github:nerima-lisp/cl-tty-kit/v1.0.0"; + url = "github:nerima-lisp/cl-tty-kit/v1.6.1"; flake = false; }; cl-regex-kit = { - url = "github:nerima-lisp/cl-regex-kit/v0.2.0"; + url = "github:nerima-lisp/cl-regex-kit/v2.2.0"; flake = false; }; cl-host-kit = { - url = "github:nerima-lisp/cl-host-kit/v0.2.1"; + url = "github:nerima-lisp/cl-host-kit/v0.3.1"; flake = false; }; # cl-cc-ast and cl-cc-type are the first subsystems split out of this @@ -147,19 +151,19 @@ # in-tree copy did not have. cl-process-kit needs cl-boundary-kit and # cl-log-kit, both already above; cl-json-kit is self-contained. cl-process-kit = { - url = "github:nerima-lisp/cl-process-kit/v1.0.1"; + url = "github:nerima-lisp/cl-process-kit/v3.4.0"; flake = false; }; cl-json-kit = { - url = "github:nerima-lisp/cl-json-kit/v1.0.0"; + url = "github:nerima-lisp/cl-json-kit/v1.2.0"; flake = false; }; cl-date-kit = { - url = "github:nerima-lisp/cl-date-kit/040f6bf936c0dd946a0049eaa715e4c1c6a40eb5"; + url = "github:nerima-lisp/cl-date-kit/v1.1.1"; flake = false; }; cl-concurrent-kit = { - url = "github:nerima-lisp/cl-concurrent-kit/c129a0b4be03ef2b1671ab208f9b390573eb0412"; + url = "github:nerima-lisp/cl-concurrent-kit/v0.6.1"; flake = false; }; }; @@ -269,7 +273,15 @@ src = inputs.cl-weave; systems = [ "cl-weave" ]; }; - # cl-parser-kit is self-contained. cl-boundary-kit pulls cl-log-kit. + clCodecKit = sbcl.buildASDFSystem { + pname = "cl-codec-kit"; + version = siblingVersion "cl-codec-kit"; + src = inputs.cl-codec-kit; + systems = [ "cl-codec-kit" ]; + }; + # cl-parser-kit is self-contained. The runtime dependencies of each + # toolkit are threaded explicitly because these are plain source + # inputs rather than flakes with dependency closures. # cl-dataflow-kit, cl-cli and cl-tty-kit all depend on the external # cl-prolog-kit engine in production, so clPrologKit is threaded into their # lispLibs and thereby reaches any cl-cc package consuming them. @@ -294,34 +306,35 @@ version = siblingVersion "cl-log-kit"; src = inputs.cl-log-kit; systems = [ "cl-log-kit" ]; + lispLibs = [ clDateKit clConcurrentKit clHostKit ]; }; clBoundaryKit = sbcl.buildASDFSystem { pname = "cl-boundary-kit"; version = siblingVersion "cl-boundary-kit"; src = inputs.cl-boundary-kit; systems = [ "cl-boundary-kit" ]; - lispLibs = [ clLogKit ]; + lispLibs = [ clHostKit ]; }; clCli = sbcl.buildASDFSystem { pname = "cl-cli"; version = siblingVersion "cl-cli"; src = inputs.cl-cli; systems = [ "cl-cli" ]; - lispLibs = [ clPrologKit ]; + lispLibs = [ clHostKit clPrologKit ]; }; clTtyKit = sbcl.buildASDFSystem { pname = "cl-tty-kit"; version = siblingVersion "cl-tty-kit"; src = inputs.cl-tty-kit; systems = [ "cl-tty-kit" ]; - lispLibs = [ clPrologKit ]; + lispLibs = [ clCodecKit clConcurrentKit clPrologKit ]; }; clRegexKit = sbcl.buildASDFSystem { pname = "cl-regex-kit"; version = siblingVersion "cl-regex-kit"; src = inputs.cl-regex-kit; systems = [ "cl-regex-kit" ]; - lispLibs = [ clParserKit ]; + lispLibs = [ clConcurrentKit clParserKit ]; }; clHostKit = sbcl.buildASDFSystem { pname = "cl-host-kit"; @@ -363,6 +376,8 @@ lispLibs = [ clBoundaryKit clLogKit + clCodecKit + clConcurrentKit ]; }; clJsonKit = sbcl.buildASDFSystem { @@ -382,6 +397,7 @@ version = siblingVersion "cl-concurrent-kit"; src = inputs.cl-concurrent-kit; systems = [ "cl-concurrent-kit" ]; + lispLibs = [ clBoundaryKit clDateKit ]; }; clCcRuntime = sbcl.buildASDFSystem { pname = "cl-cc-runtime"; From 4fcc1c1fdc7274a7078ada7f08c642a5987e9995 Mon Sep 17 00:00:00 2001 From: takeokunn Date: Wed, 7 Oct 2026 13:58:53 +0900 Subject: [PATCH 2/2] fix: format toolkit dependency lists --- flake.nix | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index da0db67f..3b315892 100644 --- a/flake.nix +++ b/flake.nix @@ -306,7 +306,11 @@ version = siblingVersion "cl-log-kit"; src = inputs.cl-log-kit; systems = [ "cl-log-kit" ]; - lispLibs = [ clDateKit clConcurrentKit clHostKit ]; + lispLibs = [ + clDateKit + clConcurrentKit + clHostKit + ]; }; clBoundaryKit = sbcl.buildASDFSystem { pname = "cl-boundary-kit"; @@ -320,21 +324,31 @@ version = siblingVersion "cl-cli"; src = inputs.cl-cli; systems = [ "cl-cli" ]; - lispLibs = [ clHostKit clPrologKit ]; + lispLibs = [ + clHostKit + clPrologKit + ]; }; clTtyKit = sbcl.buildASDFSystem { pname = "cl-tty-kit"; version = siblingVersion "cl-tty-kit"; src = inputs.cl-tty-kit; systems = [ "cl-tty-kit" ]; - lispLibs = [ clCodecKit clConcurrentKit clPrologKit ]; + lispLibs = [ + clCodecKit + clConcurrentKit + clPrologKit + ]; }; clRegexKit = sbcl.buildASDFSystem { pname = "cl-regex-kit"; version = siblingVersion "cl-regex-kit"; src = inputs.cl-regex-kit; systems = [ "cl-regex-kit" ]; - lispLibs = [ clConcurrentKit clParserKit ]; + lispLibs = [ + clConcurrentKit + clParserKit + ]; }; clHostKit = sbcl.buildASDFSystem { pname = "cl-host-kit"; @@ -397,7 +411,10 @@ version = siblingVersion "cl-concurrent-kit"; src = inputs.cl-concurrent-kit; systems = [ "cl-concurrent-kit" ]; - lispLibs = [ clBoundaryKit clDateKit ]; + lispLibs = [ + clBoundaryKit + clDateKit + ]; }; clCcRuntime = sbcl.buildASDFSystem { pname = "cl-cc-runtime";