diff --git a/CMakeLists.txt b/CMakeLists.txt index 59dd882b..303dbff8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,7 @@ add_subdirectory(xo-pyunit) # add_subdirectory(xo-callback) add_subdirectory(xo-webutil) +add_subdirectory(xo-pywebutil) # add_subdirectory(xo-expression) add_subdirectory(xo-pyexpression) @@ -89,7 +90,6 @@ add_subdirectory(xo-reader) add_subdirectory(xo-jit) add_subdirectory(xo-pyjit) # -#add_subdirectory(xo-pywebutil) #add_subdirectory(xo-printjson) #add_subdirectory(xo-pyprintjson) #add_subdirectory(xo-reactor) diff --git a/default.nix b/default.nix index 26083539..c659b221 100644 --- a/default.nix +++ b/default.nix @@ -54,6 +54,7 @@ let # xo-callback = self.callPackage pkgs/xo-callback.nix {}; xo-webutil = self.callPackage pkgs/xo-webutil.nix {}; + xo-pywebutil = self.callPackage pkgs/xo-pywebutil.nix {}; # xo-expression = self.callPackage pkgs/xo-expression.nix {}; xo-pyexpression = self.callPackage pkgs/xo-pyexpression.nix {}; @@ -64,7 +65,6 @@ let clang = llvmPackages.clang; llvm = llvmPackages.llvm; }; xo-pyjit = self.callPackage pkgs/xo-pyjit.nix {}; -# xo-pywebutil = self.callPackage pkgs/xo-pywebutil.nix {}; # xo-printjson = self.callPackage pkgs/xo-printjson.nix {}; # xo-pyprintjson = self.callPackage pkgs/xo-pyprintjson.nix {}; # xo-reactor = self.callPackage pkgs/xo-reactor.nix {}; diff --git a/pkgs/xo-pywebutil.nix b/pkgs/xo-pywebutil.nix new file mode 100644 index 00000000..cd078c10 --- /dev/null +++ b/pkgs/xo-pywebutil.nix @@ -0,0 +1,59 @@ +{ + # nixpkgs dependencies + stdenv, cmake, catch2, # ... other deps here + + python3Packages, + + # xo dependencies + xo-cmake, + + xo-webutil, + #xo-refcnt, + #xo-pyutil, + #xo-reflect, + + xo-pyutil, + + # args + + # attrset for fetching source code. + # { type, owner, repo, ref } + # + # e.g. type="github", owner="rconybea", repo="cmake-examples", ref="ex1b" + # + # see [[../flake.nix]] + # + #cmake-examples-ex1-path + + # someconfigurationoption ? false +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-pywebutil"; + version = "1.0"; + + outputs = [ + "out" + ]; + + src = ../xo-pywebutil; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + doCheck = true; + + propagatedBuildInputs = [ +# xo-refcnt + xo-pyutil + xo-webutil +# xo-reflect + ]; + + nativeBuildInputs = [ + cmake +# catch2 + xo-cmake + python3Packages.pybind11 + ]; + + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index dc0b75ef..1dd14d5a 100644 --- a/pkgs/xo-userenv.nix +++ b/pkgs/xo-userenv.nix @@ -39,9 +39,9 @@ # xo-callback, xo-webutil, + xo-pywebutil, # xo-printjson, # xo-pyprintjson, -# xo-pywebutil, # xo-reactor, # xo-pyreactor, # xo-simulator, @@ -79,15 +79,14 @@ buildEnv { # xo-callback xo-webutil + xo-pywebutil # xo-expression xo-pyexpression xo-tokenizer xo-reader xo-jit - # xo-pyjit -# xo-pywebutil # xo-printjson # xo-pyprintjson # xo-reactor