public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux: clearer origin for settings configuration

Browse Source 
adds _file so that nix may have a chance to display what file the conflictings settings come
from.
This commit is contained in:
Matthieu Coudron 2019-08-21 22:14:31 +09:00 committed by Matthieu Coudron
parent 29c120c065
commit 2207378c9e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -151,8 +151,8 @@ let
moduleStructuredConfig = (lib.evalModules { moduleStructuredConfig = (lib.evalModules {
modules = [ modules = [
module module
{ settings = commonStructuredConfig; } { settings = commonStructuredConfig; _file = "pkgs/os-specific/linux/kernel/common-config.nix"; }
{ settings = structuredExtraConfig; } { settings = structuredExtraConfig; _file = "structuredExtraConfig"; }
] ]
++ structuredConfigFromPatches ++ structuredConfigFromPatches
; ;

3
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -278,7 +278,8 @@ in
assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null;
assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null; assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // {
name = "linux-${version}"; pname = "linux";
inherit version;
enableParallelBuilding = true; enableParallelBuilding = true;