From 9e2880e5fa0cda607ad670cde12dc93735d2f97a Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <v@cunat.cz>
Date: Wed, 13 Jan 2021 15:22:41 +0100
Subject: nixos ISO image: revert another part of 8ca33835ba

---
 nixos/modules/profiles/all-hardware.nix | 15 +++++----------
 nixos/modules/system/boot/kernel.nix    | 20 +++++++-------------
 nixos/modules/tasks/filesystems/ext.nix |  7 ++-----
 3 files changed, 14 insertions(+), 28 deletions(-)

(limited to 'nixos')

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 56035f7b6e46f..d460c52dbefd4 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -12,15 +12,13 @@ in
   # The initrd has to contain any module that might be necessary for
   # supporting the most important parts of HW like drives.
   boot.initrd.availableKernelModules =
-      # SATA/PATA support.
-    lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
+    [ # SATA/PATA support.
       "ahci"
-      "sata_sil24"
-    ] ++ [
+
       "ata_piix"
 
       "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
-      "sata_sil" "sata_sis" "sata_svw" "sata_sx4"
+      "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
       "sata_uli" "sata_via" "sata_vsc"
 
       "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar"
@@ -42,19 +40,16 @@ in
       # Firewire support.  Not tested.
       "ohci1394" "sbp2"
 
-    ] ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
       # Virtio (QEMU, KVM etc.) support.
       "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
-    ] ++ [
 
       # VMware support.
       "mptspi" "vmxnet3" "vsock"
-    ] ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
-      "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
     ] ++ lib.optional platform.isx86 "vmw_balloon"
+    ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
+      "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
 
       # Hyper-V support.
-    ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
       "hv_storvsc"
     ];
 
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index f391f7ae7662a..ed7226331d70e 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -194,37 +194,31 @@ in
 
   config = mkMerge
     [ (mkIf config.boot.initrd.enable {
-        boot.initrd.availableKernelModules = let
-          # Some modules apparently aren't present on our aarch64 (and maybe elsewhere).
-          maybeInitrdModules = lib.optionals (!pkgs.stdenv.hostPlatform.isAarch64);
-        in
-            # Note: most of these (especially the SATA/PATA modules)
+        boot.initrd.availableKernelModules =
+          [ # Note: most of these (especially the SATA/PATA modules)
             # shouldn't be included by default since nixos-generate-config
             # detects them, but I'm keeping them for now for backwards
             # compatibility.
 
             # Some SATA/PATA stuff.
-          maybeInitrdModules [ "ahci" ]
-          ++ [
+            "ahci"
             "sata_nv"
             "sata_via"
             "sata_sis"
             "sata_uli"
             "ata_piix"
             "pata_marvell"
-          ]
 
             # Standard SCSI stuff.
-          ++ maybeInitrdModules [ "sd_mod" ]
-          ++ [ "sr_mod" ]
+            "sd_mod"
+            "sr_mod"
 
             # SD cards and internal eMMC drives.
-          ++ maybeInitrdModules [ "mmc_block" ]
+            "mmc_block"
 
             # Support USB keyboards, in case the boot fails and we only have
             # a USB keyboard, or for LUKS passphrase prompt.
-          ++ [ "uhci_hcd" ]
-          ++ maybeInitrdModules [
+            "uhci_hcd"
             "ehci_hcd"
             "ehci_pci"
             "ohci_hcd"
diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix
index 67f6d00ae5c9c..a14a3ac38549c 100644
--- a/nixos/modules/tasks/filesystems/ext.nix
+++ b/nixos/modules/tasks/filesystems/ext.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 
 {
   config = {
@@ -6,10 +6,7 @@
     system.fsPackages = [ pkgs.e2fsprogs ];
 
     # As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko)
-    # No ext* modules are present on our aarch64, apparently (and maybe elsewhere).
-    boot.initrd.availableKernelModules =
-      lib.optionals (!pkgs.stdenv.hostPlatform.isAarch64)
-        [ "ext2" "ext4" ];
+    boot.initrd.availableKernelModules = [ "ext2" "ext4" ];
 
     boot.initrd.extraUtilsCommands =
       ''
-- 
cgit 1.4.1