diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2019-03-05 14:48:06 +0000 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2019-03-05 14:49:44 +0000 |
commit | 2bfd19fcb209287c34e6159dddbc1d2a99cd08a2 (patch) | |
tree | 42bcc33f31476522085fa711623693060aa42df9 /pkgs/os-specific/linux/zfs | |
parent | 7455307b608fdbb33463c97d281016cefb24f68d (diff) |
zfs: 0.7.12 -> 0.7.13
(cherry picked from commit b57080d34136fd8dcc49632696ceb5ed1ff73326)
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 73be13e17afe3..28a4836bf00ed 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -159,17 +159,18 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.20"; + # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.7.12"; + version = "0.7.13"; - sha256 = "1j432nb3a86isghdysir9xi6l5djmb5fbc5s9zr0rwg4ziisskbh"; + sha256 = "1l77bq7pvc54vl15pnrjd0njgpf00qjzy0x85dpfh5jxng84x1fb"; extraPatches = [ + # in case this gets out of date, just send Mic92 a pull request! (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch"; - sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh"; + url = "https://github.com/Mic92/zfs/commit/cf23c1d38bfc698a8a729fc0c5f9ca41591f4d95.patch"; + sha256 = "14v3x9ipvg2qd1vyf70nv909jd5zdxlsw5y8k60pfyvwm7g80wr5"; }) ]; @@ -187,6 +188,7 @@ in { isUnstable = true; extraPatches = [ + # in case this gets out of date, just send Mic92 a pull request! (fetchpatch { url = "https://github.com/Mic92/zfs/commit/bc29b5783da0af2c80c85126a1831ce1d52bfb69.patch"; sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw"; |