commit 35bb28b367312d94815f03d07d5600ecd362fb26 · pyrox.dev/nixpkgs

+15

nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix

···

       1
       +
       { pkgs, ... }:

     

       2
       +
       

     

       3
       +
       {

     

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

     

       5
       +
       

     

       6
       +
         # Makes `availableOn` fail for zfs, see <nixos/modules/profiles/base.nix>.

     

       7
       +
         # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`.

     

       8
       +
         # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we

     

       9
       +
         # could then `lib.mkForce false`

     

       10
       +
         nixpkgs.overlays = [(final: super: {

     

       11
       +
           zfs = super.zfs.overrideAttrs(_: {

     

       12
       +
             meta.platforms = [];

     

       13
       +
           });

     

       14
       +
         })];

     

       15
       +
       }

+10 -2

nixos/release.nix

···

       181
        
           inherit system;

     

       182
        
         });

     

       183
        
       

     

       184
       -
         # A variant with a more recent (but possibly less stable) kernel

     

       185
       -
         # that might support more hardware.

     

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

     

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

     

       188
        
           type = "minimal-new-kernel";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       189
        
           inherit system;

     

       190
        
         });

     

       191

···

       181
        
           inherit system;

     

       182
        
         });

     

       183
        
       

     

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

     

       185
       +
         # This variant keeps zfs support enabled, hoping it will build and work.

     

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

     

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

     

       188
        
           type = "minimal-new-kernel";

     

       189
       +
           inherit system;

     

       190
       +
         });

     

       191
       +
       

     

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

     

       193
       +
         # ZFS support disabled since it is unlikely to support the latest kernel.

     

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

     

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

     

       196
       +
           type = "minimal-new-kernel-no-zfs";

     

       197
        
           inherit system;

     

       198
        
         });

     

       199