From 1eaa7d228739b3607bc720c9f4fc464ee89baaef Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Wed, 25 Dec 2024 00:03:49 +0000
Subject: [PATCH] flake: colmena compat with CppNix 2.24

---
 README.md | 1 +
 flake.nix | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 35cb589..26aea1d 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ To build locally, run `nixos-rebuild switch --flake .#[hostname]` as root.
 To build the remote machines, run `colmena apply`. See the [colmena documentation](https://colmena.cli.rs/) for command-line options. Notable options include:
 * `--on [hostname]`: build a specific machine only
 * `--reboot`: reboot after building (but note [this bug](https://github.com/zhaofengli/colmena/issues/166) means it may hang even when the reboot completes successfully)
+* `--experimental-flake-eval`: currently necessary to build at all. See [here](https://github.com/zhaofengli/colmena/pull/228)
 
 ### Updating
 
diff --git a/flake.nix b/flake.nix
index d2f1e55..66cace4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,8 +60,9 @@
   };
 
   outputs = inputs@{ self, nixpkgs, nixpkgs-small, lix-module, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: {
-    nixosConfigurations = (colmena.lib.makeHive self.outputs.colmena).nodes;
-
+    nixosConfigurations = self.outputs.colmenaHive.nodes;
+    colmenaHive = colmena.lib.makeHive self.outputs.colmena;
+    
     # The name of this output type is not standardised. I have picked
     # "homeManagerModules" as the discussion here suggests it's the most common:
     # https://github.com/nix-community/home-manager/issues/1783
@@ -129,7 +130,7 @@
       in
       pkgs.mkShell {
         packages = [
-          pkgs.colmena
+          colmena.packages.${system}.colmena
           agenix.packages.${system}.default
           plasma-manager.packages.${system}.rc2nix
         ];