diff --git a/docs/src/project/development.md b/docs/src/project/development.md index 2447181..3010c0d 100644 --- a/docs/src/project/development.md +++ b/docs/src/project/development.md @@ -67,7 +67,7 @@ see [Architecture](../reference/architecture.md)). |---|---| | `CL_CC_JAVASCRIPT_CL_CC_ROOT` | `cl-cc` | | `CL_CC_JAVASCRIPT_CL_WEAVE_ROOT` | `cl-weave` | -| `CL_CC_JAVASCRIPT_CL_PROLOG_ROOT` | `cl-prolog` | +| `CL_CC_JAVASCRIPT_CL_PROLOG_KIT_ROOT` | `cl-prolog-kit` | | `CL_CC_JAVASCRIPT_CL_PARSER_KIT_ROOT` | `cl-parser-kit` | | `CL_CC_JAVASCRIPT_CL_DATAFLOW_ROOT` | `cl-dataflow` | | `CL_CC_JAVASCRIPT_CL_BOUNDARY_KIT_ROOT` | `cl-boundary-kit` | diff --git a/flake.lock b/flake.lock index ba744a5..03910d6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "cl-boundary-kit": { "flake": false, "locked": { - "lastModified": 1785657708, - "narHash": "sha256-DieHj+VkI/S98vflHzfLZgJgATJGePT7QS9ElQkpiGU=", + "lastModified": 1785937199, + "narHash": "sha256-FAuQIpnySCV4KoPm2ugbq/9uMsBGBO5XzF0SE3o0MTI=", "owner": "nerima-lisp", "repo": "cl-boundary-kit", - "rev": "9d85a1530ae6b1be3a6e83173b1c7d7817e2d203", + "rev": "62e4a7df3e52061c38b7ff4f596436bdda985f71", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v2.0.1", + "ref": "v2.3.0", "repo": "cl-boundary-kit", "type": "github" } @@ -37,16 +37,16 @@ "cl-cli": { "flake": false, "locked": { - "lastModified": 1785655973, - "narHash": "sha256-cNmbSsw2GwKNGkD8OEh4ZLw8vRv9pU4a13uKWgbQlXU=", + "lastModified": 1790404112, + "narHash": "sha256-qUsAMAUqWvshDnriY8sLrZa6tspSQAaNjRJWZQqAEpw=", "owner": "nerima-lisp", "repo": "cl-cli", - "rev": "80b1433f5e09331bbf57b133e2f0ed9e38d443bc", + "rev": "40f2072b423658031a3bf2bdaf48cc769d4a70f6", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.2.0", + "ref": "v1.4.0", "repo": "cl-cli", "type": "github" } @@ -71,16 +71,16 @@ "cl-concurrent-kit": { "flake": false, "locked": { - "lastModified": 1785663008, - "narHash": "sha256-zChJOROZOumc4lxpigU9Zqvt4TL1roJK+5F8buyZbtw=", + "lastModified": 1785940791, + "narHash": "sha256-4ZXzAIMn4x+/zhx+jOW/Vr61oT/lc+PJIWzAE5y2Qsw=", "owner": "nerima-lisp", "repo": "cl-concurrent-kit", - "rev": "85f015330b3acf4ca4566cf9e8eb72c571611b26", + "rev": "0ef20d36a0a12800f231172227bd94034611c639", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v0.3.0", + "ref": "v0.6.1", "repo": "cl-concurrent-kit", "type": "github" } @@ -88,16 +88,16 @@ "cl-dataflow": { "flake": false, "locked": { - "lastModified": 1785657612, - "narHash": "sha256-uvbaAJ6Q3f9VSRfe71ASckDfLWobpD8VdPsmSeIkWO0=", + "lastModified": 1786949793, + "narHash": "sha256-26KT1QL7KJ2soRppDDoYwgXyzLKOZjPu0Un0eJBL5M4=", "owner": "nerima-lisp", "repo": "cl-dataflow", - "rev": "e3297e6c0ee5812de73bb71d19763140dcd39356", + "rev": "c4770c3b757bc40a9d5ecfc5de53871ec5da26c8", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.1.1", + "ref": "v1.2.0", "repo": "cl-dataflow", "type": "github" } @@ -105,16 +105,16 @@ "cl-date-kit": { "flake": false, "locked": { - "lastModified": 1785429368, - "narHash": "sha256-gHRCkMGrq/ZBeNS6Stx8nvx5brNi5P1sRzzN4nGwwTo=", + "lastModified": 1790450959, + "narHash": "sha256-tB9CMfpnp0suzaXLRey5EKTbXvJ+3M64Uf0lhYD0c84=", "owner": "nerima-lisp", "repo": "cl-date-kit", - "rev": "b0d9cb2f978a0c1ccfd1450ec6c10a33a9b2c858", + "rev": "021c00df3f4dd18cad7206221125d1596db2fae5", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v0.2.0", + "ref": "v1.1.1", "repo": "cl-date-kit", "type": "github" } @@ -122,16 +122,16 @@ "cl-host-kit": { "flake": false, "locked": { - "lastModified": 1785662299, - "narHash": "sha256-XzvvQ6MsRFYQNYe757mIbzSlBUy8l6Jv0aReFpuxPyo=", + "lastModified": 1785923957, + "narHash": "sha256-pUR7Gi9Fdwg9WR1Mpjl+yBAb8FHAAieG8lTLYwfVJOc=", "owner": "nerima-lisp", "repo": "cl-host-kit", - "rev": "7dc003d5ba176080796d775f6c8c4f75a5d56107", + "rev": "ec565470b634605e23b0d6eef0645eb15e8e3356", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v0.2.5", + "ref": "v0.3.1", "repo": "cl-host-kit", "type": "github" } @@ -139,16 +139,16 @@ "cl-json-kit": { "flake": false, "locked": { - "lastModified": 1785654907, - "narHash": "sha256-f9mh/oRlKmkEjx3x6sflSyofi9+ixAnCKrHO6xMpIgY=", + "lastModified": 1785923850, + "narHash": "sha256-0TBp7mlj0VF2krHZ83tsBtMKoiI38kpm8n56B/Ie37k=", "owner": "nerima-lisp", "repo": "cl-json-kit", - "rev": "8fac6689685c03a9da18bf99db973278b2620cf7", + "rev": "dace990f643d1dd07639ce57a2559c5143850cce", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.0.2", + "ref": "v1.2.0", "repo": "cl-json-kit", "type": "github" } @@ -156,16 +156,16 @@ "cl-log-kit": { "flake": false, "locked": { - "lastModified": 1785658987, - "narHash": "sha256-O7Ja+BmbXQXYZs8/c1EaHyWK+NBkPWMR9NkGx+hLsAw=", + "lastModified": 1785930087, + "narHash": "sha256-zFbU9a8KLHThzQRn7jqSL0SoTj7ImeP3Q5lJmsOzBQM=", "owner": "nerima-lisp", "repo": "cl-log-kit", - "rev": "c4986211b742520663c39db7bdfabee8645969ff", + "rev": "580ebe23e4106edb8dcc89c0d4732f585c17e3f9", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v2.0.1", + "ref": "v2.2.0", "repo": "cl-log-kit", "type": "github" } @@ -178,16 +178,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1785825792, - "narHash": "sha256-FjpTPYXj5BINxpgFbNqKQgeB6p/ANR/1N8T4lSHS7kU=", + "lastModified": 1790475278, + "narHash": "sha256-0AEyZnnjxm+eEjMXYZxo16t4fZdgMEBZOOoc2xMA3H0=", "owner": "nerima-lisp", "repo": "cl-nix-forge", - "rev": "df1e772cda1efcdb90297b49ca1a25b396b8bdd7", + "rev": "554ceba36e962d9c942058f9333edc5639b911b6", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v0.5.0", + "ref": "v0.6.1", "repo": "cl-nix-forge", "type": "github" } @@ -195,16 +195,16 @@ "cl-parser-kit": { "flake": false, "locked": { - "lastModified": 1785656543, - "narHash": "sha256-VhN+gWAo594jpg350TrBgp//bJQRDOtDNYIa1zB144U=", + "lastModified": 1785931427, + "narHash": "sha256-IR8GbJVuSKS8fTcuQezTVlJJ3nU802shk2fdiHszcig=", "owner": "nerima-lisp", "repo": "cl-parser-kit", - "rev": "b887d3b053d24df4568fcff2f3e3ee47d839db22", + "rev": "6379014e6d85bdaecc57157611baa4ddf4b2b206", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.0.3", + "ref": "v1.1.1", "repo": "cl-parser-kit", "type": "github" } @@ -226,19 +226,36 @@ "type": "github" } }, + "cl-prolog-kit": { + "flake": false, + "locked": { + "lastModified": 1786948477, + "narHash": "sha256-3qn9W1Jmbxnr0Si77J7Klo26oX/zjgBVwb5ye74NsTY=", + "owner": "nerima-lisp", + "repo": "cl-prolog-kit", + "rev": "239368e1001bc3a8576d45770c9e91da11515d09", + "type": "github" + }, + "original": { + "owner": "nerima-lisp", + "ref": "v1.5.0", + "repo": "cl-prolog-kit", + "type": "github" + } + }, "cl-tty-kit": { "flake": false, "locked": { - "lastModified": 1785660128, - "narHash": "sha256-AxapnzmyyQslpebFltmN9Qsbx0ojnT0todJV6C/5zVM=", + "lastModified": 1786289076, + "narHash": "sha256-BITAAgbpxMVWgSCZPLWWO6gxh4KcPcHDy518Sbn0K8I=", "owner": "nerima-lisp", "repo": "cl-tty-kit", - "rev": "f9fbaa0e6d28a58b1084966f7f10f45ab5b0ada2", + "rev": "add24964a286720baa9e08722f4b611fcefdf22f", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.2.0", + "ref": "v1.6.1", "repo": "cl-tty-kit", "type": "github" } @@ -246,27 +263,27 @@ "cl-weave": { "flake": false, "locked": { - "lastModified": 1785662484, - "narHash": "sha256-GFChZBI8RbOnov3WCTT2jw0H/kBqYK0ig6i7ltzjnyU=", + "lastModified": 1790778646, + "narHash": "sha256-x2bYA/A2q9q1QOccPG1faD6J6Hn+/9YCd3xKQFrNefY=", "owner": "nerima-lisp", "repo": "cl-weave", - "rev": "a8a094226480b92a3789e7e48a2af5faa2e36326", + "rev": "32671560d3d15d4ecf33b9d8af862ea60737841b", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.1.4", + "ref": "v1.4.0", "repo": "cl-weave", "type": "github" } }, "crane": { "locked": { - "lastModified": 1784564969, - "narHash": "sha256-TkTWNhJV/8Wk3czlbz4bwHZkFCaCHPsOy+oJe4PUiXg=", + "lastModified": 1785631643, + "narHash": "sha256-H++/2dMt+5+tErKU+t5z6c4Xedvj9w+UPQYrpygwIPw=", "owner": "ipetkov", "repo": "crane", - "rev": "7930f6c291de6f83c257839d434592aa085f290a", + "rev": "b8d87f76ea4e4b6f30f2e6eaf3fbb60ff7d87167", "type": "github" }, "original": { @@ -301,16 +318,16 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1785644478, - "narHash": "sha256-kqu9BDf8JqVe+Qo08ahOOuqpbqSto5RlQRhHoKw40d8=", + "lastModified": 1788540112, + "narHash": "sha256-UnHnKf6RiaOXOq2ZBoYLtE9/vDz05tFtI69juYrKPno=", "owner": "nerima-lisp", "repo": "paredit-cli", - "rev": "9f8db23ddd496ef6773e040454832eeafc60aeea", + "rev": "e8efd9528cf9a7acc98d3b99961bd657a0a9a62a", "type": "github" }, "original": { "owner": "nerima-lisp", - "ref": "v1.4.0", + "ref": "v1.6.3", "repo": "paredit-cli", "type": "github" } @@ -330,6 +347,7 @@ "cl-nix-forge": "cl-nix-forge", "cl-parser-kit": "cl-parser-kit", "cl-prolog": "cl-prolog", + "cl-prolog-kit": "cl-prolog-kit", "cl-tty-kit": "cl-tty-kit", "cl-weave": "cl-weave", "nixpkgs": "nixpkgs", @@ -345,11 +363,11 @@ ] }, "locked": { - "lastModified": 1783663825, - "narHash": "sha256-TTrNVoFdEw8j0Hn+shP1KAsimTmszTWBIIUliTaAuY0=", + "lastModified": 1785648791, + "narHash": "sha256-4wZa7NDOxbcm9pTNNcg88nvvPb9uVcWsJ+Ncil8eB1I=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "072adf9b18936c1062c48123a9b77891d5968f2c", + "rev": "32346a8154e65fa10bac36f7b476a5294cb8b150", "type": "github" }, "original": { @@ -366,11 +384,11 @@ ] }, "locked": { - "lastModified": 1785360170, - "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", + "lastModified": 1785945821, + "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", + "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0", "type": "github" }, "original": { @@ -387,11 +405,11 @@ ] }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1785360170, + "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 21b5b37..6006fb3 100644 --- a/flake.nix +++ b/flake.nix @@ -38,14 +38,14 @@ # Pinned to a release tag, `inputs.nixpkgs.follows`'d like every real # flake input below. cl-nix-forge = { - url = "github:nerima-lisp/cl-nix-forge/v0.5.0"; + url = "github:nerima-lisp/cl-nix-forge/v0.6.1"; inputs.nixpkgs.follows = "nixpkgs"; }; # cl-cc-javascript is a plugin frontend: its production system depends on # cl-cc-ast/-bootstrap/-parse/-vm, which still live inside the cl-cc # monorepo checkout, and cl-cc's own umbrella system transitively pulls in - # cl-prolog/cl-parser-kit (optimize's e-graph rules), cl-boundary-kit/ + # cl-prolog-kit/cl-parser-kit (optimize's e-graph rules), cl-boundary-kit/ # cl-cli/cl-tty-kit (cli/repl), and cl-log-kit (boundary-kit). cl-date-kit # gives the Temporal runtime real IANA time zone support (host zone # discovery and instant -> local-zone projection; see @@ -98,12 +98,18 @@ # like this repo sees it — checked against cl-weave's own CHANGELOG.md # before bumping. cl-weave = { - url = "github:nerima-lisp/cl-weave/v1.1.4"; + url = "github:nerima-lisp/cl-weave/v1.4.0"; flake = false; }; # v1.0.1 -> v1.1.0: internal performance work (indexed substitution, # tabled-answer replay, hash-table dispatch) plus a coverage report - # target. No public API change — checked against cl-prolog's CHANGELOG.md. + # target. No public API change — checked against cl-prolog-kit's CHANGELOG.md. + 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; @@ -115,14 +121,14 @@ # parts) — no public API change either way. Checked against # cl-parser-kit's CHANGELOG.md both times. 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; }; # v1.0.0 -> v1.1.0: additive-only `:parallel` keyword on run-pipeline/ # map-pipeline (default nil, backward compatible); CHANGELOG.md states # "No public API changed or removed" explicitly. cl-dataflow = { - url = "github:nerima-lisp/cl-dataflow/v1.1.1"; + url = "github:nerima-lisp/cl-dataflow/v1.2.0"; flake = false; }; # v0.6.0 -> v1.0.0: CHANGELOG.md states "No exported symbol, protocol, or @@ -138,13 +144,13 @@ # never imports it directly. Bumped after adding cl-host-kit as a new # input below to satisfy the new transitive requirement. cl-boundary-kit = { - url = "github:nerima-lisp/cl-boundary-kit/v2.0.1"; + url = "github:nerima-lisp/cl-boundary-kit/v2.3.0"; flake = false; }; # v1.0.1 -> v1.1.0: CHANGELOG.md states "No behavior of the cl-cli system # itself changed" — org package-standard conformance only. cl-cli = { - url = "github:nerima-lisp/cl-cli/v1.2.0"; + url = "github:nerima-lisp/cl-cli/v1.4.0"; flake = false; }; # v1.0.0 -> v1.0.3: three bug fixes (a FORMAT directive-parsing bug in a @@ -152,7 +158,7 @@ # plus an internal cl-weave test-migration and macro consolidation — no # public API change, checked against cl-tty-kit's CHANGELOG.md. cl-tty-kit = { - url = "github:nerima-lisp/cl-tty-kit/v1.2.0"; + url = "github:nerima-lisp/cl-tty-kit/v1.6.1"; flake = false; }; cl-codec-kit = { @@ -174,15 +180,15 @@ # (cl-date-kit >= 0.2.0, cl-concurrent-kit >= 0.1.0, cl-host-kit >= 0.2.0) # are already met by the pins below. Safe bump. cl-log-kit = { - url = "github:nerima-lisp/cl-log-kit/v2.0.1"; + url = "github:nerima-lisp/cl-log-kit/v2.2.0"; flake = false; }; cl-date-kit = { - url = "github:nerima-lisp/cl-date-kit/v0.2.0"; + url = "github:nerima-lisp/cl-date-kit/v1.1.1"; flake = false; }; 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; }; # v0.1.0 -> v0.2.0: substantial internal rework (intrusive-list FIFO, @@ -193,7 +199,7 @@ # "### Changed" section line by line for a signature change to any of # the three before bumping; found none. cl-concurrent-kit = { - url = "github:nerima-lisp/cl-concurrent-kit/v0.3.0"; + url = "github:nerima-lisp/cl-concurrent-kit/v0.6.1"; flake = false; }; # Now a DIRECT dependency: the Temporal runtime's host-time-zone discovery @@ -204,7 +210,7 @@ # the pin and the CL_CC_JAVASCRIPT_CL_HOST_KIT_ROOT wiring below are # unchanged -- only the justification grew. 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; }; @@ -224,7 +230,7 @@ # tool), not packages/checks: nothing in this repo's own build or test # suite depends on it. paredit-cli = { - url = "github:nerima-lisp/paredit-cli/v1.4.0"; + url = "github:nerima-lisp/paredit-cli/v1.6.3"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -236,6 +242,7 @@ cl-nix-forge, cl-cc, cl-weave, + cl-prolog-kit, cl-prolog, cl-parser-kit, cl-dataflow, @@ -284,6 +291,7 @@ dependencyEnv = { CL_CC_JAVASCRIPT_CL_CC_ROOT = toString cl-cc; CL_CC_JAVASCRIPT_CL_WEAVE_ROOT = toString cl-weave; + CL_CC_JAVASCRIPT_CL_PROLOG_KIT_ROOT = toString cl-prolog-kit; CL_CC_JAVASCRIPT_CL_PROLOG_ROOT = toString cl-prolog; CL_CC_JAVASCRIPT_CL_PARSER_KIT_ROOT = toString cl-parser-kit; CL_CC_JAVASCRIPT_CL_DATAFLOW_ROOT = toString cl-dataflow; @@ -396,7 +404,7 @@ # `nix build .#coverage-report`: runs the regression suite under # SB-COVER via scripts/run-coverage.lisp (pre-existing, previously # unwired into flake.nix — CI and `nix flake check` never ran it) and - # publishes the HTML report as $out, matching the shape cl-prolog's + # publishes the HTML report as $out, matching the shape cl-prolog-kit's # v1.1.0 established. `checks.coverage` below only asserts the # report exists, the same restraint cl-prolog's docs give for the # same reason: SB-COVER's HTML output isn't a numeric gate without diff --git a/scripts/dependency-roots.lisp b/scripts/dependency-roots.lisp index b28b8a1..739df78 100644 --- a/scripts/dependency-roots.lisp +++ b/scripts/dependency-roots.lisp @@ -3,7 +3,7 @@ ;;;; cl-cc-javascript is a plugin frontend for the cl-cc umbrella compiler: it ;;;; depends on packages that still live inside the cl-cc monorepo checkout ;;;; (cl-cc-ast/-bootstrap/-parse/-vm, plus everything cl-cc's own umbrella -;;;; system pulls in transitively — optimize needs cl-prolog/cl-parser-kit, +;;;; system pulls in transitively — optimize needs cl-prolog-kit/cl-parser-kit, ;;;; cli/repl need cl-boundary-kit/cl-cli/cl-tty-kit, boundary-kit needs ;;;; cl-log-kit and, as of its v2.0.0, cl-host-kit too), on cl-date-kit for ;;;; the Temporal runtime's IANA time zone support, on cl-json-kit for @@ -22,6 +22,7 @@ '(("CL_CC_JAVASCRIPT_CL_CC_ROOT" "cl-cc") ("CL_CC_JAVASCRIPT_CL_WEAVE_ROOT" "cl-weave") ("CL_CC_JAVASCRIPT_CL_PROLOG_ROOT" "cl-prolog") + ("CL_CC_JAVASCRIPT_CL_PROLOG_KIT_ROOT" "cl-prolog-kit") ("CL_CC_JAVASCRIPT_CL_PARSER_KIT_ROOT" "cl-parser-kit") ("CL_CC_JAVASCRIPT_CL_DATAFLOW_ROOT" "cl-dataflow") ("CL_CC_JAVASCRIPT_CL_BOUNDARY_KIT_ROOT" "cl-boundary-kit")