Merge branch 'master' into staging

Conflicts: pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
parent f3c994ca11 898edb0fbc
commit b74793bd1c
21 changed files with 291 additions and 208 deletions
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
    license = stdenv.lib.licenses.gpl2;
    maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
    platforms = with stdenv.lib.platforms; linux;
+    broken = (kernel.features.grsecurity or false);
  };
 }