I've opted to send this as a patchset rather than 4 independent patches
due to the close relation of the patches.  This also avoids contention
around edits of crontab.

I've submitted the updated manifets through builds for sanity checking.
Unstable: https://builds.sr.ht/~nakato/job/1276678
24.05: https://builds.sr.ht/~nakato/job/1276673
23.11: https://builds.sr.ht/~nakato/job/1276675

23.11 is end-of-life and needs to be removed, however I figure that's
best done as a follow up after users have been given some time to move
to 24.05.

Sachi King (4):
  images/nixos: Drop deprecated 22.11
  images/nixos: Drop 23.05
  images/nixos: Add 24.05 as latest NixOS
  iamges/nixos: Handle renamed and removed cofiguration options

 contrib/crontab                            | 2 +-
 images/nixos/23.05/functions               | 1 -
 images/nixos/23.05/genimg                  | 3 ---
 images/nixos/{22.11 => 24.05}/functions    | 0
 images/nixos/{22.11 => 24.05}/genimg       | 2 +-
 images/nixos/base-system-configuration.nix | 8 +++++---
 images/nixos/build.yml                     | 2 +-
 images/nixos/latest                        | 2 +-
 images/nixos/qemu-system-configuration.nix | 1 -
 9 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 120000 images/nixos/23.05/functions
 delete mode 100755 images/nixos/23.05/genimg
 rename images/nixos/{22.11 => 24.05}/functions (100%)
 rename images/nixos/{22.11 => 24.05}/genimg (58%)

-- 
2.44.1

22.11 is no-longer built, and its support files can be removed.
It's last remaining reference has been updated to the curent latest,
though this value is not used as it is overrien with arguments from the
per-version builds.

Signed-off-by: Sachi King <nakato@nakato.io>
---
 images/nixos/22.11/functions | 1 -
 images/nixos/22.11/genimg    | 3 ---
 images/nixos/build.yml       | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 120000 images/nixos/22.11/functions
 delete mode 100755 images/nixos/22.11/genimg

diff --git a/images/nixos/22.11/functions b/images/nixos/22.11/functions
deleted file mode 120000
index c0b5bcc..0000000
--- a/images/nixos/22.11/functions
@@ -1 +0,0 @@
-../functions
\ No newline at end of file
diff --git a/images/nixos/22.11/genimg b/images/nixos/22.11/genimg
deleted file mode 100755
index d267e17..0000000
--- a/images/nixos/22.11/genimg
@@ -1,3 +0,0 @@
-#!/bin/sh
-export release=22.11
-exec ../genimg "$@"
diff --git a/images/nixos/build.yml b/images/nixos/build.yml
index f0d5571..1527bf3 100644
--- a/images/nixos/build.yml
+++ b/images/nixos/build.yml
@@ -8,7 +8,7 @@ sources:
 secrets:
   - fa00a8d3-7b63-42d5-8060-3bb31c3e3018
 environment:
-  release: "22.11"
+  release: "23.11"
   arch: x86_64
   slaves:
     - deploy@fra01.builds.sr.ht
-- 
2.44.1

23.05 is far outside the documented removal date as it has been marked
as "End of Life" upstream.  Remove it and point latest to the latest we
currently have.

Signed-off-by: Sachi King <nakato@nakato.io>
---
 contrib/crontab              | 1 -
 images/nixos/23.05/functions | 1 -
 images/nixos/23.05/genimg    | 3 ---
 images/nixos/latest          | 2 +-
 4 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 120000 images/nixos/23.05/functions
 delete mode 100755 images/nixos/23.05/genimg

diff --git a/contrib/crontab b/contrib/crontab
index 19d8fc2..96e6288 100644
--- a/contrib/crontab
+++ b/contrib/crontab
@@ -10,7 +10,6 @@
 # Weekly refreshes
  0 19 * * 0 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" fedora/39
 30 19 * * 0 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" nixos/23.11
- 0 20 * * 0 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" nixos/23.05
  0 19 * * 1 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" alpine/old
 30 19 * * 1 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" -a amd64 debian/stable
  0 19 * * 2 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" fedora/38
diff --git a/images/nixos/23.05/functions b/images/nixos/23.05/functions
deleted file mode 120000
index c0b5bcc..0000000
--- a/images/nixos/23.05/functions
@@ -1 +0,0 @@
-../functions
\ No newline at end of file
diff --git a/images/nixos/23.05/genimg b/images/nixos/23.05/genimg
deleted file mode 100755
index debf48d..0000000
--- a/images/nixos/23.05/genimg
@@ -1,3 +0,0 @@
-#!/bin/sh
-export release=23.05
-exec ../genimg "$@"
diff --git a/images/nixos/latest b/images/nixos/latest
index 527d78c..abbaa1c 120000
--- a/images/nixos/latest
+++ b/images/nixos/latest
@@ -1 +1 @@
-23.05
\ No newline at end of file
+23.11
\ No newline at end of file
-- 
2.44.1

NixOS 24.05 is the only point release currently supported upstream.
23.11 should be removed shortly after the 24.05 release becomes
available.

Signed-off-by: Sachi King <nakato@nakato.io>
---
 contrib/crontab              | 1 +
 images/nixos/24.05/functions | 1 +
 images/nixos/24.05/genimg    | 3 +++
 images/nixos/latest          | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)
 create mode 120000 images/nixos/24.05/functions
 create mode 100755 images/nixos/24.05/genimg

diff --git a/contrib/crontab b/contrib/crontab
index 96e6288..31df483 100644
--- a/contrib/crontab
+++ b/contrib/crontab
@@ -10,6 +10,7 @@
 # Weekly refreshes
  0 19 * * 0 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" fedora/39
 30 19 * * 0 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" nixos/23.11
+ 0 20 * * 0 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" nixos/24.05
  0 19 * * 1 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" alpine/old
 30 19 * * 1 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" -a amd64 debian/stable
  0 19 * * 2 chronic /usr/local/bin/submit_image_build -n "Weekly scheduled build image refresh" fedora/38
diff --git a/images/nixos/24.05/functions b/images/nixos/24.05/functions
new file mode 120000
index 0000000..c0b5bcc
--- /dev/null
+++ b/images/nixos/24.05/functions
@@ -0,0 +1 @@
+../functions
\ No newline at end of file
diff --git a/images/nixos/24.05/genimg b/images/nixos/24.05/genimg
new file mode 100755
index 0000000..48aa530
--- /dev/null
+++ b/images/nixos/24.05/genimg
@@ -0,0 +1,3 @@
+#!/bin/sh
+export release=24.05
+exec ../genimg "$@"
diff --git a/images/nixos/latest b/images/nixos/latest
index abbaa1c..420f61e 120000
--- a/images/nixos/latest
+++ b/images/nixos/latest
@@ -1 +1 @@
-23.11
\ No newline at end of file
+24.05
\ No newline at end of file
-- 
2.44.1

Signed-off-by: Sachi King <nakato@nakato.io>
---
 images/nixos/base-system-configuration.nix | 8 +++++---
 images/nixos/qemu-system-configuration.nix | 1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/images/nixos/base-system-configuration.nix b/images/nixos/base-system-configuration.nix
index 0f068b5..f795df9 100644
--- a/images/nixos/base-system-configuration.nix
+++ b/images/nixos/base-system-configuration.nix
@@ -4,8 +4,10 @@
   # passwordless ssh server
   services.openssh = {
     enable = true;
-    permitRootLogin = "yes";
-    extraConfig = "PermitEmptyPasswords yes";
+    settings = {
+      PermitRootLogin = "yes";
+      PermitEmptyPasswords = true;
+    };
   };
   security.pam.services.sshd.allowNullPassword = true;
 
@@ -21,7 +23,7 @@
     users.root.password = "";
   };
   security.sudo.wheelNeedsPassword = false;
-  nix.trustedUsers = [ "root" "build" ];
+  nix.settings.trusted-users = [ "root" "build" ];
 
   # builds.sr.ht-image-specific network settings
   networking = {
diff --git a/images/nixos/qemu-system-configuration.nix b/images/nixos/qemu-system-configuration.nix
index d31b996..ff68416 100644
--- a/images/nixos/qemu-system-configuration.nix
+++ b/images/nixos/qemu-system-configuration.nix
@@ -6,7 +6,6 @@
   boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "virtio_balloon" "virtio_blk" "virtio_pci" "virtio_ring" ];
   boot.loader = {
     grub = {
-      version = 2;
       device = "/dev/vda";
     };
     timeout = 0;
-- 
2.44.1

builds.sr.ht/patches/alpine.yml: FAILED in 1m24s

[images/nixos: Update NixOS images][0] from [Sachi King][1]

[0]: https://lists.sr.ht/~sircmpwn/sr.ht-dev/patches/53893
[1]: nakato@nakato.io

✗ #1276707 FAILED builds.sr.ht/patches/alpine.yml https://builds.sr.ht/~sircmpwn/job/1276707

Looks good, thank you!

Thanks!

To git@git.sr.ht:~sircmpwn/builds.sr.ht
   047296f..564e95f  master -> master