diff --git a/default.nix b/default.nix index c0c71edf..f8e6bfd3 100644 --- a/default.nix +++ b/default.nix @@ -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; diff --git a/pkgs/xo-numeric.nix b/pkgs/xo-numeric.nix new file mode 100644 index 00000000..20c80167 --- /dev/null +++ b/pkgs/xo-numeric.nix @@ -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 + ]; + }) diff --git a/pkgs/xo-procedure2.nix b/pkgs/xo-procedure2.nix new file mode 100644 index 00000000..53dc8155 --- /dev/null +++ b/pkgs/xo-procedure2.nix @@ -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 + ]; + })