summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2022-06-05 09:40:27 +0200
committerMartin L Roth <gaumless@tutanota.com>2022-06-13 20:12:33 +0000
commit3e940685086ef52b14ff02160dae7c2c96a1a160 (patch)
tree129cfc579fc939393f48e143864eb4e42db69a74 /util
parenta05f518dea5fe700d99dcce1882739a15427a0d9 (diff)
util/liveiso: Update to NixOS 22.05
Update configs for NixOS 22.05. pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native Bluetooth functionality. Thus, remove it. Change-Id: Ic3b1dbc3c2ab092b576ba2151c93c74d4f298efc Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/64969 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin L Roth <gaumless@tutanota.com>
Diffstat (limited to 'util')
-rwxr-xr-xutil/liveiso/build.sh2
-rw-r--r--util/liveiso/common.nix2
-rw-r--r--util/liveiso/graphical.nix1
3 files changed, 2 insertions, 3 deletions
diff --git a/util/liveiso/build.sh b/util/liveiso/build.sh
index 702ace88cc..86e712cf90 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-21.11.tar.gz
+ -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-22.05.tar.gz
diff --git a/util/liveiso/common.nix b/util/liveiso/common.nix
index 881c5b84e2..473b851f7a 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 = "21.11";
+ system.stateVersion = "22.05";
isoImage = {
makeEfiBootable = true;
diff --git a/util/liveiso/graphical.nix b/util/liveiso/graphical.nix
index 35909fb14f..b82b0f3c81 100644
--- a/util/liveiso/graphical.nix
+++ b/util/liveiso/graphical.nix
@@ -10,7 +10,6 @@
hardware.pulseaudio = {
enable = true;
package = pkgs.pulseaudioFull;
- extraModules = with pkgs; [ pulseaudio-modules-bt ];
};
security.polkit = {