Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts: pkgs/os-specific/linux/kernel/generic.nix
2018-02-07 03:41:24 +02:00
parent 335ae38674 fc1224d55d
commit 4c6c919a31
49 changed files with 1909 additions and 268 deletions
@@ -55,7 +55,7 @@ let
  config = import ./common-config.nix {
    inherit stdenv version ;
    # append extraConfig for backwards compatibility but also means the user can't override the kernelExtraConfig part
-    extraConfig = extraConfig + lib.optionalString (hostPlatform ? kernelExtraConfig ) hostPlatform.kernelExtraConfig;
+    extraConfig = extraConfig + lib.optionalString (hostPlatform.platform ? kernelExtraConfig) hostPlatform.platform.kernelExtraConfig;

    features = kernelFeatures; # Ensure we know of all extra patches, etc.
  };