From d8ef4356a0618ac9f1af0674f39197ac101aab4e Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 23 Jul 2026 20:25:42 -0400 Subject: [PATCH] Enable some more builds in nix_builder. --- nix/configuration/roles/hydra/default.nix | 5 ++- .../roles/hydra/files/nix_builder.toml | 33 +++++++++++++++---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/nix/configuration/roles/hydra/default.nix b/nix/configuration/roles/hydra/default.nix index 07e3bdd..542cd66 100644 --- a/nix/configuration/roles/hydra/default.nix +++ b/nix/configuration/roles/hydra/default.nix @@ -83,7 +83,10 @@ "worker2_update" "family_disks" "family_disks_update" - # "nixbsd" # Disabled due to onetbb tests hanging on one-cpu machines. + "nixbsd" + "nix_builder_develop" + "organic_develop" + "natter_develop" ]; build_flags = lib.concatMap (target: [ "--target" diff --git a/nix/configuration/roles/hydra/files/nix_builder.toml b/nix/configuration/roles/hydra/files/nix_builder.toml index 66bec6f..02579d4 100644 --- a/nix/configuration/roles/hydra/files/nix_builder.toml +++ b/nix/configuration/roles/hydra/files/nix_builder.toml @@ -178,9 +178,30 @@ output_directory = "/home/nixworker/persist/nix_builder" update = true update_branch = "nix_update" -# [[targets]] -# name = "nixbsd" -# repo = "https://github.com/nixos-bsd/nixbsd.git" -# revision = "828ff7a3c4ee91f548de65a963fca40eaedb171c" -# path = "." -# attr = "base.vmClosureInfo" +[[targets]] + name = "nixbsd" + repo = "https://github.com/nixos-bsd/nixbsd.git" + revision = "2b512eda58e6d77378bd20d6027802b158942e24" + path = "." + attr = "base.vmClosureInfo" + +[[targets]] + name = "nix_builder_develop" + repo = "https://code.fizz.buzz/talexander/nix_builder.git" + branch = "main" + path = "." + attr = "devShells.x86_64-linux.default" + +[[targets]] + name = "organic_develop" + repo = "https://code.fizz.buzz/talexander/organic.git" + branch = "main" + path = "." + attr = "devShells.x86_64-linux.default" + +[[targets]] + name = "natter_develop" + repo = "https://code.fizz.buzz/talexander/natter.git" + branch = "main" + path = "." + attr = "devShells.x86_64-linux.default"