Unverified Commit d5f5ec16 authored by Samuel Dionne-Riel's avatar Samuel Dionne-Riel Committed by GitHub
Browse files

Merge pull request #207371 from samueldr/feature/new_kernel-no-zfs 

nixos: Add new_kernel_no_zfs image variants
parents 1db407ab d91e1f98

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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
{ pkgs, ... }:



{

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



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

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

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

  # could then `lib.mkForce false`

  nixpkgs.overlays = [(final: super: {

    zfs = super.zfs.overrideAttrs(_: {

      meta.platforms = [];

    });

  })];

}

nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix

0 → 100644
+15 −0
Original line number Diff line number Diff line 
{ pkgs, ... }:



{

  imports = [ ./sd-image-aarch64-new-kernel-installer.nix ];



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

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

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

  # could then `lib.mkForce false`

  nixpkgs.overlays = [(final: super: {

    zfs = super.zfs.overrideAttrs(_: {

      meta.platforms = [];

    });

  })];

}

nixos/release.nix

+18 −2
Original line number Diff line number Diff line
@@ -181,14 +181,22 @@ in rec { 
    inherit system;

  });



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

  # that might support more hardware.

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

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

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

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

    type = "minimal-new-kernel";

    inherit system;

  });



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

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

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

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

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

    inherit system;

  });



  sd_image = forMatchingSystems [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ] (system: makeSdImage {

    module = {

        armv6l-linux = ./modules/installer/sd-card/sd-image-raspberrypi-installer.nix;
@@ -206,6 +214,14 @@ in rec { 
    inherit system;

  });



  sd_image_new_kernel_no_zfs = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {

    module = {

        aarch64-linux = ./modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix;

      }.${system};

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

    inherit system;

  });



  # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).

  ova = forMatchingSystems [ "x86_64-linux" ] (system: