From a2a8b936b98c6fd795a472f0a13504e5441e7467 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 11 May 2025 14:51:22 -0500
Subject: [PATCH] + xo-webutil

---
 CMakeLists.txt      |  2 +-
 default.nix         |  2 +-
 pkgs/xo-userenv.nix |  4 ++--
 pkgs/xo-webutil.nix | 30 ++++++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/xo-webutil.nix

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 281407f4..59dd882b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,6 +80,7 @@ add_subdirectory(xo-unit)
 add_subdirectory(xo-pyunit)
 #
 add_subdirectory(xo-callback)
+add_subdirectory(xo-webutil)
 #
 add_subdirectory(xo-expression)
 add_subdirectory(xo-pyexpression)
@@ -88,7 +89,6 @@ add_subdirectory(xo-reader)
 add_subdirectory(xo-jit)
 add_subdirectory(xo-pyjit)
 #
-#add_subdirectory(xo-webutil)
 #add_subdirectory(xo-pywebutil)
 #add_subdirectory(xo-printjson)
 #add_subdirectory(xo-pyprintjson)
diff --git a/default.nix b/default.nix
index ec39b4ca..26083539 100644
--- a/default.nix
+++ b/default.nix
@@ -53,6 +53,7 @@ let
           xo-pyunit         = self.callPackage pkgs/xo-pyunit.nix         {};
 #
           xo-callback       = self.callPackage pkgs/xo-callback.nix       {};
+          xo-webutil        = self.callPackage pkgs/xo-webutil.nix        {};
 #
           xo-expression     = self.callPackage pkgs/xo-expression.nix     {};
           xo-pyexpression   = self.callPackage pkgs/xo-pyexpression.nix   {};
@@ -63,7 +64,6 @@ let
                                                                             clang = llvmPackages.clang;
                                                                             llvm = llvmPackages.llvm; };
           xo-pyjit          = self.callPackage pkgs/xo-pyjit.nix          {};
-#          xo-webutil        = self.callPackage pkgs/xo-webutil.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    {};
diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix
index 8591740a..dc0b75ef 100644
--- a/pkgs/xo-userenv.nix
+++ b/pkgs/xo-userenv.nix
@@ -38,9 +38,9 @@
   xo-pyunit,
 #
   xo-callback,
+  xo-webutil,
 #  xo-printjson,
 #  xo-pyprintjson,
-#  xo-webutil,
 #  xo-pywebutil,
 #  xo-reactor,
 #  xo-pyreactor,
@@ -78,6 +78,7 @@ buildEnv {
             xo-pyunit
 #
             xo-callback
+            xo-webutil
 #
             xo-expression
             xo-pyexpression
@@ -86,7 +87,6 @@ buildEnv {
             xo-jit
 
 #            xo-pyjit
-#            xo-webutil
 #            xo-pywebutil
 #            xo-printjson
 #            xo-pyprintjson
diff --git a/pkgs/xo-webutil.nix b/pkgs/xo-webutil.nix
new file mode 100644
index 00000000..9175f6ff
--- /dev/null
+++ b/pkgs/xo-webutil.nix
@@ -0,0 +1,30 @@
+{
+  # nixpkgs dependencies
+  stdenv, cmake, catch2,
+
+  # xo dependencies
+  xo-cmake,
+  xo-callback,
+  xo-refcnt,
+#  xo-reflect,
+    #, xo-indentlog,
+} :
+
+stdenv.mkDerivation (finalattrs:
+  {
+    name = "xo-webutil";
+
+    src = ../xo-webutil;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"];
+    doCheck = true;
+    nativeBuildInputs = [
+      cmake catch2 xo-cmake
+    ];
+    propagatedBuildInputs = [
+      xo-callback
+      xo-refcnt
+#      xo-reflect
+#      xo-indentlog
+    ];
+  })