mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge pull request #257755 from adamcstephens/zfs/2.1.13
This commit is contained in:
commit
f427e60ce5
@ -14,10 +14,13 @@ callPackage ./generic.nix args {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible =
|
||||
if stdenv'.isx86_64 || removeLinuxDRM
|
||||
then kernel.kernelOlder "6.4"
|
||||
then kernel.kernelOlder "6.6"
|
||||
else kernel.kernelOlder "6.2";
|
||||
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;
|
||||
latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM
|
||||
then linuxKernel.packages.linux_6_5
|
||||
else linuxKernel.packages.linux_6_1;
|
||||
extraPatches = [
|
||||
# applied in version 2.2.x
|
||||
(fetchpatch {
|
||||
name = "musl.patch";
|
||||
url = "https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a.patch";
|
||||
@ -26,7 +29,7 @@ callPackage ./generic.nix args {
|
||||
];
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "2.1.12";
|
||||
version = "2.1.13";
|
||||
|
||||
sha256 = "eYUR5d4gpTrlFu6j1uL83DWL9uPGgAUDRdSEb73V5i4=";
|
||||
sha256 = "tqUCn/Hf/eEmyWRQthWQdmTJK2sDspnHiiEfn9rz2Kc=";
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user