From aaa38642299a7ae56ae376316e11ee070c8bcde0 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 10 May 2025 18:55:31 -0500 Subject: [PATCH] + xo-randomgen --- CMakeLists.txt | 2 +- default.nix | 2 +- pkgs/xo-randomgen.nix | 19 +++++++++++++++++++ pkgs/xo-userenv.nix | 4 ++-- 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 pkgs/xo-randomgen.nix diff --git a/CMakeLists.txt b/CMakeLists.txt index cb162524..778b546d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ add_subdirectory(xo-cmake) add_subdirectory(xo-indentlog) add_subdirectory(xo-refcnt) add_subdirectory(xo-subsys) -#add_subdirectory(xo-randomgen) +add_subdirectory(xo-randomgen) #add_subdirectory(xo-ordinaltree) #add_subdirectory(xo-pyutil) #add_subdirectory(xo-flatstring) diff --git a/default.nix b/default.nix index 5e712771..35cd0d78 100644 --- a/default.nix +++ b/default.nix @@ -41,7 +41,7 @@ let xo-indentlog = self.callPackage pkgs/xo-indentlog.nix {}; xo-refcnt = self.callPackage pkgs/xo-refcnt.nix {}; xo-subsys = self.callPackage pkgs/xo-subsys.nix {}; -# xo-randomgen = self.callPackage pkgs/xo-randomgen.nix {}; + xo-randomgen = self.callPackage pkgs/xo-randomgen.nix {}; # xo-ordinaltree = self.callPackage pkgs/xo-ordinaltree.nix {}; # xo-pyutil = self.callPackage pkgs/xo-pyutil.nix {}; # xo-flatstring = self.callPackage pkgs/xo-flatstring.nix {}; diff --git a/pkgs/xo-randomgen.nix b/pkgs/xo-randomgen.nix new file mode 100644 index 00000000..931d79a8 --- /dev/null +++ b/pkgs/xo-randomgen.nix @@ -0,0 +1,19 @@ +{ + # nixpkgs dependencies + stdenv, cmake, catch2, + + # xo dependencies + xo-cmake, xo-indentlog, +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-randomgen"; + + src = ../xo-randomgen; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + doCheck = true; + nativeBuildInputs = [ cmake catch2 xo-cmake ]; + propagatedBuildInputs = [ xo-indentlog ]; + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index da6f68c7..d2ec7ae0 100644 --- a/pkgs/xo-userenv.nix +++ b/pkgs/xo-userenv.nix @@ -26,7 +26,7 @@ xo-indentlog, xo-refcnt, xo-subsys, -# xo-randomgen, + xo-randomgen, # xo-ordinaltree, # xo-flatstring, # xo-reflectutil, @@ -61,7 +61,7 @@ buildEnv { xo-indentlog xo-refcnt xo-subsys -# xo-randomgen + xo-randomgen # xo-ordinaltree # xo-pyutil # xo-flatstring