From 19282ea93e4c3cbc1586ef6e7e9d53d72b92b051 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 9 Apr 2021 18:24:44 +0000 Subject: [PATCH] ci-root: tidy up, add x86_64-darwin support (that's not yet used) --- ci-root.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/ci-root.nix b/ci-root.nix index e7c7cc7cf3..d1e615de63 100644 --- a/ci-root.nix +++ b/ci-root.nix @@ -7,16 +7,23 @@ let pkgs = depot.third_party.nixpkgs; lib = pkgs.lib; prefixAttrs = prefix: lib.mapAttrsToList (name: value: { name = "${prefix}-${name}"; path = value; }); - ciMachines = prefixAttrs "machine" depot.ops.nixos.systems; - ciPackages = prefixAttrs "pkg" (builtins.removeAttrs depot.nix.pkgs [ "grafana-plugins" "windows" ]); - ciGrafanaPlugins = prefixAttrs "pkg-grafana-plugins" depot.nix.pkgs.grafana-plugins; - ciWeb = prefixAttrs "web" depot.web; - ciOther = prefixAttrs "other" { - twitterchiver-archiver = depot.go.twitterchiver.archiver; - twitterchiver-archiver-docker = depot.go.twitterchiver.archiver.dockerImage; - twitternuke = depot.go.twitternuke; - systemPathJSON = depot.ops.nixos.systemPathJSON; + ciBits = { + x86_64-linux = { + machine = depot.ops.nixos.systems; + pkgs = builtins.removeAttrs depot.nix.pkgs [ "grafana-plugins" "windows" ]; + pkg-grafana-plugins = depot.nix.pkgs.grafana-plugins; + web = depot.web; + other = { + twitterchiver-archiver = depot.go.twitterchiver.archiver; + twitterchiver-archiver-docker = depot.go.twitterchiver.archiver.dockerImage; + twitternuke = depot.go.twitternuke; + systemPathJSON = depot.ops.nixos.systemPathJSON; + }; + }; + x86_64-darwin = { + home-manager = depot.ops.home-manager-ext.built; + }; }; in -pkgs.linkFarm "ci" (ciMachines ++ ciPackages ++ ciGrafanaPlugins ++ ciWeb ++ ciOther) +pkgs.linkFarm "ci" (builtins.concatLists (lib.mapAttrsToList prefixAttrs ciBits))