feat(meta): Remove default values for nixpkgs version
Some checks failed
Check meta / check_dns (push) Successful in 20s
Check meta / check_meta (push) Successful in 22s
Build all the nodes / bridge01 (push) Failing after 21s
Build all the nodes / compute01 (push) Failing after 21s
Build all the nodes / geo01 (push) Failing after 24s
Build all the nodes / geo02 (push) Failing after 23s
Build all the nodes / rescue01 (push) Failing after 22s
Build all the nodes / storage01 (push) Failing after 21s
Build all the nodes / vault01 (push) Failing after 23s
Build all the nodes / web01 (push) Failing after 23s
Build all the nodes / web02 (push) Failing after 21s
Build all the nodes / web03 (push) Failing after 21s
Run pre-commit on all files / check (push) Successful in 24s

They are considered harmful, and it simplifies the code.
This commit is contained in:
Tom Hubrecht 2024-12-08 11:52:26 +01:00
parent 1821104e8e
commit eb5b8740a8
Signed by: thubrecht
SSH key fingerprint: SHA256:r+nK/SIcWlJ0zFZJGHtlAoRwq1Rm+WcKAm5ADYMoQPc
4 changed files with 25 additions and 34 deletions

View file

@ -32,7 +32,7 @@ TODO.
# Nixpkgs
Machines can use different versions of NixOS, the supported and default ones are specified here.
Machines can use different versions of NixOS, the supported ones are specified here.
## How to add a new version
@ -55,7 +55,7 @@ The nodes are declared statically, several options can be configured:
- `deployment`, the colmena deployment option
- `stateVersion`, the state version of the node
- `nixpkgs`, the version of NixOS to use
- `nixpkgs`, the version and sytem of NixOS to use
- `admins`, the list of administrators specific to this node, they will be given root access
- `adminGroups`, a list of groups whose members will be added to `admins`
- `site`, the physical location of the node

View file

@ -1,25 +1,15 @@
{
versions = {
# Default version of nixpkgs to use
default = "24.05";
versions = [
# Supported nixpkgs versions
supported = [
"unstable"
"23.11"
"24.05"
"24.11"
];
};
systems = {
# Default system for our deployments
default = "nixos";
"unstable"
"23.11"
"24.05"
"24.11"
];
systems = [
# Supported system types
supported = [
"zyxel-nwa50ax"
"nixos"
];
};
"zyxel-nwa50ax"
"nixos"
];
}

View file

@ -141,16 +141,15 @@ in
nixpkgs = {
version = mkOption {
type = enum nixpkgs.versions.supported;
inherit (nixpkgs.versions) default;
type = enum nixpkgs.versions;
description = ''
Version of nixpkgs to use.
'';
example = "unstable";
};
system = mkOption {
type = enum nixpkgs.systems.supported;
inherit (nixpkgs.systems) default;
type = enum nixpkgs.systems;
description = ''
Type of system for this node, will impact how it is evaluated and deployed.
'';