roland/xo-umbrella2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor nix: consolidate xo deps

Browse source 
default.nix now uses xo.nix for each xo dep
This commit is contained in:
Roland Conybeare 2026-05-25 12:11:36 -04:00
commit 6c7a6c5e4a
5 changed files with 116 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ci.nix
View file

@ -6,6 +6,7 @@
let let
pkgs = import nixpkgs-path {}; pkgs = import nixpkgs-path {};
# xo.nix now returns a plain attrset (not pkgs.extend)
xoPkgs = import ./xo.nix { inherit pkgs; }; xoPkgs = import ./xo.nix { inherit pkgs; };
in in

106
default.nix
View file

@ -112,111 +112,9 @@ let
}); });
}; };
# xo packages defined in xo.nix; wrap as overlay so pkgs.xo-* works
xo-overlay = self: super: xo-overlay = self: super:
# use 'super' when you want to override the terms of a package. import ./xo.nix { pkgs = self; };
# use 'self' when pointing to an existing package
let
# note:
# - problems with nix llvm build-from-source w/ gcc 13.3.
# - building outside nix following linuxfromscratch instructions, using gcc 12.3, works fine.
#
llvmXo = self.callPackage pkgs/llvm.nix {};
# Choose the LLVM version you want
llvmPackages1 = super.llvmPackages_18;
in
let
# on darwin, rebuild stdenv to use clang tied to that LLVM version.
# otherwise we get conflicts since darwin stdenv is using clang+llvm for gcc.
#
clangStdenv = super.overrideCC super.stdenv llvmPackages1.clang;
# stdenv to use for xo-jit
jitStdenv = if super.stdenv.isDarwin then clangStdenv else super.stdenv;
in
{
xo-cmake = self.callPackage pkgs/xo-cmake.nix { stdenv = jitStdenv; };
xo-indentlog = self.callPackage pkgs/xo-indentlog.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-reflectutil = self.callPackage pkgs/xo-reflectutil.nix { stdenv = jitStdenv; };
xo-randomgen = self.callPackage pkgs/xo-randomgen.nix { stdenv = jitStdenv; buildExamples = true; };
xo-arena = self.callPackage pkgs/xo-arena.nix { stdenv = jitStdenv; buildDocs = true; };
xo-facet = self.callPackage pkgs/xo-facet.nix { stdenv = jitStdenv; };
xo-allocutil = self.callPackage pkgs/xo-allocutil.nix { stdenv = jitStdenv; };
xo-refcnt = self.callPackage pkgs/xo-refcnt.nix { stdenv = jitStdenv; };
xo-subsys = self.callPackage pkgs/xo-subsys.nix { stdenv = jitStdenv; };
xo-testutil = self.callPackage pkgs/xo-testutil.nix { stdenv = jitStdenv; };
xo-flatstring = self.callPackage pkgs/xo-flatstring.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-pyutil = self.callPackage pkgs/xo-pyutil.nix { stdenv = jitStdenv; };
xo-reflect = self.callPackage pkgs/xo-reflect.nix { stdenv = jitStdenv; };
xo-pyreflect = self.callPackage pkgs/xo-pyreflect.nix { stdenv = jitStdenv; };
xo-ratio = self.callPackage pkgs/xo-ratio.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-unit = self.callPackage pkgs/xo-unit.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-pyunit = self.callPackage pkgs/xo-pyunit.nix { stdenv = jitStdenv; };
xo-callback = self.callPackage pkgs/xo-callback.nix { stdenv = jitStdenv; };
xo-printable2 = self.callPackage pkgs/xo-printable2.nix { stdenv = jitStdenv; };
xo-alloc = self.callPackage pkgs/xo-alloc.nix { stdenv = jitStdenv; buildDocs = true; };
xo-alloc2 = self.callPackage pkgs/xo-alloc2.nix { stdenv = jitStdenv; buildDocs = true; };
xo-stringtable2 = self.callPackage pkgs/xo-stringtable2.nix { stdenv = jitStdenv; };
xo-gc = self.callPackage pkgs/xo-gc.nix { stdenv = jitStdenv; buildDocs = true; };
xo-object = self.callPackage pkgs/xo-object.nix { stdenv = jitStdenv; };
xo-type = self.callPackage pkgs/xo-type.nix { stdenv = jitStdenv; };
xo-object2 = self.callPackage pkgs/xo-object2.nix { stdenv = jitStdenv; };
xo-procedure2 = self.callPackage pkgs/xo-procedure2.nix { stdenv = jitStdenv; };
xo-numeric = self.callPackage pkgs/xo-numeric.nix { stdenv = jitStdenv; };
xo-ordinaltree = self.callPackage pkgs/xo-ordinaltree.nix { stdenv = jitStdenv; };
xo-tokenizer2 = self.callPackage pkgs/xo-tokenizer2.nix { stdenv = jitStdenv; buildExamples = true; };
#
# xo-expression2
# xo-reader2
# xo-interpreter2
#
xo-webutil = self.callPackage pkgs/xo-webutil.nix { stdenv = jitStdenv; };
xo-pywebutil = self.callPackage pkgs/xo-pywebutil.nix {};
xo-printjson = self.callPackage pkgs/xo-printjson.nix {};
xo-pyprintjson = self.callPackage pkgs/xo-pyprintjson.nix {};
xo-reactor = self.callPackage pkgs/xo-reactor.nix {};
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-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 {};
xo-process = self.callPackage pkgs/xo-process.nix {};
xo-pyprocess = self.callPackage pkgs/xo-pyprocess.nix {};
xo-kalmanfilter = self.callPackage pkgs/xo-kalmanfilter.nix {};
xo-pykalmanfilter = self.callPackage pkgs/xo-pykalmanfilter.nix {};
#
xo-expression = self.callPackage pkgs/xo-expression.nix { buildExamples = true; };
xo-pyexpression = self.callPackage pkgs/xo-pyexpression.nix {};
xo-tokenizer = self.callPackage pkgs/xo-tokenizer.nix { buildDocs = true; buildExamples = true; };
xo-reader = self.callPackage pkgs/xo-reader.nix { buildDocs = true; buildExamples = true; };
xo-jit = self.callPackage pkgs/xo-jit.nix { buildDocs = true; buildExamples = true;
#stdenv = jitStdenv;
#clang = llvmPackages2.clang;
llvm = llvmPackages1.llvm; };
xo-pyjit = self.callPackage pkgs/xo-pyjit.nix {};
#
xo-userenv = self.callPackage pkgs/xo-userenv.nix {};
xo-userenv-slow = self.callPackage pkgs/xo-userenv-slow.nix { stdenv = jitStdenv;
#clang = llvmPackages.clang;
llvm = llvmPackages1.llvm;
};
# xo-packaged version of llvm; fewer packaging features than nixpkgs
# but easier to debug/modify
llvmXo = llvmXo;
};
in in
let let

18
patches/git-subtree-cache-fix.patch Normal file
View file

@ -0,0 +1,18 @@
--- a/git-subtree
+++ b/git-subtree
@@ -341,7 +341,13 @@ cache_set () {
if test "$oldrev" != "latest_old" &&
test "$oldrev" != "latest_new" &&
test -e "$cachedir/$oldrev"
then
- die "fatal: cache for $oldrev already exists!"
+ existing=$(cat "$cachedir/$oldrev")
+ if test "$existing" = "$newrev"
+ then
+ return
+ else
+ die "fatal: cache for $oldrev already exists!"
+ fi
fi
echo "$newrev" >"$cachedir/$oldrev"
}

17
patches/junk Normal file
View file

@ -0,0 +1,17 @@
--- a/git-subtree
+++ b/git-subtree
@@ -339,7 +339,13 @@ cache_set () {
test "$oldrev" != "latest_new" &&
test -e "$cachedir/$oldrev"
then
- die "fatal: cache for $oldrev already exists!"
+ existing=$(cat "$cachedir/$oldrev")
+ if test "$existing" = "$newrev"
+ then
+ return
+ else
+ die "fatal: cache for $oldrev already exists!"
+ fi
fi
echo "$newrev" >"$cachedir/$oldrev"
}

147
xo.nix
View file

@ -1,83 +1,88 @@
# xo.nix - xo package overlay, independent of nixpkgs source # xo.nix - xo package set, independent of nixpkgs source
# Accepts a pkgs instance (with or without non-xo overlays applied) # Accepts a pkgs instance (with or without non-xo overlays applied)
# Returns pkgs extended with xo packages # Returns attrset of xo packages.
#
# Callers decide how to consume:
# ci.nix - uses as plain attrset
# default.nix - wraps as overlay for dev shell
# #
{ pkgs }: { pkgs }:
let let
xo-overlay = self: super: inherit (pkgs) lib stdenv;
let
llvmXo = self.callPackage pkgs/llvm.nix {};
llvmPackages1 = super.llvmPackages_18; llvmXo = lib.callPackageWith (pkgs // xoPackages) pkgs/llvm.nix {};
clangStdenv = super.overrideCC super.stdenv llvmPackages1.clang; llvmPackages1 = pkgs.llvmPackages_18;
jitStdenv = if super.stdenv.isDarwin then clangStdenv else super.stdenv; clangStdenv = pkgs.overrideCC stdenv llvmPackages1.clang;
in
{ # stdenv to use for xo-jit and friends
xo-cmake = self.callPackage pkgs/xo-cmake.nix { stdenv = jitStdenv; }; jitStdenv = if stdenv.isDarwin then clangStdenv else stdenv;
xo-indentlog = self.callPackage pkgs/xo-indentlog.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-reflectutil = self.callPackage pkgs/xo-reflectutil.nix { stdenv = jitStdenv; }; # callPackageWith sees both nixpkgs AND xo packages,
xo-randomgen = self.callPackage pkgs/xo-randomgen.nix { stdenv = jitStdenv; buildExamples = true; }; # so xo-alloc2 can resolve xo-arena etc.
xo-arena = self.callPackage pkgs/xo-arena.nix { stdenv = jitStdenv; buildDocs = true; }; callPackage = lib.callPackageWith (pkgs // xoPackages);
xo-facet = self.callPackage pkgs/xo-facet.nix { stdenv = jitStdenv; };
xo-allocutil = self.callPackage pkgs/xo-allocutil.nix { stdenv = jitStdenv; }; xoPackages = {
xo-refcnt = self.callPackage pkgs/xo-refcnt.nix { stdenv = jitStdenv; }; xo-cmake = callPackage pkgs/xo-cmake.nix { stdenv = jitStdenv; };
xo-subsys = self.callPackage pkgs/xo-subsys.nix { stdenv = jitStdenv; }; xo-indentlog = callPackage pkgs/xo-indentlog.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-testutil = self.callPackage pkgs/xo-testutil.nix { stdenv = jitStdenv; }; xo-reflectutil = callPackage pkgs/xo-reflectutil.nix { stdenv = jitStdenv; };
xo-flatstring = self.callPackage pkgs/xo-flatstring.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; }; xo-randomgen = callPackage pkgs/xo-randomgen.nix { stdenv = jitStdenv; buildExamples = true; };
xo-pyutil = self.callPackage pkgs/xo-pyutil.nix { stdenv = jitStdenv; }; xo-arena = callPackage pkgs/xo-arena.nix { stdenv = jitStdenv; buildDocs = true; };
xo-reflect = self.callPackage pkgs/xo-reflect.nix { stdenv = jitStdenv; }; xo-facet = callPackage pkgs/xo-facet.nix { stdenv = jitStdenv; };
xo-pyreflect = self.callPackage pkgs/xo-pyreflect.nix { stdenv = jitStdenv; }; xo-allocutil = callPackage pkgs/xo-allocutil.nix { stdenv = jitStdenv; };
xo-ratio = self.callPackage pkgs/xo-ratio.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; }; xo-refcnt = callPackage pkgs/xo-refcnt.nix { stdenv = jitStdenv; };
xo-unit = self.callPackage pkgs/xo-unit.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; }; xo-subsys = callPackage pkgs/xo-subsys.nix { stdenv = jitStdenv; };
xo-pyunit = self.callPackage pkgs/xo-pyunit.nix { stdenv = jitStdenv; }; xo-testutil = callPackage pkgs/xo-testutil.nix { stdenv = jitStdenv; };
xo-callback = self.callPackage pkgs/xo-callback.nix { stdenv = jitStdenv; }; xo-flatstring = callPackage pkgs/xo-flatstring.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-printable2 = self.callPackage pkgs/xo-printable2.nix { stdenv = jitStdenv; }; xo-pyutil = callPackage pkgs/xo-pyutil.nix { stdenv = jitStdenv; };
xo-alloc = self.callPackage pkgs/xo-alloc.nix { stdenv = jitStdenv; buildDocs = true; }; xo-reflect = callPackage pkgs/xo-reflect.nix { stdenv = jitStdenv; };
xo-alloc2 = self.callPackage pkgs/xo-alloc2.nix { stdenv = jitStdenv; buildDocs = true; }; xo-pyreflect = callPackage pkgs/xo-pyreflect.nix { stdenv = jitStdenv; };
xo-stringtable2 = self.callPackage pkgs/xo-stringtable2.nix { stdenv = jitStdenv; }; xo-ratio = callPackage pkgs/xo-ratio.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-gc = self.callPackage pkgs/xo-gc.nix { stdenv = jitStdenv; buildDocs = true; }; xo-unit = callPackage pkgs/xo-unit.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-object = self.callPackage pkgs/xo-object.nix { stdenv = jitStdenv; }; xo-pyunit = callPackage pkgs/xo-pyunit.nix { stdenv = jitStdenv; };
xo-type = self.callPackage pkgs/xo-type.nix { stdenv = jitStdenv; }; xo-callback = callPackage pkgs/xo-callback.nix { stdenv = jitStdenv; };
xo-object2 = self.callPackage pkgs/xo-object2.nix { stdenv = jitStdenv; }; xo-printable2 = callPackage pkgs/xo-printable2.nix { stdenv = jitStdenv; };
xo-procedure2 = self.callPackage pkgs/xo-procedure2.nix { stdenv = jitStdenv; }; xo-alloc = callPackage pkgs/xo-alloc.nix { stdenv = jitStdenv; buildDocs = true; };
xo-numeric = self.callPackage pkgs/xo-numeric.nix { stdenv = jitStdenv; }; xo-alloc2 = callPackage pkgs/xo-alloc2.nix { stdenv = jitStdenv; buildDocs = true; };
xo-ordinaltree = self.callPackage pkgs/xo-ordinaltree.nix { stdenv = jitStdenv; }; xo-stringtable2 = callPackage pkgs/xo-stringtable2.nix { stdenv = jitStdenv; };
xo-tokenizer2 = self.callPackage pkgs/xo-tokenizer2.nix { stdenv = jitStdenv; buildExamples = true; }; xo-gc = callPackage pkgs/xo-gc.nix { stdenv = jitStdenv; buildDocs = true; };
xo-webutil = self.callPackage pkgs/xo-webutil.nix {}; xo-object = callPackage pkgs/xo-object.nix { stdenv = jitStdenv; };
xo-pywebutil = self.callPackage pkgs/xo-pywebutil.nix {}; xo-type = callPackage pkgs/xo-type.nix { stdenv = jitStdenv; };
xo-printjson = self.callPackage pkgs/xo-printjson.nix {}; xo-object2 = callPackage pkgs/xo-object2.nix { stdenv = jitStdenv; };
xo-pyprintjson = self.callPackage pkgs/xo-pyprintjson.nix {}; xo-procedure2 = callPackage pkgs/xo-procedure2.nix { stdenv = jitStdenv; };
xo-reactor = self.callPackage pkgs/xo-reactor.nix {}; xo-numeric = callPackage pkgs/xo-numeric.nix { stdenv = jitStdenv; };
xo-pyreactor = self.callPackage pkgs/xo-pyreactor.nix {}; xo-ordinaltree = callPackage pkgs/xo-ordinaltree.nix { stdenv = jitStdenv; };
xo-websock = self.callPackage pkgs/xo-websock.nix {}; xo-tokenizer2 = callPackage pkgs/xo-tokenizer2.nix { stdenv = jitStdenv; buildExamples = true; };
xo-pywebsock = self.callPackage pkgs/xo-pywebsock.nix {}; xo-webutil = callPackage pkgs/xo-webutil.nix { stdenv = jitStdenv; };
xo-statistics = self.callPackage pkgs/xo-statistics.nix {}; xo-pywebutil = callPackage pkgs/xo-pywebutil.nix {};
xo-distribution = self.callPackage pkgs/xo-distribution.nix {}; xo-printjson = callPackage pkgs/xo-printjson.nix {};
xo-pydistribution = self.callPackage pkgs/xo-pydistribution.nix {}; xo-pyprintjson = callPackage pkgs/xo-pyprintjson.nix {};
xo-simulator = self.callPackage pkgs/xo-simulator.nix {}; xo-reactor = callPackage pkgs/xo-reactor.nix {};
xo-pysimulator = self.callPackage pkgs/xo-pysimulator.nix {}; xo-pyreactor = callPackage pkgs/xo-pyreactor.nix {};
xo-process = self.callPackage pkgs/xo-process.nix {}; xo-websock = callPackage pkgs/xo-websock.nix {};
xo-pyprocess = self.callPackage pkgs/xo-pyprocess.nix {}; xo-pywebsock = callPackage pkgs/xo-pywebsock.nix {};
xo-kalmanfilter = self.callPackage pkgs/xo-kalmanfilter.nix {}; xo-statistics = callPackage pkgs/xo-statistics.nix {};
xo-pykalmanfilter = self.callPackage pkgs/xo-pykalmanfilter.nix {}; xo-distribution = callPackage pkgs/xo-distribution.nix {};
xo-expression = self.callPackage pkgs/xo-expression.nix { buildExamples = true; }; xo-pydistribution = callPackage pkgs/xo-pydistribution.nix {};
xo-pyexpression = self.callPackage pkgs/xo-pyexpression.nix {}; xo-simulator = callPackage pkgs/xo-simulator.nix {};
xo-tokenizer = self.callPackage pkgs/xo-tokenizer.nix { buildDocs = true; buildExamples = true; }; xo-pysimulator = callPackage pkgs/xo-pysimulator.nix {};
xo-reader = self.callPackage pkgs/xo-reader.nix { buildDocs = true; buildExamples = true; }; xo-process = callPackage pkgs/xo-process.nix {};
xo-jit = self.callPackage pkgs/xo-jit.nix { buildDocs = true; buildExamples = true; xo-pyprocess = callPackage pkgs/xo-pyprocess.nix {};
xo-kalmanfilter = callPackage pkgs/xo-kalmanfilter.nix {};
xo-pykalmanfilter = callPackage pkgs/xo-pykalmanfilter.nix {};
xo-expression = callPackage pkgs/xo-expression.nix { buildExamples = true; };
xo-pyexpression = callPackage pkgs/xo-pyexpression.nix {};
xo-tokenizer = callPackage pkgs/xo-tokenizer.nix { buildDocs = true; buildExamples = true; };
xo-reader = callPackage pkgs/xo-reader.nix { buildDocs = true; buildExamples = true; };
xo-jit = callPackage pkgs/xo-jit.nix { buildDocs = true; buildExamples = true;
llvm = llvmPackages1.llvm; }; llvm = llvmPackages1.llvm; };
xo-pyjit = self.callPackage pkgs/xo-pyjit.nix {}; xo-pyjit = callPackage pkgs/xo-pyjit.nix {};
xo-userenv = self.callPackage pkgs/xo-userenv.nix {}; xo-userenv = callPackage pkgs/xo-userenv.nix {};
xo-userenv-slow = self.callPackage pkgs/xo-userenv-slow.nix { stdenv = jitStdenv; xo-userenv-slow = callPackage pkgs/xo-userenv-slow.nix { stdenv = jitStdenv;
llvm = llvmPackages1.llvm; }; llvm = llvmPackages1.llvm; };
llvmXo = llvmXo; inherit llvmXo;
}; };
# applies overlay to already-constructed package collection in xoPackages
xoPkgs = pkgs.extend xo-overlay;
in
xoPkgs