diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-04-20 10:09:55 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-04-20 10:09:55 +0200 |
| commit | c6a1bb341fddfd38c8c826c796a21ac8efcbfb4c (patch) | |
| tree | 768eda2d3e81b8cde6b6edc9268578cb3ca87f36 | |
| parent | eddc95c5df810cb8a23235060915907a57c4913e (diff) | |
| download | nixcfg-c6a1bb341fddfd38c8c826c796a21ac8efcbfb4c.tar.gz nixcfg-c6a1bb341fddfd38c8c826c796a21ac8efcbfb4c.zip | |
prod: update nixos to 23.05
| -rw-r--r-- | cluster/prod/cluster.nix | 3 | ||||
| -rw-r--r-- | cluster/staging/cluster.nix | 2 | ||||
| -rw-r--r-- | nix/deuxfleurs.nix | 1 | ||||
| -rwxr-xr-x | upgrade_nixos | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix index 278f3cf..ab3395e 100644 --- a/cluster/prod/cluster.nix +++ b/cluster/prod/cluster.nix @@ -77,6 +77,9 @@ }; }; + # Keep using Nomad 1.4 + services.nomad.package = pkgs.nomad_1_4; + # Bootstrap IPs for Consul cluster, # these are IPs on the Wireguard overlay services.consul.extraConfig.retry_join = [ diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix index a76d0ce..b696ee5 100644 --- a/cluster/staging/cluster.nix +++ b/cluster/staging/cluster.nix @@ -100,7 +100,7 @@ ## ===== EXPERIMENTAL SECTION FOR STAGING CLUSTER ===== # Test nomad 1.6 - services.nomad.package = lib.mkForce pkgs.nomad_1_6; + services.nomad.package = pkgs.nomad_1_6; nixpkgs.config.allowUnfree = true; # Accept nomad's BSL license # We're doing lots of experiments so GC periodically is usefull. diff --git a/nix/deuxfleurs.nix b/nix/deuxfleurs.nix index 1e41b48..6020339 100644 --- a/nix/deuxfleurs.nix +++ b/nix/deuxfleurs.nix @@ -331,7 +331,6 @@ in services.nomad.enable = true; systemd.services.nomad.after = [ "wg-quick-wg0.service" ]; - services.nomad.package = pkgs.nomad_1_4; services.nomad.extraPackages = [ pkgs.glibc pkgs.zstd diff --git a/upgrade_nixos b/upgrade_nixos index 7cc3de1..e3d753e 100755 --- a/upgrade_nixos +++ b/upgrade_nixos @@ -3,7 +3,7 @@ if [ "$CLUSTER" = "staging" ]; then cmd nix-channel --add https://nixos.org/channels/nixos-23.11 nixos else - cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos + cmd nix-channel --add https://nixos.org/channels/nixos-23.05 nixos fi cmd nix-channel --update |