From fd3804f5bef6678cdfc40edab78beb2054bdb4fb Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 31 May 2026 00:13:25 -0400
Subject: [PATCH] nix build: + xo-reader2 + xo-interpreter2 [NIX]

---
 ci.nix                   |  1 +
 pkgs/xo-interpreter2.nix | 33 +++++++++++++++++++++++++++++++++
 pkgs/xo-reader2.nix      |  4 ++--
 shells.nix               |  1 +
 xo.nix                   |  1 +
 5 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/xo-interpreter2.nix

diff --git a/ci.nix b/ci.nix
index fb0c730f..1b4b475f 100644
--- a/ci.nix
+++ b/ci.nix
@@ -36,6 +36,7 @@ in
       xo-tokenizer2
       xo-expression2
       xo-reader2
+      xo-interpreter2
       xo-allocutil
       xo-alloc
       xo-ratio
diff --git a/pkgs/xo-interpreter2.nix b/pkgs/xo-interpreter2.nix
new file mode 100644
index 00000000..ea293da7
--- /dev/null
+++ b/pkgs/xo-interpreter2.nix
@@ -0,0 +1,33 @@
+{
+  # nixpkgs dependencies
+  lib, stdenv, cmake, catch2, replxx,
+
+  # xo dependencies
+  xo-reader2,
+  xo-gc,
+  xo-cmake,
+
+  # config arguments
+  doCheck ? true
+} :
+
+stdenv.mkDerivation (finalattrs :
+  {
+    name = "xo-interpreter2";
+
+    src = ../xo-interpreter2;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]
+                  ++ lib.optionals doCheck ["-DENABLE_TESTING=1"];
+
+    inherit doCheck;
+
+    nativeBuildInputs = [
+      cmake catch2 replxx
+      xo-cmake
+    ];
+    propagatedBuildInputs = [
+      xo-reader2
+      xo-gc
+    ];
+  })
diff --git a/pkgs/xo-reader2.nix b/pkgs/xo-reader2.nix
index 7067c4a8..6f0a4027 100644
--- a/pkgs/xo-reader2.nix
+++ b/pkgs/xo-reader2.nix
@@ -18,9 +18,9 @@
 
 stdenv.mkDerivation (finalattrs :
   {
-    name = "xo-expression2";
+    name = "xo-reader2";
 
-    src = ../xo-expression2;
+    src = ../xo-reader2;
 
     cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]
                   ++ lib.optionals doCheck ["-DENABLE_TESTING=1"];
diff --git a/shells.nix b/shells.nix
index 8078c94a..9f2bf6e3 100644
--- a/shells.nix
+++ b/shells.nix
@@ -342,6 +342,7 @@ in
     tokenizer2     = pkgs.xo-tokenizer2;
     expression2    = pkgs.xo-expression2;
     reader2        = pkgs.xo-reader2;
+    interpreter2   = pkgs.xo-interpreter2;
 
     allocutil      = pkgs.xo-allocutil;
     alloc          = pkgs.xo-alloc;
diff --git a/xo.nix b/xo.nix
index 25dc826b..5a81625f 100644
--- a/xo.nix
+++ b/xo.nix
@@ -49,6 +49,7 @@ let
     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-interpreter2   = callPackage pkgs/xo-interpreter2.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; };