pyrox.dev
Merge pull request #269097 from amarshall/zfs-221
zfs: 2.2.0 -> 2.2.1; zfsUnstable: 2.2.1-unstable-2023-10-21 -> 2.2.1
authored by Adam C. Stephens and committed by GitHub 45827faa 1ed523e0
+4
-4
pkgs/os-specific/linux/zfs/stable.nix
+4
-4
pkgs/os-specific/linux/zfs/stable.nix
···
18
18
# check the release notes for compatible kernels
19
19
kernelCompatible =
20
20
if stdenv'.isx86_64 || removeLinuxDRM
21
-
then kernel.kernelOlder "6.6"
21
+
then kernel.kernelOlder "6.7"
22
22
else kernel.kernelOlder "6.2";
23
23
24
24
latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM
25
-
then linuxKernel.packages.linux_6_5
25
+
then linuxKernel.packages.linux_6_6
26
26
else linuxKernel.packages.linux_6_1;
27
27
28
28
# this package should point to the latest release.
29
-
version = "2.2.0";
29
+
version = "2.2.1";
30
30
31
31
tests = [
32
32
nixosTests.zfs.installer
33
33
nixosTests.zfs.stable
34
34
];
35
35
36
-
hash = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg=";
36
+
hash = "sha256-2Q/Nhp3YKgMCLPNRNBq5r9U4GeuYlWMWAsjsQy3vFW4=";
37
37
}
+4
-5
pkgs/os-specific/linux/zfs/unstable.nix
+4
-5
pkgs/os-specific/linux/zfs/unstable.nix
···
16
16
kernelModuleAttribute = "zfsUnstable";
17
17
# check the release notes for compatible kernels
18
18
kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM
19
-
then kernel.kernelOlder "6.6"
19
+
then kernel.kernelOlder "6.7"
20
20
else kernel.kernelOlder "6.2";
21
21
22
22
latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM
23
-
then linuxKernel.packages.linux_6_5
23
+
then linuxKernel.packages.linux_6_6
24
24
else linuxKernel.packages.linux_6_1;
25
25
26
26
# this package should point to a version / git revision compatible with the latest kernel release
27
27
# IMPORTANT: Always use a tagged release candidate or commits from the
28
28
# zfs-<version>-staging branch, because this is tested by the OpenZFS
29
29
# maintainers.
30
-
version = "2.2.1-unstable-2023-10-21";
31
-
rev = "95785196f26e92d82cf4445654ba84e4a9671c57";
30
+
version = "2.2.1";
32
31
33
-
hash = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg=";
32
+
hash = "sha256-2Q/Nhp3YKgMCLPNRNBq5r9U4GeuYlWMWAsjsQy3vFW4=";
34
33
35
34
isUnstable = true;
36
35
tests = [