More typos in kernel-related exprs
svn path=/nixpkgs/branches/stdenv-updates/; revision=9844
This commit is contained in:
parent
1893bbb860
commit
22d52c456a
@ -28,7 +28,7 @@ args:
|
||||
];
|
||||
|
||||
config = with args;
|
||||
if kernelConfig != null then kernelConfig else
|
||||
if config != null then config else
|
||||
if userModeLinux then ./config-2.6.20-uml else
|
||||
if stdenv.system == "i686-linux" then ./config-2.6.20-i686-smp else
|
||||
if stdenv.system == "x86_64-linux" then ./config-2.6.20-x86_64-smp else
|
||||
|
@ -36,7 +36,7 @@ args:
|
||||
];
|
||||
|
||||
config = with args;
|
||||
if kernelConfig != null then kernelConfig else
|
||||
if config != null then config else
|
||||
if userModeLinux then ./config-2.6.21-uml else
|
||||
if stdenv.system == "i686-linux" then ./config-2.6.21-i686-smp else
|
||||
if stdenv.system == "x86_64-linux" then ./config-2.6.21-x86_64-smp else
|
||||
|
@ -19,7 +19,7 @@ args:
|
||||
];
|
||||
|
||||
config = with args;
|
||||
if kernelConfig != null then kernelConfig else
|
||||
if config != null then config else
|
||||
if userModeLinux then ./config-2.6.22-uml else
|
||||
if stdenv.system == "i686-linux" then ./config-2.6.22-i686-smp else
|
||||
if stdenv.system == "x86_64-linux" then ./config-2.6.22-x86_64-smp else
|
||||
|
@ -32,10 +32,10 @@ args:
|
||||
];
|
||||
|
||||
config = with args;
|
||||
if kernelConfig != null then kernelConfig else
|
||||
if userModeLinux then ./config-2.6.23.1-uml else
|
||||
if stdenv.system == "i686-linux" then ./config-2.6.23.1-i686-smp else
|
||||
if stdenv.system == "x86_64-linux" then ./config-2.6.23.1-x86_64-smp else
|
||||
if config != null then config else
|
||||
if userModeLinux then ./config-2.6.23-uml else
|
||||
if stdenv.system == "i686-linux" then ./config-2.6.23-i686-smp else
|
||||
if stdenv.system == "x86_64-linux" then ./config-2.6.23-x86_64-smp else
|
||||
abort "No kernel configuration for your platform!";
|
||||
}
|
||||
)
|
||||
|
@ -8,7 +8,7 @@ args:
|
||||
systemPatches = [ ];
|
||||
|
||||
config = with args;
|
||||
if kernelConfig != null then kernelConfig else
|
||||
if config != null then config else
|
||||
if userModeLinux then ./config-2.6.23.1-uml else
|
||||
if stdenv.system == "i686-linux" then ./config-2.6.23.1-i686-smp else
|
||||
if stdenv.system == "x86_64-linux" then ./config-2.6.23.1-x86_64-smp else
|
||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
map (p: if p ? extraConfig then p.extraConfig else "") kernelPatches;
|
||||
in lib.concatStrings (addNewlines (configFromPatches ++ extraConfig));
|
||||
|
||||
config = configFile;
|
||||
inherit config;
|
||||
|
||||
buildInputs = [perl mktemp];
|
||||
|
||||
|
@ -3162,10 +3162,10 @@ rec {
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
uml = import ../os-specific/linux/kernel/linux-2.6.20.nix {
|
||||
uml = (import ../os-specific/linux/kernel {
|
||||
inherit fetchurl stdenv perl mktemp module_init_tools;
|
||||
userModeLinux = true;
|
||||
};
|
||||
}).default;
|
||||
|
||||
umlutilities = import ../os-specific/linux/uml-utilities {
|
||||
inherit fetchurl kernelHeaders stdenv;
|
||||
|
Loading…
Reference in New Issue
Block a user