delft: simplify stateVersion handling
Make stateVersion an explicit per-machine-config property, remove any presence of it from common modules, and move it from -physical to the core config file. In preparation for making eris import "common.nix".
Pierre Bourdon committed
Feb 8, 2024 at 21:42 UTC
ed3ff218e5c58134bc50ffada2fd98e4f6703cf4
6 files changed
+4
-5
delft/common.nix
-2
@@ -11,8 +11,6 @@ with lib;
11
../modules/prometheus
12
];
13
14
- system.stateVersion = "14.12";
15
-
14
nixpkgs.config.allowUnfree = true;
15
16
nixpkgs.overlays = [
delft/eris-physical.nix
-1
@@ -14,7 +14,6 @@
14
'';
15
firewall.trustedInterfaces = [];
16
};
17
- system.stateVersion = ( lib.mkDefault "18.03" );
17
};
18
imports = [
19
{
delft/eris.nix
+2
@@ -13,6 +13,8 @@ in
13
./eris/channel-monitor.nix
14
];
15
16
+ system.stateVersion = "18.03";
17
+
18
users.users.root.openssh.authorizedKeys.keys =
19
with import ../ssh-keys.nix; infra-core;
20
delft/haumea-physical.nix
-1
@@ -14,7 +14,6 @@
14
'';
15
firewall.trustedInterfaces = [];
16
};
17
- system.stateVersion = ( lib.mkDefault "19.09" );
17
};
18
imports = [
19
{
delft/haumea.nix
+1
@@ -7,6 +7,7 @@
7
./fstrim.nix
8
];
9
10
+ system.stateVersion = "14.12";
11
environment.systemPackages = [ pkgs.lz4 ];
12
13
users.users.root.openssh.authorizedKeys.keys =
delft/rhea/configuration.nix
+1
-1
@@ -22,7 +22,7 @@
22
};
23
24
time.timeZone = lib.mkForce "UTC";
25
- system.stateVersion = lib.mkForce "21.11";
25
+ system.stateVersion = "21.11";
26
27
services.hydra-dev.dbi = "dbi:Pg:dbname=hydra;host=10.254.1.9;user=hydra;";
28
systemd.services.hydra-init = {