diff --git a/CMakeLists.txt b/CMakeLists.txt index 15347ab4..63947175 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,6 +91,7 @@ add_subdirectory(xo-pywebsock) # add_subdirectory(xo-statistics) add_subdirectory(xo-distribution) +add_subdirectory(xo-pydistribution) # add_subdirectory(xo-expression) add_subdirectory(xo-pyexpression) @@ -99,7 +100,6 @@ add_subdirectory(xo-reader) add_subdirectory(xo-jit) add_subdirectory(xo-pyjit) # -#add_subdirectory(xo-pydistribution) #add_subdirectory(xo-simulator) #add_subdirectory(xo-pysimulator) #add_subdirectory(xo-process) diff --git a/default.nix b/default.nix index c446a56b..d25b6e70 100644 --- a/default.nix +++ b/default.nix @@ -64,6 +64,7 @@ let # xo-statistics = self.callPackage pkgs/xo-statistics.nix {}; xo-distribution = self.callPackage pkgs/xo-distribution.nix {}; + xo-pydistribution = self.callPackage pkgs/xo-pydistribution.nix {}; # xo-expression = self.callPackage pkgs/xo-expression.nix {}; xo-pyexpression = self.callPackage pkgs/xo-pyexpression.nix {}; @@ -74,7 +75,7 @@ let clang = llvmPackages.clang; llvm = llvmPackages.llvm; }; xo-pyjit = self.callPackage pkgs/xo-pyjit.nix {}; -# xo-pydistribution = self.callPackage pkgs/xo-pydistribution.nix {}; + # xo-simulator = self.callPackage pkgs/xo-simulator.nix {}; # xo-pysimulator = self.callPackage pkgs/xo-pysimulator.nix {}; # xo-process = self.callPackage pkgs/xo-process.nix {}; diff --git a/pkgs/xo-pydistribution.nix b/pkgs/xo-pydistribution.nix new file mode 100644 index 00000000..1f00d7a7 --- /dev/null +++ b/pkgs/xo-pydistribution.nix @@ -0,0 +1,33 @@ +{ + # nixpkgs dependencies + stdenv, cmake, catch2, + + #python3Packages, + + # xo dependencies + xo-cmake, + #xo-refcnt, + xo-distribution, + + xo-pyutil, + #xo-pyreflect, +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-pydistribution"; + + src = ../xo-pydistribution; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + #doCheck = true; + nativeBuildInputs = [ cmake catch2 xo-cmake ]; + propagatedBuildInputs = [ + xo-distribution + xo-pyutil +# xo-pyreflect +# xo-refcnt +# python3Packages.python +# python3Packages.pybind11 + ]; + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index 85376f0c..c1d1c02c 100644 --- a/pkgs/xo-userenv.nix +++ b/pkgs/xo-userenv.nix @@ -49,9 +49,10 @@ # xo-statistics, xo-distribution, + xo-pydistribution, # xo-simulator, # xo-pysimulator, -# xo-pydistribution, xo-process, xo-pyprocess, + #xo-process, xo-pyprocess, #xo-kalmanfilter, # xo-pykalmanfilter, # @@ -95,6 +96,7 @@ buildEnv { xo-pywebsock xo-statistics xo-distribution + xo-pydistribution # xo-expression xo-pyexpression @@ -102,7 +104,6 @@ buildEnv { xo-reader xo-jit xo-pyjit -# xo-pydistribution # xo-simulator # xo-pysimulator # xo-process