public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32634 from clefru/zfs-bump

Browse Source 
zfs/spl bump to 0.7.4 to fix incompatibility with 4.14
This commit is contained in:
Orivej Desh 2017-12-13 16:12:32 +00:00 committed by GitHub
commit fc96261aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/spl/default.nix
View File

@ -66,10 +66,8 @@ in
assert buildKernel -> kernel != null; assert buildKernel -> kernel != null;
{ {
splStable = common { splStable = common {
version = "0.7.3"; version = "0.7.4";
sha256 = "0j8mb9ky3pjz9hnz5w6fajpzajl15jq3p0xvxb6lhpqj3rjzsqxb"; sha256 = "0vmakqi3zm8ka5cglif45ll2m6ynq7r55mhk8d1rzjkgi191cddh";
broken = kernel != null && stdenv.lib.versionAtLeast kernel.version "4.14";
}; };
splUnstable = common { splUnstable = common {

4
pkgs/os-specific/linux/zfs/default.nix
View File

@ -140,9 +140,9 @@ in {
incompatibleKernelVersion = null; incompatibleKernelVersion = null;
# this package should point to the latest release. # this package should point to the latest release.
version = "0.7.3"; version = "0.7.4";
sha256 = "1bbajrwfilnmfhn1n69gvsaznyc4q29wi7nkwc0p9r4dli37w28b"; sha256 = "1djm97nlipn0fch1vcvpw94bnfvg9ylv9i2hp46dzaxhdh7bm265";
extraPatches = [ extraPatches = [
(fetchpatch { (fetchpatch {