chore: follow latest toolkit releases

README.md

@@ -64,7 +64,7 @@ nix fmt                              # nixfmt via treefmt
 ```
 
 Without Nix, `run-tests.lisp` falls back to sibling checkouts of `cl-cc`,
-`cl-weave`, `cl-prolog`, `cl-parser-kit`, and `cl-json-kit` next to this
+`cl-weave`, `cl-prolog-kit`, `cl-parser-kit`, and `cl-json-kit` next to this
 repository:
 
 ```sh

coverage.lisp

@@ -38,6 +38,7 @@
 
 (defvar *cl-cc-root* (%env-or "CL_CC_PHP_CL_CC_ROOT" "../cl-cc"))
 (defvar *cl-weave-root* (%env-or "CL_CC_PHP_CL_WEAVE_ROOT" "../cl-weave"))
+(defvar *cl-prolog-kit-root* (%env-or "CL_CC_PHP_CL_PROLOG_KIT_ROOT" "../cl-prolog-kit"))
 (defvar *cl-prolog-root* (%env-or "CL_CC_PHP_CL_PROLOG_ROOT" "../cl-prolog"))
 (defvar *cl-parser-kit-root* (%env-or "CL_CC_PHP_CL_PARSER_KIT_ROOT" "../cl-parser-kit"))
 (defvar *cl-json-kit-root* (%env-or "CL_CC_PHP_CL_JSON_KIT_ROOT" "../cl-json-kit"))
@@ -56,6 +57,7 @@
   :source-registry
   (%tree (uiop:ensure-directory-pathname *cl-weave-root*))
   (%tree (uiop:ensure-directory-pathname *cl-prolog-root*))
+  (%tree (uiop:ensure-directory-pathname *cl-prolog-kit-root*))
   (%tree (uiop:ensure-directory-pathname *cl-parser-kit-root*))
   (%tree (uiop:ensure-directory-pathname *cl-json-kit-root*))
   (%tree (uiop:ensure-directory-pathname *cl-host-kit-root*))

docs/src/getting-started.md

@@ -56,7 +56,7 @@ parent/
   cl-cc/
   cl-cc-php/
   cl-weave/
-  cl-prolog/
+  cl-prolog-kit/
   cl-parser-kit/
   cl-json-kit/
 ```

docs/src/project/development.md

@@ -7,7 +7,7 @@ nix develop
 ```
 
 This gives you SBCL with the dependency roots already exported as environment
-variables, so `run-tests.lisp` finds cl-cc, cl-weave, cl-prolog, cl-parser-kit,
+variables, so `run-tests.lisp` finds cl-cc, cl-weave, cl-prolog-kit, cl-parser-kit,
 and cl-json-kit without further setup.
 
 ## Running the full check
@@ -40,9 +40,9 @@ Or without Nix, from the repository root:
 sbcl --script run-tests.lisp
 ```
 
-That falls back to sibling checkouts (`../cl-cc`, `../cl-weave`, `../cl-prolog`,
+That falls back to sibling checkouts (`../cl-cc`, `../cl-weave`, `../cl-prolog-kit`,
 `../cl-parser-kit`, `../cl-json-kit`). Override any root with
-`CL_CC_PHP_CL_CC_ROOT`, `CL_CC_PHP_CL_WEAVE_ROOT`, `CL_CC_PHP_CL_PROLOG_ROOT`,
+`CL_CC_PHP_CL_CC_ROOT`, `CL_CC_PHP_CL_WEAVE_ROOT`, `CL_CC_PHP_CL_PROLOG_KIT_ROOT`,
 `CL_CC_PHP_CL_PARSER_KIT_ROOT`, or `CL_CC_PHP_CL_JSON_KIT_ROOT`.
 
 ## Coverage

docs/src/reference/compatibility.md

@@ -68,7 +68,7 @@ known to work together if `flake.lock` says so.** Bumping the cl-cc input is a
 change that needs its own test run. The existing `v0.1.0` tag on cl-cc predates
 the `packages/` layout this repository expects, so it is not a usable pin.
 
-The other inputs — cl-weave, cl-prolog, cl-parser-kit, cl-json-kit — are
+The other inputs — cl-weave, cl-prolog-kit, cl-parser-kit, cl-json-kit — are
 pinned to release tags and behave normally. Unlike the first three, which are
 test-only, cl-json-kit is a real dependency of the shipped `cl-cc-php` system
 (`json_validate` calls into it directly) — see `cl-cc-php.asd`'s

flake.nix

@@ -31,7 +31,7 @@
       flake = false;
     };
 
-    # Test-only: cl-weave is the test framework t/ runs on directly. cl-prolog
+    # Test-only: cl-weave is the test framework t/ runs on directly. cl-prolog-kit
     # and cl-parser-kit are, in turn, cl-cc-optimize's own dependencies (part of
     # the transitive closure cl-cc-pipeline pulls in for the e2e suites) —
     # pulled the same way cl-cc's own flake pulls them, as plain source trees
@@ -42,15 +42,21 @@
     # follows that repo's default branch, so an upstream push to main would
     # break this repo's CI without warning.
     cl-weave = {
-      url = "github:nerima-lisp/cl-weave/v1.1.4";
+      url = "github:nerima-lisp/cl-weave/v1.4.0";
       flake = false;
     };
+    cl-prolog-kit = {
+      url = "github:nerima-lisp/cl-prolog-kit/v1.5.0";
+      flake = false;
+    };
+    # Compatibility source for the currently pinned cl-cc revision, whose
+    # optimize system still depends on the pre-rename :cl-prolog name.
     cl-prolog = {
       url = "github:nerima-lisp/cl-prolog/v1.3.0";
       flake = false;
     };
     cl-parser-kit = {
-      url = "github:nerima-lisp/cl-parser-kit/v1.0.3";
+      url = "github:nerima-lisp/cl-parser-kit/v1.1.1";
       flake = false;
     };
 
@@ -60,7 +66,7 @@
     # see cl-cc-php.asd's `:depends-on`. Pinned to a release tag for the same
     # reason as the other siblings.
     cl-json-kit = {
-      url = "github:nerima-lisp/cl-json-kit/v1.0.2";
+      url = "github:nerima-lisp/cl-json-kit/v1.2.0";
       flake = false;
     };
 
@@ -72,7 +78,7 @@
     # cl-nix-forge-based repos in the org do it — this flake has no
     # `lispDependencies`; run-tests.lisp resolves dependencies itself.
     cl-host-kit = {
-      url = "github:nerima-lisp/cl-host-kit/v0.2.5";
+      url = "github:nerima-lisp/cl-host-kit/v0.3.1";
       flake = false;
     };
 
@@ -93,6 +99,7 @@
       nixpkgs,
       cl-cc,
       cl-weave,
+      cl-prolog-kit,
       cl-prolog,
       cl-parser-kit,
       cl-json-kit,
@@ -134,6 +141,7 @@
       testEnv = {
         CL_CC_PHP_CL_CC_ROOT = "${cl-cc}";
         CL_CC_PHP_CL_WEAVE_ROOT = "${cl-weave}";
+        CL_CC_PHP_CL_PROLOG_KIT_ROOT = "${cl-prolog-kit}";
         CL_CC_PHP_CL_PROLOG_ROOT = "${cl-prolog}";
         CL_CC_PHP_CL_PARSER_KIT_ROOT = "${cl-parser-kit}";
         CL_CC_PHP_CL_JSON_KIT_ROOT = "${cl-json-kit}";
@@ -320,6 +328,7 @@
             text = ''
               export CL_CC_PHP_CL_CC_ROOT="${cl-cc}"
               export CL_CC_PHP_CL_WEAVE_ROOT="${cl-weave}"
+              export CL_CC_PHP_CL_PROLOG_KIT_ROOT="${cl-prolog-kit}"
               export CL_CC_PHP_CL_PROLOG_ROOT="${cl-prolog}"
               export CL_CC_PHP_CL_PARSER_KIT_ROOT="${cl-parser-kit}"
               export CL_CC_PHP_CL_JSON_KIT_ROOT="${cl-json-kit}"

run-tests.lisp

@@ -39,6 +39,9 @@ arrives through its env var and this branch is not taken."
 (defvar *cl-weave-root*
   (%env-or "CL_CC_PHP_CL_WEAVE_ROOT" "../cl-weave"))
 
+(defvar *cl-prolog-kit-root*
+  (%env-or "CL_CC_PHP_CL_PROLOG_KIT_ROOT" "../cl-prolog-kit"))
+
 (defvar *cl-prolog-root*
   (%env-or "CL_CC_PHP_CL_PROLOG_ROOT" "../cl-prolog"))
 
@@ -70,6 +73,7 @@ arrives through its env var and this branch is not taken."
   :source-registry
   (%tree (uiop:ensure-directory-pathname *cl-weave-root*))
   (%tree (uiop:ensure-directory-pathname *cl-prolog-root*))
+  (%tree (uiop:ensure-directory-pathname *cl-prolog-kit-root*))
   (%tree (uiop:ensure-directory-pathname *cl-parser-kit-root*))
   (%tree (uiop:ensure-directory-pathname *cl-json-kit-root*))
   (%tree (uiop:ensure-directory-pathname *cl-host-kit-root*))