Unverified Commit 90b5f42e authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #222946 from RaitoBezarius/zfs-6_2-6_3-compat 

zfsUnstable: make it compatible again with 6.2.8 and potentially 6.3
parents 2749074b 56fa7ab0

nixos/tests/zfs.nix

+7 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ let 
                      then pkgs.zfsUnstable.latestCompatibleLinuxPackages

                      else pkgs.linuxPackages

    , enableUnstable ? false

    , enableSystemdStage1 ? false

    , extraTest ? ""

    }:

    makeTest {
@@ -36,6 +37,7 @@ let 
        boot.kernelPackages = kernelPackage;

        boot.supportedFilesystems = [ "zfs" ];

        boot.zfs.enableUnstable = enableUnstable;

        boot.initrd.systemd.enable = enableSystemdStage1;



        environment.systemPackages = [ pkgs.parted ];
@@ -176,6 +178,11 @@ in { 
    enableUnstable = true;

  };



  unstableWithSystemdStage1 = makeZfsTest "unstable" {

    enableUnstable = true;

    enableSystemdStage1 = true;

  };



  installer = (import ./installer.nix { }).zfsroot;



  expand-partitions = makeTest {

pkgs/os-specific/linux/zfs/default.nix

+8 −0
Original line number Diff line number Diff line
@@ -256,5 +256,13 @@ in { 
    sha256 = "sha256-CdPuyZMXFzANEdnsr/rB5ckkT8X5uziniY5vmRCKl1U=";



    isUnstable = true;



    # Necessary for 6.2.8+ and 6.3 compatibility, see https://github.com/openzfs/zfs/issues/14658

    extraPatches = [

      (fetchpatch {

        url = "https://github.com/openzfs/zfs/pull/14668.patch";

        hash = "sha256-PR7hxxdjLkjszADdw0R0JRmBPfDlsXG6D+VfC7QzEhk=";

      })

    ];

  };

}