Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-03-28 15:16:29 +00:00
parent 3f45f0948d c61445357e
commit f60c9df0ba
628 changed files with 60034 additions and 8180 deletions
--- a/pkgs/development/libraries/accelio/default.nix
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -57,5 +57,9 @@ stdenv.mkDerivation rec {
    license = licenses.bsd3;
    platforms = with platforms; linux ++ freebsd;
    maintainers = with maintainers; [ wkennington ];
+    # kernel 4.2 is the most recent supported kernel
+    broken = kernel != null &&
+      (builtins.compareVersions kernel.version "4.2" == 1 ||
+       (kernel.features.grsecurity or false));
  };
 }