summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2023-10-16 23:38:52 +0200
committerFelix Singer <service+coreboot-gerrit@felixsinger.de>2023-10-19 21:01:50 +0000
commit2282ed7c71c47f4c53aab41e7aee84ed83e1a118 (patch)
treedafca7bd5ba7f24cd9ce967ae4899dfcf683f644 /util
parent180c702bb94f3af04d25be87e56415f520c301e1 (diff)
util/liveiso/nixos: Bump to 23.05
Bump to 23.05 and also rename settings in order to compliant with newest namespaces and names. Change-Id: I4a23466bef5c45ebb82d92038ec2595103c984d3 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/78399 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin L Roth <gaumless@gmail.com>
Diffstat (limited to 'util')
-rwxr-xr-xutil/liveiso/nixos/build.sh2
-rw-r--r--util/liveiso/nixos/common.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/util/liveiso/nixos/build.sh b/util/liveiso/nixos/build.sh
index e2e1d65672..a10dad311d 100755
--- a/util/liveiso/nixos/build.sh
+++ b/util/liveiso/nixos/build.sh
@@ -11,4 +11,4 @@ fi
nix-build '<nixpkgs/nixos>' \
-A config.system.build.isoImage \
-I nixos-config=$config \
- -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-22.11.tar.gz
+ -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-23.05.tar.gz
diff --git a/util/liveiso/nixos/common.nix b/util/liveiso/nixos/common.nix
index 93a4168524..1d7250268c 100644
--- a/util/liveiso/nixos/common.nix
+++ b/util/liveiso/nixos/common.nix
@@ -8,7 +8,7 @@
<nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix>
];
- system.stateVersion = "22.11";
+ system.stateVersion = "23.05";
isoImage = {
makeEfiBootable = true;
@@ -33,7 +33,7 @@
"console=ttyS0,115200"
"console=tty0"
"iomem=relaxed"
- "intel-spi.writeable=1"
+ "spi_intel.writeable=1"
];
# pkgs.linuxPackages == lts
# pkgs.linuxPackages_latest == stable
@@ -75,7 +75,7 @@
];
openssh = {
enable = true;
- permitRootLogin = "yes";
+ settings.PermitRootLogin = "yes";
};
};