Merge pull request #246300 from toastal/zfs-2.1.13-unstable-2023-07-26

This commit is contained in:
Ryan Lahfa 2023-08-21 15:25:36 +02:00 committed by GitHub
commit 91f799fc39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -12,18 +12,21 @@ in
callPackage ./generic.nix args { callPackage ./generic.nix args {
# check the release notes for compatible kernels # check the release notes for compatible kernels
kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM
then kernel.kernelOlder "6.4" then kernel.kernelOlder "6.5"
else kernel.kernelOlder "6.2"; else kernel.kernelOlder "6.2";
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1; latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM
then linuxKernel.packages.linux_6_4
else linuxKernel.packages.linux_6_1;
# this package should point to a version / git revision compatible with the latest kernel release # 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 # IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS # zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers. # maintainers.
version = "2.1.12"; version = "2.1.13-unstable-2023-08-02";
rev = "245850b66c1e93ec19744ca55aae143d007d2c32";
sha256 = "eYUR5d4gpTrlFu6j1uL83DWL9uPGgAUDRdSEb73V5i4="; sha256 = "TtgKV02W8OfU6hssULF/IoFXAPHBTvTKXn5hJ/RGAc0=";
isUnstable = true; isUnstable = true;
} }