From 63c3aed44258988f02639db261e8e0d9692ae033 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 24 Oct 2015 17:18:18 +0300 Subject: [PATCH 1/2] ARM: Don't disable manual in installation images Since commits 89e9837 and 5b8dae8 the manual no longer depends on evaluation of any packages from nixpkgs, so all errors of the form "Package 'foo' is not supported on 'armv7l-linux'" are gone. --- .../modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 3 --- nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 3 --- 2 files changed, 6 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 0ca57a4635f4..6be79b587c72 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -26,9 +26,6 @@ in boot.kernelPackages = pkgs.linuxPackages_testing; boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; - # FIXME: fix manual evaluation on ARM - services.nixosManual.enable = lib.mkOverride 0 false; - # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 199a252ad2b5..e7163f10a3c3 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -27,9 +27,6 @@ in boot.kernelPackages = pkgs.linuxPackages_rpi; - # FIXME: fix manual evaluation on ARM - services.nixosManual.enable = lib.mkOverride 0 false; - # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; From 7671f920f88421d50f5edb34ddd67f48145283a6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 24 Oct 2015 17:32:21 +0300 Subject: [PATCH 2/2] ARM: Use linuxPackages_latest in ARMv7 image 4.2 is out now, which includes the pcDuino3 Nano DTB. --- .../modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 6be79b587c72..15e22fb50d48 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -22,8 +22,7 @@ in boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; - # FIXME: change this to linuxPackages_latest once v4.2 is out - boot.kernelPackages = pkgs.linuxPackages_testing; + boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix