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/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
    license = with licenses; [ lgpl21 gpl2 mit ];
    platforms = platforms.linux;
    maintainers = [ maintainers.bjornfor ];
+    broken =
+      (builtins.compareVersions kernel.version "3.18" == -1) ||
+      (kernel.features.grsecurity or false);
  };

 }