From 5a5f43b56e84f4994f8495960ed688e684b7c067 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 30 May 2026 12:42:40 -0400 Subject: [PATCH] build: xo-alloc dep order [RITUAL] --- CMakeLists.txt | 4 ++-- ci.nix | 2 +- shells.nix | 2 +- xo.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 505dbcd8..c2158b75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,16 +95,16 @@ add_subdirectory(xo-reflect) # reflection library (pre-fomo) add_subdirectory(xo-pyreflect) add_subdirectory(xo-stringtable2) # experiment w/ facet object model add_subdirectory(xo-object2) # experiment w/ facet object model -add_subdirectory(xo-gc) # experiment w/ facet object model +add_subdirectory(xo-gc) # incremental gc + 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-alloc) # arena allocator + incremental gc add_subdirectory(xo-ratio) add_subdirectory(xo-unit) add_subdirectory(xo-pyunit) add_subdirectory(xo-callback) -add_subdirectory(xo-alloc) #add_subdirectory(xo-reflect2) # experiment w/ facet object model add_subdirectory(xo-object) add_subdirectory(xo-ordinaltree) diff --git a/ci.nix b/ci.nix index 149c7bb5..ff706be8 100644 --- a/ci.nix +++ b/ci.nix @@ -34,10 +34,10 @@ in xo-procedure2 xo-numeric xo-allocutil + xo-alloc xo-ratio xo-unit xo-callback - xo-alloc xo-object xo-ordinaltree xo-tokenizer2 diff --git a/shells.nix b/shells.nix index 9b7bd162..b6b82b65 100644 --- a/shells.nix +++ b/shells.nix @@ -337,11 +337,11 @@ in procedure2 = pkgs.xo-procedure2; numeric = pkgs.xo-numeric; allocutil = pkgs.xo-allocutil; + alloc = pkgs.xo-alloc; ratio = pkgs.xo-ratio; unit = pkgs.xo-unit; pyunit = pkgs.xo-pyunit; callback = pkgs.xo-callback; - alloc = pkgs.xo-alloc; object = pkgs.xo-object; ordinaltree = pkgs.xo-ordinaltree; tokenizer2 = pkgs.xo-tokenizer2; diff --git a/xo.nix b/xo.nix index f5d83531..5a9eaf64 100644 --- a/xo.nix +++ b/xo.nix @@ -47,11 +47,11 @@ let 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-alloc = callPackage pkgs/xo-alloc.nix { stdenv = jitStdenv; buildDocs = true; }; 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; }; xo-pyunit = callPackage pkgs/xo-pyunit.nix { stdenv = jitStdenv; }; 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-ordinaltree = callPackage pkgs/xo-ordinaltree.nix { stdenv = jitStdenv; }; xo-tokenizer2 = callPackage pkgs/xo-tokenizer2.nix { stdenv = jitStdenv; buildExamples = true; };