From 27242fbf70758c9e10cc83e723dfaf9832404674 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Mon, 22 Jan 2024 17:15:29 +0100
Subject: staging: cluster upgrades

---
 cluster/staging/app/im/deploy/im-nix.hcl | 1 +
 cluster/staging/cluster.nix              | 2 +-
 cluster/staging/known_hosts              | 3 +++
 nix/nomad-driver-nix2.nix                | 4 ++--
 upgrade_nixos                            | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cluster/staging/app/im/deploy/im-nix.hcl b/cluster/staging/app/im/deploy/im-nix.hcl
index b8a2bbe..318e954 100644
--- a/cluster/staging/app/im/deploy/im-nix.hcl
+++ b/cluster/staging/app/im/deploy/im-nix.hcl
@@ -55,6 +55,7 @@ job "im" {
     task "synapse" {
       driver = "nix2"
       config {
+        nixpkgs = "github:nixos/nixpkgs/nixos-23.11"
         packages = [
           "#cacert",
           "#bash",
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index 78081d5..b4bcfe4 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -118,7 +118,7 @@
             {
               config = [
                 {
-                  default_nixpkgs = "github:nixos/nixpkgs/nixos-22.11";
+                  default_nixpkgs = "github:nixos/nixpkgs/nixos-23.11";
                 }
               ];
             }
diff --git a/cluster/staging/known_hosts b/cluster/staging/known_hosts
index d6a63da..b6cb51d 100644
--- a/cluster/staging/known_hosts
+++ b/cluster/staging/known_hosts
@@ -13,3 +13,6 @@ df-pw5.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/dJIxioCkfeeh
 2a01:cb05:911e:ec00:223:24ff:feb0:ea82 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnpO6zpLWsyyugOoOj+2bUow9TUrcWgURFGGaoyu+co
 carcajou.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ
 caribou.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPtsVFIoIu6tnYrzlcCbBiQXxNkFSWVMhMznUuSxGZ22
+df-pw5.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/dJIxioCkfeehxeGiZR7qquYGoqEH/YrRJ/ukEcaLH
+origan.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsZas74RT6lCZwuUOPR23nPdbSdpWORyAmRgjoiMVHK
+piranha.machine.staging.deuxfleurs.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnpO6zpLWsyyugOoOj+2bUow9TUrcWgURFGGaoyu+co
diff --git a/nix/nomad-driver-nix2.nix b/nix/nomad-driver-nix2.nix
index 45154bb..e69fe38 100644
--- a/nix/nomad-driver-nix2.nix
+++ b/nix/nomad-driver-nix2.nix
@@ -7,10 +7,10 @@ pkgs.buildGoModule rec {
 
   src = builtins.fetchGit {
     url = "https://git.deuxfleurs.fr/Deuxfleurs/nomad-driver-nix2";
-    rev = "59aba7607507193587be7c24229dc71066e3ae87";
+    rev = "98871a2d786f2627f1699d0ae49e7d6d3792f469";
   };
 
-  vendorSha256 = "sha256-EQdTxVOBRYQjg7kAB+pFJYcNwk0zlsjjJxM+EO/cK84=";
+  vendorHash = "sha256-EQdTxVOBRYQjg7kAB+pFJYcNwk0zlsjjJxM+EO/cK84=";
 
   postInstall = ''
     mv $out/bin/nomad-driver-nix2 $out/bin/nix2
diff --git a/upgrade_nixos b/upgrade_nixos
index 403e64e..7cc3de1 100755
--- a/upgrade_nixos
+++ b/upgrade_nixos
@@ -1,7 +1,7 @@
 #!/usr/bin/env ./sshtool
 
 if [ "$CLUSTER" = "staging" ]; then
-	cmd nix-channel --add https://nixos.org/channels/nixos-23.05 nixos
+	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
 fi
-- 
cgit v1.2.3