From e9ee6992cac74ab65562122e3c52b5ecf717afab Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 10 May 2025 21:28:17 -0500 Subject: [PATCH] + xo-ratio --- .github/workflows/main-stock-ubuntu.yml | 4 ++-- CMakeLists.txt | 2 +- default.nix | 2 +- pkgs/xo-ratio.nix | 31 +++++++++++++++++++++++++ pkgs/xo-userenv.nix | 4 ++-- 5 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 pkgs/xo-ratio.nix diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index 03eb4836..83f360fb 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.github/workflows/main-stock-ubuntu.yml @@ -93,8 +93,8 @@ jobs: echo "::group::xo-pyreflect build" cmake --build .build -- xo-pyreflect - #echo "::group::xo-ratio build" - #cmake --build .build -- xo-ratio + echo "::group::xo-ratio build" + cmake --build .build -- xo-ratio echo "::group::xo build (catch all)" cmake --build .build #--verbose diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d68fff3..ddabfff3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ add_subdirectory(xo-pyutil) add_subdirectory(xo-reflectutil) add_subdirectory(xo-reflect) add_subdirectory(xo-pyreflect) -#add_subdirectory(xo-ratio) +add_subdirectory(xo-ratio) #add_subdirectory(xo-unit) #add_subdirectory(xo-pyunit) #add_subdirectory(xo-expression) diff --git a/default.nix b/default.nix index 18bc79d6..32d3a6fc 100644 --- a/default.nix +++ b/default.nix @@ -48,7 +48,7 @@ let xo-reflectutil = self.callPackage pkgs/xo-reflectutil.nix {}; xo-reflect = self.callPackage pkgs/xo-reflect.nix {}; xo-pyreflect = self.callPackage pkgs/xo-pyreflect.nix {}; -# xo-ratio = self.callPackage pkgs/xo-ratio.nix {}; + xo-ratio = self.callPackage pkgs/xo-ratio.nix {}; # xo-unit = self.callPackage pkgs/xo-unit.nix {}; # xo-pyunit = self.callPackage pkgs/xo-pyunit.nix {}; # xo-expression = self.callPackage pkgs/xo-expression.nix {}; diff --git a/pkgs/xo-ratio.nix b/pkgs/xo-ratio.nix new file mode 100644 index 00000000..8c55ed78 --- /dev/null +++ b/pkgs/xo-ratio.nix @@ -0,0 +1,31 @@ +{ + # dependencies + stdenv, cmake, #catch2, + doxygen, + + python3Packages, + + sphinx, + + xo-cmake, xo-flatstring, xo-reflectutil, +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-ratio"; + version = "1.0"; + + src = ../xo-ratio; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + doCheck = true; + nativeBuildInputs = [ cmake + #catch2 + doxygen + sphinx +# python3Packages.sphinx-rtd-theme + xo-cmake + xo-flatstring + xo-reflectutil + ]; + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index 626a8d4d..102853f6 100644 --- a/pkgs/xo-userenv.nix +++ b/pkgs/xo-userenv.nix @@ -33,7 +33,7 @@ xo-reflectutil, xo-reflect, xo-pyreflect, -# xo-ratio, + xo-ratio, # xo-unit, # xo-pyunit, # xo-printjson, @@ -68,7 +68,7 @@ buildEnv { xo-reflectutil xo-reflect xo-pyreflect -# xo-ratio + xo-ratio # xo-unit # xo-pyunit # xo-expression