diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 88179f10..a0c7e9d4 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -86,3 +86,8 @@ jobs: run: echo "nix-build ci.nix -A xo-alloc2" nix-build ci.nix -A xo-alloc2 + + - name: build xo-gc + run: + echo "nix-build ci.nix -A xo-gc" + nix-build ci.nix -A xo-gc diff --git a/ci.nix b/ci.nix index 575d84f6..8a3c2192 100644 --- a/ci.nix +++ b/ci.nix @@ -14,24 +14,24 @@ in inherit (xoPkgs) xo-cmake xo-indentlog - xo-reflectutil + xo-subsys + xo-flatstring xo-randomgen + xo-reflectutil xo-arena xo-facet + xo-alloc2 + xo-gc xo-allocutil xo-refcnt - xo-subsys xo-testutil - xo-flatstring xo-reflect xo-ratio xo-unit xo-callback xo-printable2 xo-alloc - xo-alloc2 xo-stringtable2 - xo-gc xo-object xo-type xo-object2 diff --git a/pkgs/xo-gc.nix b/pkgs/xo-gc.nix index 61db7249..89d8d962 100644 --- a/pkgs/xo-gc.nix +++ b/pkgs/xo-gc.nix @@ -12,8 +12,6 @@ xo-facet, xo-randomgen, xo-subsys, -# xo-reflectutil, -# xo-indentlog, xo-cmake, buildDocs ? false, @@ -55,7 +53,5 @@ stdenv.mkDerivation (finalattrs: xo-alloc2 xo-facet xo-subsys -# xo-reflectutil -# xo-indentlog ]; }) diff --git a/shells.nix b/shells.nix index e04cfe78..b2856597 100644 --- a/shells.nix +++ b/shells.nix @@ -317,15 +317,17 @@ in xo = { cmake = pkgs.xo-cmake; indentlog = pkgs.xo-indentlog; - reflectutil = pkgs.xo-reflectutil; + subsys = pkgs.xo-subsys; + flatstring = pkgs.xo-flatstring; randomgen = pkgs.xo-randomgen; + reflectutil = pkgs.xo-reflectutil; arena = pkgs.xo-arena; facet = pkgs.xo-facet; + alloc2 = pkgs.xo-alloc2; + gc = pkgs.xo-gc; allocutil = pkgs.xo-allocutil; refcnt = pkgs.xo-refcnt; - subsys = pkgs.xo-subsys; testutil = pkgs.xo-testutil; - flatstring = pkgs.xo-flatstring; pyutil = pkgs.xo-pyutil; reflect = pkgs.xo-reflect; pyreflect = pkgs.xo-pyreflect; @@ -335,9 +337,7 @@ in callback = pkgs.xo-callback; printable2 = pkgs.xo-printable2; alloc = pkgs.xo-alloc; - alloc2 = pkgs.xo-alloc2; stringtable2 = pkgs.xo-stringtable2; - gc = pkgs.xo-gc; object = pkgs.xo-object; type = pkgs.xo-type; object2 = pkgs.xo-object2; diff --git a/xo-cmake/etc/xo/subsystem-list b/xo-cmake/etc/xo/subsystem-list index d91621bf..0086b814 100644 --- a/xo-cmake/etc/xo/subsystem-list +++ b/xo-cmake/etc/xo/subsystem-list @@ -8,6 +8,7 @@ xo-arena xo-facet xo-testutil xo-alloc2 +xo-gc xo-alloc xo-object xo-refcnt diff --git a/xo.nix b/xo.nix index a6bcfdf5..8932a4db 100644 --- a/xo.nix +++ b/xo.nix @@ -27,10 +27,11 @@ let xoPackages = { xo-cmake = callPackage pkgs/xo-cmake.nix { stdenv = jitStdenv; }; xo-indentlog = callPackage pkgs/xo-indentlog.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; }; - xo-reflectutil = callPackage pkgs/xo-reflectutil.nix { stdenv = jitStdenv; }; xo-randomgen = callPackage pkgs/xo-randomgen.nix { stdenv = jitStdenv; buildExamples = true; }; + xo-reflectutil = callPackage pkgs/xo-reflectutil.nix { stdenv = jitStdenv; }; xo-arena = callPackage pkgs/xo-arena.nix { stdenv = jitStdenv; buildDocs = true; }; xo-facet = callPackage pkgs/xo-facet.nix { stdenv = jitStdenv; }; + xo-alloc2 = callPackage pkgs/xo-alloc2.nix { stdenv = jitStdenv; buildDocs = true; }; xo-allocutil = callPackage pkgs/xo-allocutil.nix { stdenv = jitStdenv; }; xo-refcnt = callPackage pkgs/xo-refcnt.nix { stdenv = jitStdenv; }; xo-subsys = callPackage pkgs/xo-subsys.nix { stdenv = jitStdenv; }; @@ -45,7 +46,6 @@ let xo-callback = callPackage pkgs/xo-callback.nix { stdenv = jitStdenv; }; xo-printable2 = callPackage pkgs/xo-printable2.nix { stdenv = jitStdenv; }; xo-alloc = callPackage pkgs/xo-alloc.nix { stdenv = jitStdenv; buildDocs = true; }; - xo-alloc2 = callPackage pkgs/xo-alloc2.nix { stdenv = jitStdenv; buildDocs = true; }; xo-stringtable2 = callPackage pkgs/xo-stringtable2.nix { stdenv = jitStdenv; }; xo-gc = callPackage pkgs/xo-gc.nix { stdenv = jitStdenv; buildDocs = true; }; xo-object = callPackage pkgs/xo-object.nix { stdenv = jitStdenv; };