diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-09-11 05:06:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 05:06:29 +0000 |
| commit | 13b7868ecbac1f5c9f7534081bab44ef0610b3f5 (patch) | |
| tree | cbc6df3b756139a7f6abd5f9de031934c556af3d /pkgs/os-specific | |
| parent | f6e3d47448e9d3611e99953b8816f4d06586a5ce (diff) | |
| parent | 05f122c5612e76e643f504275a35e6e05223bda9 (diff) | |
| download | nixlib-13b7868ecbac1f5c9f7534081bab44ef0610b3f5.tar nixlib-13b7868ecbac1f5c9f7534081bab44ef0610b3f5.tar.gz nixlib-13b7868ecbac1f5c9f7534081bab44ef0610b3f5.tar.bz2 nixlib-13b7868ecbac1f5c9f7534081bab44ef0610b3f5.tar.lz nixlib-13b7868ecbac1f5c9f7534081bab44ef0610b3f5.tar.xz nixlib-13b7868ecbac1f5c9f7534081bab44ef0610b3f5.tar.zst nixlib-13b7868ecbac1f5c9f7534081bab44ef0610b3f5.zip | |
Merge pull request #46426 from clefru/zfs-bump
spl/zfs: 0.7.9 -> 0.7.10
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 146e1c276965..6e22de4bcf62 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -10,13 +10,13 @@ assert kernel != null; stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; + sha256 = "1jkv6sdrd6yvaqx0jg86fjwnsqyxqb2061k7yrka7iyivgjzpi26"; }; patches = [ ./install_prefix.patch ]; @@ -52,6 +52,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index e6807f1214cc..e7cca579d624 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -158,12 +158,12 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.18"; + # incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.9"; + version = "0.7.10"; - sha256 = "0krpxrvnda2jx6l71xhw9fsksyp2a6h9l9asppac3szsd1n7fp9n"; + sha256 = "1kq35ij29fag77dxq21jf9ghbl4nkyjgc2bxzyry9rawznq542v1"; extraPatches = [ (fetchpatch { |