summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2022-12-01 16:40:13 +0100
committerMichael Niewöhner <foss@mniewoehner.de>2023-01-10 07:20:29 +0000
commitb3ebf5ba0b8113b67fcf0e0c884abd1494acc20b (patch)
tree36adbda28e614704ad65ca431afd98877a392a2b
parenteab108f68b4774a3c0b906c14652c60b93d8f5ff (diff)
util/liveiso: Update from 22.05 to 22.11
Update and also adjust configs so that they work with NixOS 22.11. Change-Id: Ia0fed68f5449ccf56b25660f5cdbc8c239064748 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/70210 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin L Roth <gaumless@gmail.com> Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
-rwxr-xr-xutil/liveiso/build.sh2
-rw-r--r--util/liveiso/common.nix2
-rw-r--r--util/liveiso/graphical.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/util/liveiso/build.sh b/util/liveiso/build.sh
index 86e712cf90..e2e1d65672 100755
--- a/util/liveiso/build.sh
+++ b/util/liveiso/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.05.tar.gz
+ -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-22.11.tar.gz
diff --git a/util/liveiso/common.nix b/util/liveiso/common.nix
index b08b48f14d..93a4168524 100644
--- a/util/liveiso/common.nix
+++ b/util/liveiso/common.nix
@@ -8,7 +8,7 @@
<nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix>
];
- system.stateVersion = "22.05";
+ system.stateVersion = "22.11";
isoImage = {
makeEfiBootable = true;
diff --git a/util/liveiso/graphical.nix b/util/liveiso/graphical.nix
index b82b0f3c81..8d51caf071 100644
--- a/util/liveiso/graphical.nix
+++ b/util/liveiso/graphical.nix
@@ -53,7 +53,7 @@
gnome-online-accounts.enable = lib.mkForce false;
gnome-online-miners.enable = lib.mkForce false;
gnome-initial-setup.enable = lib.mkForce false;
- chrome-gnome-shell.enable = lib.mkForce false;
+ gnome-browser-connector.enable = lib.mkForce false;
};
telepathy.enable = lib.mkForce false;
dleyna-renderer.enable = lib.mkForce false;