Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zfs: 2.1.1 → 2.1.2 #150923

Merged
merged 2 commits into from
Dec 17, 2021
Merged

zfs: 2.1.1 → 2.1.2 #150923

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9339e8e
zfs: Update repository
amarshall Dec 16, 2021
04ae83a
zfs: 2.1.1 -> 2.1.2
amarshall Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions pkgs/os-specific/linux/zfs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
, enablePython ? true

# for determining the latest compatible linuxPackages
, linuxPackages_5_10 ? pkgs.linuxKernel.packages.linux_5_10
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
}:

with lib;
Expand Down Expand Up @@ -46,7 +46,7 @@ let
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";

src = fetchFromGitHub {
owner = "zfsonlinux";
owner = "openzfs";
repo = "zfs";
inherit rev sha256;
};
Expand Down Expand Up @@ -215,28 +215,28 @@ in {
# to be adapted
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_10;
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16";
latestCompatibleLinuxPackages = linuxPackages_5_15;

# this package should point to the latest release.
version = "2.1.1";
version = "2.1.2";

sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=";
sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8=";
};

zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_10;
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16";
latestCompatibleLinuxPackages = linuxPackages_5_15;

# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.1.1";
version = "2.1.2";
# rev = "0000000000000000000000000000000000000000";

sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=";
sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8=";

isUnstable = true;
};
Expand Down