From 934fec23e7ce2f8427090af97af4f8599d93f711 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 30 May 2026 11:51:31 -0400 Subject: [PATCH] build xo-cmake: py-reflect order [RITUAL] --- CMakeLists.txt | 6 +++--- ci.nix | 1 + pkgs/xo-pyreflect.nix | 3 --- shells.nix | 2 +- xo-cmake/etc/xo/subsystem-list | 4 ++-- xo.nix | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04f28d40..cdb27e96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,15 +90,15 @@ add_subdirectory(xo-printable2) # experiment w/ facet object model add_subdirectory(xo-testutil) # unit test aux functions add_subdirectory(xo-alloc2) # experiment w/ facet object model add_subdirectory(xo-refcnt) -add_subdirectory(xo-reflect) +add_subdirectory(xo-pyutil) +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-type) # experiment w/ facet object model add_subdirectory(xo-procedure2) # schematika procedure abstraction + runtime context (fomo) add_subdirectory(xo-allocutil) # xo-alloc api -add_subdirectory(xo-pyutil) -add_subdirectory(xo-pyreflect) add_subdirectory(xo-ratio) add_subdirectory(xo-unit) add_subdirectory(xo-pyunit) diff --git a/ci.nix b/ci.nix index bb9b5232..beba87b9 100644 --- a/ci.nix +++ b/ci.nix @@ -26,6 +26,7 @@ in xo-refcnt xo-pyutil xo-reflect + xo-pyreflect xo-stringtable2 xo-object2 xo-gc diff --git a/pkgs/xo-pyreflect.nix b/pkgs/xo-pyreflect.nix index 451d485b..2d1275f1 100644 --- a/pkgs/xo-pyreflect.nix +++ b/pkgs/xo-pyreflect.nix @@ -33,17 +33,14 @@ stdenv.mkDerivation (finalattrs: src = ../xo-pyreflect; cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; - doCheck = true; propagatedBuildInputs = [ -# xo-refcnt xo-pyutil xo-reflect ]; nativeBuildInputs = [ cmake -# catch2 xo-cmake python3Packages.pybind11 ]; diff --git a/shells.nix b/shells.nix index f0b84f65..f5b29e54 100644 --- a/shells.nix +++ b/shells.nix @@ -329,11 +329,11 @@ in refcnt = pkgs.xo-refcnt; pyutil = pkgs.xo-pyutil; reflect = pkgs.xo-reflect; + pyreflect = pkgs.xo-pyreflect; stringtable2 = pkgs.xo-stringtable2; object2 = pkgs.xo-object2; gc = pkgs.xo-gc; allocutil = pkgs.xo-allocutil; - pyreflect = pkgs.xo-pyreflect; ratio = pkgs.xo-ratio; unit = pkgs.xo-unit; pyunit = pkgs.xo-pyunit; diff --git a/xo-cmake/etc/xo/subsystem-list b/xo-cmake/etc/xo/subsystem-list index 3240c149..2d02227b 100644 --- a/xo-cmake/etc/xo/subsystem-list +++ b/xo-cmake/etc/xo/subsystem-list @@ -10,7 +10,9 @@ xo-printable2 xo-testutil xo-alloc2 xo-refcnt +xo-pyutil xo-reflect +xo-pyreflect xo-stringtable2 xo-object2 xo-gc @@ -20,8 +22,6 @@ xo-allocutil xo-alloc xo-object xo-ordinaltree -xo-pyutil -xo-pyreflect xo-ratio xo-unit xo-pyunit diff --git a/xo.nix b/xo.nix index 95f6c2c5..6b5852c2 100644 --- a/xo.nix +++ b/xo.nix @@ -39,11 +39,11 @@ let xo-refcnt = callPackage pkgs/xo-refcnt.nix { stdenv = jitStdenv; }; xo-pyutil = callPackage pkgs/xo-pyutil.nix { stdenv = jitStdenv; }; xo-reflect = callPackage pkgs/xo-reflect.nix { stdenv = jitStdenv; }; + xo-pyreflect = callPackage pkgs/xo-pyreflect.nix { stdenv = jitStdenv; }; 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-allocutil = callPackage pkgs/xo-allocutil.nix { stdenv = jitStdenv; }; - xo-pyreflect = callPackage pkgs/xo-pyreflect.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; }; xo-pyunit = callPackage pkgs/xo-pyunit.nix { stdenv = jitStdenv; };