diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-24 17:18:18 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-24 17:25:55 +0300 |
| commit | 63c3aed44258988f02639db261e8e0d9692ae033 (patch) | |
| tree | 49837b6d5058aaa1228c1dcd6d90a243d30bf974 /nixos/modules/installer | |
| parent | 4f07c88d467216d9692fefc951deb5cd3c4cc722 (diff) | |
| download | nixpkgs-63c3aed44258988f02639db261e8e0d9692ae033.tar nixpkgs-63c3aed44258988f02639db261e8e0d9692ae033.tar.gz nixpkgs-63c3aed44258988f02639db261e8e0d9692ae033.tar.bz2 nixpkgs-63c3aed44258988f02639db261e8e0d9692ae033.tar.lz nixpkgs-63c3aed44258988f02639db261e8e0d9692ae033.tar.xz nixpkgs-63c3aed44258988f02639db261e8e0d9692ae033.tar.zst nixpkgs-63c3aed44258988f02639db261e8e0d9692ae033.zip | |
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.
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 3 |
2 files changed, 0 insertions, 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 0ca57a4635f..6be79b587c7 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 199a252ad2b..e7163f10a3c 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 = ""; |