From 84ba84693e01fa546b557bd9e78c41f48896fa6b Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 11 May 2025 15:56:32 -0500
Subject: [PATCH] + xo-distribution

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87fb4716..15347ab4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,6 +90,7 @@ add_subdirectory(xo-websock)
 add_subdirectory(xo-pywebsock)
 #
 add_subdirectory(xo-statistics)
+add_subdirectory(xo-distribution)
 #
 add_subdirectory(xo-expression)
 add_subdirectory(xo-pyexpression)
@@ -98,7 +99,6 @@ add_subdirectory(xo-reader)
 add_subdirectory(xo-jit)
 add_subdirectory(xo-pyjit)
 #
-#add_subdirectory(xo-distribution)
 #add_subdirectory(xo-pydistribution)
 #add_subdirectory(xo-simulator)
 #add_subdirectory(xo-pysimulator)
diff --git a/default.nix b/default.nix
index 887501da..c446a56b 100644
--- a/default.nix
+++ b/default.nix
@@ -63,6 +63,7 @@ let
           xo-pywebsock      = self.callPackage pkgs/xo-pywebsock.nix      {};
 #
           xo-statistics     = self.callPackage pkgs/xo-statistics.nix     {};
+          xo-distribution   = self.callPackage pkgs/xo-distribution.nix   {};
 #
           xo-expression     = self.callPackage pkgs/xo-expression.nix     {};
           xo-pyexpression   = self.callPackage pkgs/xo-pyexpression.nix   {};
@@ -73,7 +74,6 @@ let
                                                                             clang = llvmPackages.clang;
                                                                             llvm = llvmPackages.llvm; };
           xo-pyjit          = self.callPackage pkgs/xo-pyjit.nix          {};
-#          xo-distribution   = self.callPackage pkgs/xo-distribution.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    {};
diff --git a/pkgs/xo-distribution.nix b/pkgs/xo-distribution.nix
new file mode 100644
index 00000000..45e39a2b
--- /dev/null
+++ b/pkgs/xo-distribution.nix
@@ -0,0 +1,24 @@
+{
+  # dependencies
+  stdenv, cmake, catch2,
+
+  xo-cmake,
+  xo-refcnt,
+} :
+
+stdenv.mkDerivation (finalattrs:
+  {
+    name = "xo-distribution";
+    version = "1.0";
+
+    src = ../xo-distribution;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"];
+    doCheck = true;
+    nativeBuildInputs = [
+      cmake catch2 xo-cmake
+    ];
+    propagatedBuildInputs = [
+      xo-refcnt
+    ];
+  })
diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix
index a18c7d94..85376f0c 100644
--- a/pkgs/xo-userenv.nix
+++ b/pkgs/xo-userenv.nix
@@ -48,8 +48,10 @@
   xo-pywebsock,
 #
   xo-statistics,
+  xo-distribution,
 #  xo-simulator,
-  #  xo-pysimulator, xo-distribution, xo-pydistribution, xo-process, xo-pyprocess,
+  #  xo-pysimulator,
+#  xo-pydistribution, xo-process, xo-pyprocess,
   #xo-kalmanfilter,
   #  xo-pykalmanfilter,
 #
@@ -92,6 +94,7 @@ buildEnv {
             xo-websock
             xo-pywebsock
             xo-statistics
+            xo-distribution
 #
             xo-expression
             xo-pyexpression
@@ -99,7 +102,6 @@ buildEnv {
             xo-reader
             xo-jit
             xo-pyjit
-#            xo-distribution
 #            xo-pydistribution
 #            xo-simulator
 #            xo-pysimulator