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

nix build: + xo.numeric + bugfix xo.procedure2

Browse source
This commit is contained in:
Roland Conybeare 2026-03-05 20:28:33 +11:00
commit 004583423c
3 changed files with 66 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
default.nix
View file

@ -165,6 +165,8 @@ let
xo-object2 = self.callPackage pkgs/xo-object2.nix { stdenv = jitStdenv; };
xo-procedure2 = self.callPackage pkgs/xo-procedure2.nix { stdenv = jitStdenv; };
xo-numeric = self.callPackage pkgs/xo-numeric.nix { stdenv = jitStdenv; };
xo-ordinaltree = self.callPackage pkgs/xo-ordinaltree.nix { stdenv = jitStdenv; };
#
xo-webutil = self.callPackage pkgs/xo-webutil.nix { stdenv = jitStdenv; };
@ -517,8 +519,9 @@ in
gc = pkgs.xo-gc;
object = pkgs.xo-object;
object2 = pkgs.xo-object2;
procedure2 = pkgs.xo-procedure2;
numeric = pkgs.xo-numeric;
ordinaltree = pkgs.xo-ordinaltree;
webutil = pkgs.xo-webutil;
pywebutil = pkgs.xo-pywebutil;

31
pkgs/xo-numeric.nix Normal file
View file

@ -0,0 +1,31 @@
{
# nixpkgs dependencies
lib, stdenv, cmake, catch2,
xo-procedure2,
xo-subsys,
xo-cmake,
doCheck ? true,
} :
stdenv.mkDerivation (finalattrs:
{
name = "xo-numeric";
src = ../xo-numeric;
cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]
++ lib.optionals doCheck ["-DENABLE_TESTING=1"];
inherit doCheck;
nativeBuildInputs = [
cmake catch2
xo-cmake
];
propagatedBuildInputs = [
xo-procedure2
xo-subsys
];
})

31
pkgs/xo-procedure2.nix Normal file
View file

@ -0,0 +1,31 @@
{
# nixpkgs dependencies
lib, stdenv, cmake, catch2,
xo-object2,
xo-subsys,
xo-cmake,
doCheck ? true,
} :
stdenv.mkDerivation (finalattrs:
{
name = "xo-procedure2";
src = ../xo-procedure2;
cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]
++ lib.optionals doCheck ["-DENABLE_TESTING=1"];
inherit doCheck;
nativeBuildInputs = [
cmake catch2
xo-cmake
];
propagatedBuildInputs = [
xo-object2
xo-subsys
];
})