roland/xo-umbrella2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix build: + xo-process + xo-pyprocess [CI]
Some checks failed
CI / smoke-test (push) Failing after 2m47s
Details

Browse source
This commit is contained in:
Roland Conybeare 2026-06-04 08:27:15 -04:00
commit 299ba81625
5 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ci.nix
View file

@ -59,6 +59,8 @@ in
xo-pyreactor
xo-websock
xo-pywebsock
xo-process
xo-pyprocess
xo-userenv
;
}

4
shells.nix
View file

@ -367,13 +367,13 @@ in
pyreactor = pkgs.xo-pyreactor;
websock = pkgs.xo-websock;
pywebsock = pkgs.xo-pywebsock;
process = pkgs.xo-process;
pyprocess = pkgs.xo-pyprocess;
statistics = pkgs.xo-statistics;
distribution = pkgs.xo-distribution;
pydistribution = pkgs.xo-pydistribution;
simulator = pkgs.xo-simulator;
pysimulator = pkgs.xo-pysimulator;
process = pkgs.xo-process;
pyprocess = pkgs.xo-pyprocess;
kalmanfilter = pkgs.xo-kalmanfilter;
pykalmanfilter = pkgs.xo-pykalmanfilter;
};

8
xo-process/cmake/xo-bootstrap-macros.cmake
View file

@ -19,7 +19,13 @@ endif()
message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}")
if (NOT XO_SUBMODULE_BUILD)
if (XO_SUBMODULE_BUILD)
if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix))
# local version of xo-cmake macros
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/xo-cmake/cmake")
message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
endif()
else()
if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix))
# default to typical install location for xo-project-macros
execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH)

8
xo-pyprocess/cmake/xo-bootstrap-macros.cmake
View file

@ -19,7 +19,13 @@ endif()
message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}")
if (NOT XO_SUBMODULE_BUILD)
if (XO_SUBMODULE_BUILD)
if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix))
# local version of xo-cmake macros
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/xo-cmake/cmake")
message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
endif()
else()
if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix))
# default to typical install location for xo-project-macros
execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH)

4
xo.nix
View file

@ -72,13 +72,13 @@ let
xo-pyreactor = callPackage pkgs/xo-pyreactor.nix { stdenv = jitStdenv; };
xo-websock = callPackage pkgs/xo-websock.nix { stdenv = jitStdenv; };
xo-pywebsock = callPackage pkgs/xo-pywebsock.nix { stdenv = jitStdenv; };
xo-process = callPackage pkgs/xo-process.nix { stdenv = jitStdenv; };
xo-pyprocess = callPackage pkgs/xo-pyprocess.nix { stdenv = jitStdenv; };
xo-statistics = callPackage pkgs/xo-statistics.nix {};
xo-distribution = callPackage pkgs/xo-distribution.nix {};
xo-pydistribution = callPackage pkgs/xo-pydistribution.nix {};
xo-simulator = callPackage pkgs/xo-simulator.nix {};
xo-pysimulator = callPackage pkgs/xo-pysimulator.nix {};
xo-process = callPackage pkgs/xo-process.nix {};
xo-pyprocess = callPackage pkgs/xo-pyprocess.nix {};
xo-kalmanfilter = callPackage pkgs/xo-kalmanfilter.nix {};
xo-pykalmanfilter = callPackage pkgs/xo-pykalmanfilter.nix {};
xo-userenv = callPackage pkgs/xo-userenv.nix {};