commit 0aad0248ce306cf352d59fb9e7726e9b878c9038 · pyrox.dev/nixpkgs

+14

nixos/modules/installer/cd-dvd/installation-cd-minimal-combined.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         imports = [ ./installation-cd-minimal.nix ];

     

       5
       5
       +
       

     

       6
       6
       +
         isoImage.configurationName = lib.mkDefault "(Linux LTS)";

     

       7
       7
       +
       

     

       8
       8
       +
         specialisation.latest_kernel.configuration =

     

       9
       9
       +
           { config, ... }:

     

       10
       10
       +
           {

     

       11
       11
       +
             imports = [ ./latest-kernel.nix ];

     

       12
       12
       +
             isoImage.configurationName = "(Linux ${config.boot.kernelPackages.kernel.version})";

     

       13
       13
       +
           };

     

       14
       14
       +
       }

+5

nixos/modules/installer/cd-dvd/latest-kernel.nix

···

       1
       1
       +
       { lib, pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         boot.kernelPackages = pkgs.linuxPackages_latest;

     

       4
       4
       +
         boot.supportedFilesystems.zfs = false;

     

       5
       5
       +
       }

+13 -8

nixos/modules/profiles/base.nix

···

       48
       48
        
         ];

     

       49
       49
        
       

     

       50
       50
        
         # Include support for various filesystems and tools to create / manipulate them.

     

       51
       51
       -
         boot.supportedFilesystems = [

     

       52
       52
       -
           "btrfs"

     

       53
       53
       -
           "cifs"

     

       54
       54
       -
           "f2fs"

     

       55
       55
       -
           "ntfs"

     

       56
       56
       -
           "vfat"

     

       57
       57
       -
           "xfs"

     

       58
       58
       -
         ] ++ lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";

     

       51
       51
       +
         boot.supportedFilesystems = lib.mkMerge [

     

       52
       52
       +
           [

     

       53
       53
       +
             "btrfs"

     

       54
       54
       +
             "cifs"

     

       55
       55
       +
             "f2fs"

     

       56
       56
       +
             "ntfs"

     

       57
       57
       +
             "vfat"

     

       58
       58
       +
             "xfs"

     

       59
       59
       +
           ]

     

       60
       60
       +
           (lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) {

     

       61
       61
       +
             zfs = lib.mkDefault true;

     

       62
       62
       +
           })

     

       63
       63
       +
         ];

     

       59
       64
        
       

     

       60
       65
        
         # Configure host id for ZFS to work

     

       61
       66
        
         networking.hostId = lib.mkDefault "8425e349";

+1 -17

nixos/release.nix

···

       164
       164
        
         });

     

       165
       165
        
       

     

       166
       166
        
         iso_minimal = forAllSystems (system: makeIso {

     

       167
       167
       -
           module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;

     

       167
       167
       +
           module = ./modules/installer/cd-dvd/installation-cd-minimal-combined.nix;

     

       168
       168
        
           type = "minimal";

     

       169
       169
        
           inherit system;

     

       170
       170
        
         });

     
···

       184
       184
        
         iso_gnome = forMatchingSystems supportedSystems (system: makeIso {

     

       185
       185
        
           module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix;

     

       186
       186
        
           type = "gnome";

     

       187
       187
       -
           inherit system;

     

       188
       188
       -
         });

     

       189
       189
       -
       

     

       190
       190
       -
         # A variant with a more recent (but possibly less stable) kernel that might support more hardware.

     

       191
       191
       -
         # This variant keeps zfs support enabled, hoping it will build and work.

     

       192
       192
       -
         iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {

     

       193
       193
       -
           module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;

     

       194
       194
       -
           type = "minimal-new-kernel";

     

       195
       195
       -
           inherit system;

     

       196
       196
       -
         });

     

       197
       197
       -
       

     

       198
       198
       -
         # A variant with a more recent (but possibly less stable) kernel that might support more hardware.

     

       199
       199
       -
         # ZFS support disabled since it is unlikely to support the latest kernel.

     

       200
       200
       -
         iso_minimal_new_kernel_no_zfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {

     

       201
       201
       -
           module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix;

     

       202
       202
       -
           type = "minimal-new-kernel-no-zfs";

     

       203
       187
        
           inherit system;

     

       204
       188
        
         });

     

       205
       189