+ xo-statistics

CMakeLists.txt

@@ -89,6 +89,8 @@ add_subdirectory(xo-pyreactor)
 add_subdirectory(xo-websock)
 add_subdirectory(xo-pywebsock)
 #
+add_subdirectory(xo-statistics)
+#
 add_subdirectory(xo-expression)
 add_subdirectory(xo-pyexpression)
 add_subdirectory(xo-tokenizer)
@@ -96,7 +98,6 @@ add_subdirectory(xo-reader)
 add_subdirectory(xo-jit)
 add_subdirectory(xo-pyjit)
 #
-#add_subdirectory(xo-statistics)
 #add_subdirectory(xo-distribution)
 #add_subdirectory(xo-pydistribution)
 #add_subdirectory(xo-simulator)

default.nix

@@ -61,6 +61,8 @@ let
           xo-pyreactor      = self.callPackage pkgs/xo-pyreactor.nix      {};
           xo-websock        = self.callPackage pkgs/xo-websock.nix        {};
           xo-pywebsock      = self.callPackage pkgs/xo-pywebsock.nix      {};
+#
+          xo-statistics     = self.callPackage pkgs/xo-statistics.nix     {};
 #
           xo-expression     = self.callPackage pkgs/xo-expression.nix     {};
           xo-pyexpression   = self.callPackage pkgs/xo-pyexpression.nix   {};
@@ -71,7 +73,6 @@ let
                                                                             clang = llvmPackages.clang;
                                                                             llvm = llvmPackages.llvm; };
           xo-pyjit          = self.callPackage pkgs/xo-pyjit.nix          {};
-#          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-simulator      = self.callPackage pkgs/xo-simulator.nix      {};

pkgs/xo-statistics.nix

@@ -0,0 +1,18 @@
+{
+  # dependencies
+  stdenv, cmake, catch2,
+
+  xo-cmake,
+} :
+
+stdenv.mkDerivation (finalattrs:
+  {
+    name = "xo-statistics";
+    version = "1.0";
+
+    src = ../xo-statistics;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"];
+    doCheck = true;
+    nativeBuildInputs = [ cmake catch2 xo-cmake ];
+  })

pkgs/xo-userenv.nix

@@ -46,10 +46,13 @@
   xo-pyreactor,
   xo-websock,
   xo-pywebsock,
+#
+  xo-statistics,
 #  xo-simulator,
-#  xo-pysimulator, xo-distribution, xo-pydistribution, xo-process, xo-pyprocess, xo-statistics, xo-kalmanfilter,
+  #  xo-pysimulator, xo-distribution, xo-pydistribution, xo-process, xo-pyprocess,
+  #xo-kalmanfilter,
   #  xo-pykalmanfilter,
-
+#
   xo-expression,
   xo-pyexpression,
   xo-tokenizer,
@@ -83,6 +86,12 @@ buildEnv {
             xo-webutil
             xo-pywebutil
             xo-printjson
+            xo-pyprintjson
+            xo-reactor
+            xo-pyreactor
+            xo-websock
+            xo-pywebsock
+            xo-statistics
 #
             xo-expression
             xo-pyexpression
@@ -90,12 +99,6 @@ buildEnv {
             xo-reader
             xo-jit
             xo-pyjit
-            xo-pyprintjson
-            xo-reactor
-            xo-pyreactor
-            xo-websock
-            xo-pywebsock
-#            xo-statistics
 #            xo-distribution
 #            xo-pydistribution
 #            xo-simulator