From 874f4147d9c2abe5890cb5ca0117a9bb8176e43c Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 13 Oct 2024 19:35:07 +0100 Subject: [PATCH] ci-root: add nix-darwin bits --- ci-root.nix | 1 + ops/nix-darwin/default.nix | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ci-root.nix b/ci-root.nix index a0b7a3a2f9..5b066be226 100644 --- a/ci-root.nix +++ b/ci-root.nix @@ -43,6 +43,7 @@ let pkgs = builtins.removeAttrs x86_64-linux.pkgs [ "lutris" "plex-pass" "sheepshaver" "fr24feed" "javaws-env" "copybara" ]; }; x86_64-darwin = { + machine = depot.ops.nix-darwin.systems; home-manager = { inherit (depot.ops.home-manager-ext.built) base client; }; diff --git a/ops/nix-darwin/default.nix b/ops/nix-darwin/default.nix index 8302c4a032..42984c6ed1 100644 --- a/ops/nix-darwin/default.nix +++ b/ops/nix-darwin/default.nix @@ -27,5 +27,8 @@ allEvaledSystems = mapAttrs systemFor systemCfgs; evaledSystems = lib.filterAttrs (n: v: v.config.my.systemType == system) allEvaledSystems; systemDrvs = mapAttrs (_: sys: sys.config.system.build.toplevel) evaledSystems; -in - systemDrvs +in systemDrvs // { + systems = systemDrvs; + systemConfigs = allEvaledSystems; + systemPathJSON = pkgs.writeText "systems.json" (builtins.toJSON systemDrvs); +}