nix build: + xo-reader2 [NIX]

ci.nix

@@ -35,6 +35,7 @@ in
       xo-numeric
       xo-tokenizer2
       xo-expression2
+      xo-reader2
       xo-allocutil
       xo-alloc
       xo-ratio

pkgs/xo-reader2.nix

@@ -0,0 +1,43 @@
+{
+  # nixpkgs dependencies
+  lib, stdenv, cmake, catch2,
+
+  # xo dependencies
+  xo-numeric,
+  xo-procedure2,
+  xo-type,
+  xo-expression2,
+  xo-tokenizer2,
+  xo-gc,
+  xo-subsys,
+  xo-cmake,
+
+  # config arguments
+  doCheck ? true
+} :
+
+stdenv.mkDerivation (finalattrs :
+  {
+    name = "xo-expression2";
+
+    src = ../xo-expression2;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]
+                  ++ lib.optionals doCheck ["-DENABLE_TESTING=1"];
+
+    inherit doCheck;
+
+    nativeBuildInputs = [
+      cmake catch2
+      xo-cmake
+    ];
+    propagatedBuildInputs = [
+      xo-numeric
+      xo-procedure2
+      xo-type
+      xo-expression2
+      xo-tokenizer2
+      xo-gc
+      xo-subsys
+    ];
+  })

shells.nix

@@ -341,6 +341,7 @@ in
     numeric        = pkgs.xo-numeric;
     tokenizer2     = pkgs.xo-tokenizer2;
     expression2    = pkgs.xo-expression2;
+    reader2        = pkgs.xo-reader2;
 
     allocutil      = pkgs.xo-allocutil;
     alloc          = pkgs.xo-alloc;

xo-reader2/src/reader2/CMakeLists.txt

@@ -112,7 +112,4 @@ xo_dependency(${SELF_LIB} xo_gc)
 xo_dependency(${SELF_LIB} xo_type)
 xo_dependency(${SELF_LIB} xo_tokenizer2)
 xo_dependency(${SELF_LIB} xo_expression2)
-#xo_dependency(${SELF_LIB} reflect)
-#xo_dependency(${SELF_LIB} xo_flatstring)
 xo_dependency(${SELF_LIB} subsys)
-#xo_dependency(${SELF_LIB} indentlog)

xo.nix

@@ -48,6 +48,7 @@ let
     xo-numeric        = callPackage pkgs/xo-numeric.nix        { stdenv = jitStdenv; };
     xo-tokenizer2     = callPackage pkgs/xo-tokenizer2.nix     { stdenv = jitStdenv;                   buildExamples = true; };
     xo-expression2    = callPackage pkgs/xo-expression2.nix    { stdenv = jitStdenv; };
+    xo-reader2        = callPackage pkgs/xo-reader2.nix        { stdenv = jitStdenv; };
     xo-allocutil      = callPackage pkgs/xo-allocutil.nix      { stdenv = jitStdenv; };
     xo-alloc          = callPackage pkgs/xo-alloc.nix          { stdenv = jitStdenv; buildDocs = true; };
     xo-ratio          = callPackage pkgs/xo-ratio.nix          { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };