Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e

util/liveiso/build-console.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=console.nix

util/liveiso/build-graphical.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=graphical.nix

util/liveiso/build.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+config=$1
+
+if [ -z "$config" ] || [ ! -f "$config" ]; then
+	echo "Usage: $0 <config.nix>"
+	echo "No config given. Exiting."
+	exit 1
+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

util/liveiso/common.nix

@@ -8,7 +8,7 @@
 		<nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix>
 	];
 
-	system.stateVersion = "21.05";
+	system.stateVersion = "21.11";
 
 	isoImage = {
 		makeEfiBootable = true;
@@ -33,6 +33,7 @@
 			"console=ttyS0,115200"
 			"console=tty0"
 			"iomem=relaxed"
+			"intel-spi.writeable=1"
 		];
 		# pkgs.linuxPackages == lts
 		# pkgs.linuxPackages_latest == stable
@@ -92,12 +93,14 @@
 			user = {
 				isNormalUser = true;
 				group = "user";
-				extraGroups = [ "users" "wheel" "networkmanager" "uucp" ];
+				extraGroups = [ "users" "wheel" "networkmanager" "uucp" "flashrom" ];
 				initialHashedPassword = "";
 			};
 		};
 	};
 
+	programs.flashrom.enable = true;
+
 	environment.systemPackages = with pkgs; [
 		acpica-tools
 		btrfs-progs
@@ -115,7 +118,6 @@
 		efivar
 		exfat
 		f2fs-tools
-		flashrom
 		fuse
 		fuse3
 		fwts
@@ -127,7 +129,6 @@
 		hexdump
 		htop
 		i2c-tools
-		iasl
 		intel-gpu-tools
 		inxi
 		iotools
@@ -138,6 +139,7 @@
 		mkpasswd
 		ms-sys
 		msr-tools
+		mtdutils
 		neovim
 		nixos-install-tools
 		ntfsprogs

util/liveiso/description.md

@@ -5,8 +5,6 @@
 NixOS configuration files for testing purposes and for working on firmware.
 
 ## TODO
-- Use programs.flashrom.enable (#128205) and add `user` to `flashrom` group.
-  Will be usable from the next NixOS release.
 - Generate customized bootloader configs; FILO is WIP
 - Add coreboot toolchain
 - Switch to `programs.neovim` when the module is fixed.