diff options
Diffstat (limited to 'gleam')
| -rw-r--r-- | gleam/README.md | 19 | ||||
| -rw-r--r-- | gleam/flake.lock | 16 | ||||
| -rw-r--r-- | gleam/flake.nix | 2 | ||||
| -rw-r--r-- | gleam/gleam.toml | 2 | ||||
| -rw-r--r-- | gleam/manifest.toml | 2 |
5 files changed, 21 insertions, 20 deletions
diff --git a/gleam/README.md b/gleam/README.md index 8a2bea9..046dc0f 100644 --- a/gleam/README.md +++ b/gleam/README.md @@ -27,7 +27,7 @@ model to bytes. ## Build and run ```sh -nix build --override-input ocda-lib path:../../sisudoc-ocda-lib +nix build ./result/bin/ocda-write --text <doc>.ssp ./result/bin/ocda-write --text <doc>.ocda.db de ./result/bin/ocda-write --md <doc>.ssp @@ -35,10 +35,11 @@ nix build --override-input ocda-lib path:../../sisudoc-ocda-lib ./result/bin/ocda-write --typst <doc>.ocda.db en --out out/<doc>.typ ``` -The override applies to `nix develop` too, until the library is published: +`flake.lock` pins the library at the commit this was checked against. In a +development shell `gleam` reads it through the `./ocda-lib` symlink (below): ```sh -nix develop --override-input ocda-lib path:../../sisudoc-ocda-lib -c gleam build +nix develop -c gleam build ``` ## The check @@ -47,16 +48,16 @@ nix develop --override-input ocda-lib path:../../sisudoc-ocda-lib -c gleam build ./result/bin/ocda-write --text <doc>.ssp | cmp - <the D writer's> ``` -**36 of 36 document-languages, from both serialisations, byte identical to the +**Every document-language, from both serialisations, byte identical to the D writer** - which is the check that matters now, since byte identity with `spine --text` is no longer the target. And for `--md`, `--html`, `--epub` and `--typst`, **byte identical to the D -writer on all 36**, which is the agreement that says the model is enough. None -of them is held to spine's bytes: the epub's judge is epubcheck, which read the -specification so that the writer need not be trusted to have, and the pdf's is -typst, where a link to a label that does not exist is a compile error. See the -repository README for what they do differently and why. +writer on every document**, which is the agreement that says the model is +enough. None of them is held to spine's bytes: the epub's judge is epubcheck, +which read the specification so that the writer need not be trusted to have, +and the pdf's is typst, where a link to a label that does not exist is a +compile error. See the repository README for what they do differently and why. ## The library, as a path dependency inside the package diff --git a/gleam/flake.lock b/gleam/flake.lock index 13a94c9..a83226a 100644 --- a/gleam/flake.lock +++ b/gleam/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1790652569, - "narHash": "sha256-k8Fu4c9Z+4Nh7mUr0cfw++ITQiyEhlWxoJBOkI3tOcQ=", - "rev": "b6c8664de9b6cc07fe5666a29f91884ba81197c4", + "lastModified": 1792506237, + "narHash": "sha256-hVMDyAXU0kxRuG3GygbZkzf5x+aBNEC0NYEJ6KwHtD4=", + "rev": "5adc50831c259f87faeb09ddf930d43597197473", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1082290.b6c8664de9b6/nixexprs.tar.zst" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1097770.5adc50831c25/nixexprs.tar.zst" }, "original": { "type": "tarball", @@ -16,11 +16,11 @@ "ocda-lib": { "flake": false, "locked": { - "lastModified": 1791851051, - "narHash": "sha256-mVI3uGQ1z7S5OMMFjl5UoWShE3p0ucXlr6cVU1iAsgI=", + "lastModified": 1791924842, + "narHash": "sha256-C79k2X32NxKPqrE7nJVegYThtA6Dm2pg/B/yb9RiObE=", "ref": "refs/heads/main", - "rev": "4e4f2f8c2b2c043077390cb4ccf7ce97ffe4ac6b", - "revCount": 3, + "rev": "79a7a0cf09c9d6b5d9974376dcb7a98bd5bdbcba", + "revCount": 4, "type": "git", "url": "git://git.sisudoc.org/tools/sisudoc-ocda-lib" }, diff --git a/gleam/flake.nix b/gleam/flake.nix index c70f739..8f2d13c 100644 --- a/gleam/flake.nix +++ b/gleam/flake.nix @@ -57,7 +57,7 @@ */ ${name} = buildGleamApplication { pname = "ocda-write"; - version = "2.0.0"; + version = "2.1.0"; src = ./.; localPackages = [ "${ocda-lib}/gleam" ]; rebar3Package = rebar3-pc; diff --git a/gleam/gleam.toml b/gleam/gleam.toml index 93880ca..bdbbac0 100644 --- a/gleam/gleam.toml +++ b/gleam/gleam.toml @@ -1,5 +1,5 @@ name = "ocda_write" -version = "2.0.0" +version = "2.1.0" description = "sample writers over the object-centric document abstraction" licences = ["AGPL-3.0-or-later"] diff --git a/gleam/manifest.toml b/gleam/manifest.toml index 8f22b12..5ad4848 100644 --- a/gleam/manifest.toml +++ b/gleam/manifest.toml @@ -14,7 +14,7 @@ packages = [ { name = "gleam_regexp", version = "1.1.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_regexp", source = "hex", outer_checksum = "9C215C6CA84A5B35BB934A9B61A9A306EC743153BE2B0425A0D032E477B062A9" }, { name = "gleam_stdlib", version = "1.0.5", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "CEE5B6C076A85B45F60C585F4316C63EC8B7127C119D5738C3958A9C4D50404E" }, { name = "gleeunit", version = "1.11.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "EC31ABA74256AEA531EDF8169931D775BBB384FED0A8A1BDC4DD9354E3E21826" }, - { name = "ocda_lib", version = "2.0.0", build_tools = ["gleam"], requirements = ["argv", "gleam_json", "gleam_stdlib", "simplifile", "sqlight"], source = "local", path = "./ocda-lib" }, + { name = "ocda_lib", version = "2.1.0", build_tools = ["gleam"], requirements = ["argv", "gleam_json", "gleam_stdlib", "simplifile", "sqlight"], source = "local", path = "./ocda-lib" }, { name = "simplifile", version = "2.7.0", build_tools = ["gleam"], requirements = ["filepath", "gleam_stdlib"], otp_app = "simplifile", source = "hex", outer_checksum = "A2727627B063E87351934C7F7F008F2D1FDB16F6DE0B8C79F9E46459CFC9C164" }, { name = "sqlight", version = "1.2.0", build_tools = ["gleam"], requirements = ["esqlite", "gleam_stdlib"], otp_app = "sqlight", source = "hex", outer_checksum = "841768D0A81107EE2DB46B949354F284A68B2E8098315C28A1FE3C07D206C17A" }, ] |