b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
zfsUnstable: make it compatible again with 6.2.8 and potentially 6.3
This commit is contained in:
Ryan Lahfa 2023-03-27 21:11:41 +02:00 committed by GitHub
parent 2749074b2e 56fa7ab066
commit 90b5f42ec9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/tests/zfs.nix
View file

@ -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 {

8
pkgs/os-specific/linux/zfs/default.nix
View file

@ -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=";
})
];
};
}