From 30ae939142f30c2cd28fd6fbf00bf3fa7fa38626 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 25 Sep 2016 14:55:45 +0200 Subject: [PATCH] linuxPackages.spl: don't mark as broken on kernel >= 4.7 Compatibility added in c8c688b0c950e6a4dd0713aa4f591dadb4810675. --- pkgs/os-specific/linux/spl/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index c18e8f0bb35..debecef1c1b 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -60,10 +60,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ]; - broken = buildKernel - && (kernel.features.grsecurity or - # spl marked as broken until following patch is released - # https://github.com/zfsonlinux/spl/commit/fdbc1ba99d1f4d3958189079eee9b6c957e0264b - (versionAtLeast kernel.version "4.7")); + broken = buildKernel && kernel.features.grsecurity; }; }