From 0f0f61f2dfbded789d67e097cb6dcfc999acb5aa Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Fri, 19 Mar 2021 01:19:14 +0000
Subject: [PATCH] installcd: add to ci-root; tweak store

---
 ci-root.nix                     | 1 +
 ops/nixos/installcd/default.nix | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ci-root.nix b/ci-root.nix
index 5a9bd653ef..6ec534a8b2 100644
--- a/ci-root.nix
+++ b/ci-root.nix
@@ -19,6 +19,7 @@ let
     twitterchiver-archiver-docker = depot.go.twitterchiver.archiver.dockerImage;
     twitternuke = depot.go.twitternuke;
     systemPathJSON = depot.ops.nixos.systemPathJSON;
+    installcd = depot.ops.nixos.installcd;
   };
 in
 pkgs.linkFarm "ci" (ciMachines ++ ciPackages ++ ciWindows ++ ciGrafanaPlugins ++ ciDocker ++ ciWeb ++ ciOther)
diff --git a/ops/nixos/installcd/default.nix b/ops/nixos/installcd/default.nix
index f434405d01..ae08de095e 100644
--- a/ops/nixos/installcd/default.nix
+++ b/ops/nixos/installcd/default.nix
@@ -12,10 +12,7 @@ in {
 
   isoImage.isoName = lib.mkForce "nixos-${depot.version}-${pkgs.stdenv.hostPlatform.system}.iso";
 
-  isoImage.contents = lib.mkAfter [{
-    source = /home/lukegb/depot;
-    target = "/depot";
-  }];
+  isoImage.storeContents = lib.mkAfter (builtins.attrValues depot.ops.nixos.systems);
 
   system.stateVersion = "21.05";
 }