qenya/nixfiles
1
0
Fork 0
Code Issues 5 Pull requests Actions Activity

flake: colmena compat with CppNix 2.24

Browse source
This commit is contained in:
Katherina Walshe-Grey 2024-12-25 00:03:49 +00:00
parent f51721aae1
commit 1eaa7d2287
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -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: 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 * `--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) * `--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 ### Updating

7
flake.nix
View file

@ -60,8 +60,9 @@
}; };
outputs = inputs@{ self, nixpkgs, nixpkgs-small, lix-module, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: { 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 # The name of this output type is not standardised. I have picked
# "homeManagerModules" as the discussion here suggests it's the most common: # "homeManagerModules" as the discussion here suggests it's the most common:
# https://github.com/nix-community/home-manager/issues/1783 # https://github.com/nix-community/home-manager/issues/1783
@ -129,7 +130,7 @@
in in
pkgs.mkShell { pkgs.mkShell {
packages = [ packages = [
pkgs.colmena colmena.packages.${system}.colmena
agenix.packages.${system}.default agenix.packages.${system}.default
plasma-manager.packages.${system}.rc2nix plasma-manager.packages.${system}.rc2nix
]; ];