From 3e940685086ef52b14ff02160dae7c2c96a1a160 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 5 Jun 2022 09:40:27 +0200 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/64969 Tested-by: build bot (Jenkins) Reviewed-by: Martin L Roth --- util/liveiso/build.sh | 2 +- util/liveiso/common.nix | 2 +- util/liveiso/graphical.nix | 1 - 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 '' \ -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 @@ ]; - 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 = {