flake: import colmena fixes for nix 2.24 and darwin

xanderio · Nov 1, 2024 · 668fc64 · 668fc64
1 parent 14c77a2
commit 668fc64
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,7 +6,7 @@
     nixos-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     flake-parts.url = "github:hercules-ci/flake-parts";
-    colmena.url = "github:zhaofengli/colmena";
+    colmena.url = "github:zhaofengli/colmena/direct-flake-eval";
     colmena.inputs."nixpkgs".follows = "nixpkgs";
     darwin = {
       url = "github:lnl7/nix-darwin/master";
@@ -76,7 +76,18 @@
           formatter = pkgs.nixfmt-rfc-style;
           devShells.default = pkgs.mkShellNoCC {
             buildInputs = [
-              pkgs.colmena
+              (inputs'.colmena.packages.colmena.overrideAttrs (old: {
+                patches = (
+                  old.patches or [ ]
+                  ++ [
+                    (pkgs.fetchpatch {
+                      url = "https://github.com/zhaofengli/colmena/pull/233.patch";
+                      hash = "sha256-uwL3u0gO708bzV2NV8sTt10WHaCL3HykJNqSZNp9EtA=";
+                    })
+                  ]
+                );
+              }))
+
               pkgs.sops
               inputs'.sops-to-age.packages.ssh-to-age
             ];

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -59,6 +59,7 @@
       hex = import ./hex/disko.nix;
       vetinari = import ./vetinari/disko.nix;
     };
-    nixosConfigurations = (inputs.colmena.lib.makeHive self.outputs.colmena).nodes;
+    colmenaHive = inputs.colmena.lib.makeHive self.outputs.colmena;
+    nixosConfigurations = self.colmenaHive.nodes;
   };
 }