From ad7df51055c5908059d5cb88793d7a14f21b5824 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 5 Oct 2026 16:00:39 -0400 Subject: format 2.1: the pipeline reads with ocda-read sisudoc-ocda-lib now has a reader, ocda-read, in D and in Gleam, which reads every form. The pipeline runs it: one.sh read-d and read-g, passing the modes after the file, and read.sh taking its --tree from the .ssp and the .ocda.db in both languages. The two older readers are still built and run beside it. build.sh built the D library's two programs separately into the one result link, so the second replaced the first and one.sh dump-d found no ocda-dump after a clean build. The library's default is now all three programs, built once. flake.lock, in dlang/ and gleam/, now pins the library at the commit that brings ocda-read, and nixpkgs as that commit locks it. (assisted by Claude-Code) --- dlang/flake.lock | 25 +++++++++++-------------- dlang/flake.nix | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) (limited to 'dlang') diff --git a/dlang/flake.lock b/dlang/flake.lock index f2eda10..13a94c9 100644 --- a/dlang/flake.lock +++ b/dlang/flake.lock @@ -2,28 +2,25 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1790185690, - "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4975466d324710c576dc11ad614684e6bd8cad8e", - "type": "github" + "lastModified": 1790652569, + "narHash": "sha256-k8Fu4c9Z+4Nh7mUr0cfw++ITQiyEhlWxoJBOkI3tOcQ=", + "rev": "b6c8664de9b6cc07fe5666a29f91884ba81197c4", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1082290.b6c8664de9b6/nixexprs.tar.zst" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, "ocda-lib": { "flake": false, "locked": { - "lastModified": 1790705252, - "narHash": "sha256-lMPJxbVyAiMr8/yKvuRLeJgT+aGEQv0MiW9hlQLa/os=", + "lastModified": 1791851051, + "narHash": "sha256-mVI3uGQ1z7S5OMMFjl5UoWShE3p0ucXlr6cVU1iAsgI=", "ref": "refs/heads/main", - "rev": "8b8a8c1b61c740528e1409a2429f7ec4403f9576", - "revCount": 2, + "rev": "4e4f2f8c2b2c043077390cb4ccf7ce97ffe4ac6b", + "revCount": 3, "type": "git", "url": "git://git.sisudoc.org/tools/sisudoc-ocda-lib" }, diff --git a/dlang/flake.nix b/dlang/flake.nix index 966425a..d3923f0 100644 --- a/dlang/flake.nix +++ b/dlang/flake.nix @@ -1,7 +1,7 @@ { description = "ocda-write: sample writers over the object-centric document abstraction, in D"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst"; /* The library this is built on, as a source tree rather than a flake: the build compiles its modules alongside these, which is what a dub path -- cgit v1.2.3