From 8888986784c73c417110df62254ff958c83200d8 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 30 May 2026 12:05:20 -0400 Subject: [PATCH] build: xo-numeric build order + missing from xo-build --list [SDLC] --- CMakeLists.txt | 2 +- ci.nix | 6 +++--- shells.nix | 6 +++--- xo-cmake/etc/xo/subsystem-list | 1 + xo.nix | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cdb27e96..505dbcd8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,6 +98,7 @@ add_subdirectory(xo-object2) # experiment w/ facet object model add_subdirectory(xo-gc) # experiment w/ facet object model add_subdirectory(xo-type) # experiment w/ facet object model add_subdirectory(xo-procedure2) # schematika procedure abstraction + runtime context (fomo) +add_subdirectory(xo-numeric) # schematika poly arithmetic w/ facet object model add_subdirectory(xo-allocutil) # xo-alloc api add_subdirectory(xo-ratio) add_subdirectory(xo-unit) @@ -106,7 +107,6 @@ add_subdirectory(xo-callback) add_subdirectory(xo-alloc) #add_subdirectory(xo-reflect2) # experiment w/ facet object model add_subdirectory(xo-object) -add_subdirectory(xo-numeric) # experiment w/ facet object model add_subdirectory(xo-ordinaltree) # add_subdirectory(xo-tokenizer2) # schematika tokenizer (fomo) diff --git a/ci.nix b/ci.nix index beba87b9..149c7bb5 100644 --- a/ci.nix +++ b/ci.nix @@ -30,15 +30,15 @@ in xo-stringtable2 xo-object2 xo-gc + xo-type + xo-procedure2 + xo-numeric xo-allocutil xo-ratio xo-unit xo-callback xo-alloc xo-object - xo-type - xo-procedure2 - xo-numeric xo-ordinaltree xo-tokenizer2 xo-expression diff --git a/shells.nix b/shells.nix index f5b29e54..9b7bd162 100644 --- a/shells.nix +++ b/shells.nix @@ -333,6 +333,9 @@ in stringtable2 = pkgs.xo-stringtable2; object2 = pkgs.xo-object2; gc = pkgs.xo-gc; + type = pkgs.xo-type; + procedure2 = pkgs.xo-procedure2; + numeric = pkgs.xo-numeric; allocutil = pkgs.xo-allocutil; ratio = pkgs.xo-ratio; unit = pkgs.xo-unit; @@ -340,9 +343,6 @@ in callback = pkgs.xo-callback; alloc = pkgs.xo-alloc; object = pkgs.xo-object; - type = pkgs.xo-type; - procedure2 = pkgs.xo-procedure2; - numeric = pkgs.xo-numeric; ordinaltree = pkgs.xo-ordinaltree; tokenizer2 = pkgs.xo-tokenizer2; diff --git a/xo-cmake/etc/xo/subsystem-list b/xo-cmake/etc/xo/subsystem-list index 2d02227b..48473e50 100644 --- a/xo-cmake/etc/xo/subsystem-list +++ b/xo-cmake/etc/xo/subsystem-list @@ -18,6 +18,7 @@ xo-object2 xo-gc xo-type xo-procedure2 +xo-numeric xo-allocutil xo-alloc xo-object diff --git a/xo.nix b/xo.nix index 6b5852c2..f5d83531 100644 --- a/xo.nix +++ b/xo.nix @@ -43,6 +43,9 @@ let xo-stringtable2 = callPackage pkgs/xo-stringtable2.nix { stdenv = jitStdenv; }; xo-object2 = callPackage pkgs/xo-object2.nix { stdenv = jitStdenv; }; xo-gc = callPackage pkgs/xo-gc.nix { stdenv = jitStdenv; buildDocs = true; }; + xo-type = callPackage pkgs/xo-type.nix { stdenv = jitStdenv; }; + xo-procedure2 = callPackage pkgs/xo-procedure2.nix { stdenv = jitStdenv; }; + xo-numeric = callPackage pkgs/xo-numeric.nix { stdenv = jitStdenv; }; xo-allocutil = callPackage pkgs/xo-allocutil.nix { stdenv = jitStdenv; }; xo-ratio = callPackage pkgs/xo-ratio.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; }; xo-unit = callPackage pkgs/xo-unit.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; }; @@ -50,9 +53,6 @@ let xo-callback = callPackage pkgs/xo-callback.nix { stdenv = jitStdenv; }; xo-alloc = callPackage pkgs/xo-alloc.nix { stdenv = jitStdenv; buildDocs = true; }; xo-object = callPackage pkgs/xo-object.nix { stdenv = jitStdenv; }; - xo-type = callPackage pkgs/xo-type.nix { stdenv = jitStdenv; }; - xo-procedure2 = callPackage pkgs/xo-procedure2.nix { stdenv = jitStdenv; }; - xo-numeric = callPackage pkgs/xo-numeric.nix { stdenv = jitStdenv; }; xo-ordinaltree = callPackage pkgs/xo-ordinaltree.nix { stdenv = jitStdenv; }; xo-tokenizer2 = callPackage pkgs/xo-tokenizer2.nix { stdenv = jitStdenv; buildExamples = true; }; xo-webutil = callPackage pkgs/xo-webutil.nix { stdenv = jitStdenv; };