Merge master into staging-next

2021-01-11 18:42:29 +00:00
parent 4f0da4558f e3961ff41f
commit 757ad34b82
70 changed files with 1147 additions and 413 deletions
@@ -424,7 +424,7 @@ let
      MODULE_SIG            = no; # r13y, generates a random key during build and bakes it in
      # Depends on MODULE_SIG and only really helps when you sign your modules
      # and enforce signatures which we don't do by default.
-      SECURITY_LOCKDOWN_LSM = no;
+      SECURITY_LOCKDOWN_LSM = option no;
    } // optionalAttrs (!stdenv.hostPlatform.isAarch32) {

      # Detect buffer overflows on the stack