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/jool/default.nix
+++ b/pkgs/os-specific/linux/jool/default.nix
@@ -28,5 +28,7 @@ stdenv.mkDerivation {
    description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules";
    platforms = platforms.linux;
    maintainers = with maintainers; [ fpletz ];
+    # kernel version 4.3 is the most recent supported version
+    broken = builtins.compareVersions kernel.version "4.3" == 1;
  };
 }