Typo in kernel's default.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=9826
This commit is contained in:
Yury G. Kudryashov 2007-12-01 20:29:37 +00:00
parent aca855729f
commit 691115bd20
3 changed files with 20 additions and 2 deletions

View File

@ -0,0 +1,17 @@
args:
(import ./meta.nix)
( args //
{
version = "2.6.23";
src_hash = { sha256 = "1nyv7004w40l4adzq2b0hrvk3f4iqwngkgrlh8as9cpz6l4prrnl"; };
systemPatches = [ ];
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
abort "No kernel configuration for your platform!";
}
)

View File

@ -1,7 +1,7 @@
args:
let
getValue = aSet: aName: default:
(if (aSet ? aName) then (builtins.getAttr aSet aName) else default);
(if (builtins.hasAttr aName aSet) then (builtins.getAttr aName aSet) else default);
in
let
@ -25,5 +25,6 @@ args.stdenv.lib.listOfListsToAttrs [
[ "2.6.21-ck" (import ./2.6.21-ck.nix newArgs) ]
[ "2.6.22" (import ./2.6.22.nix newArgs) ]
[ "2.6.22-ck" (import ./2.6.22-ck.nix newArgs) ]
[ "2.6.23" (import ./2.6.23.nix newArgs) ]
[ "2.6.23.1" (import ./2.6.23.1.nix newArgs) ]
]

View File

@ -2788,7 +2788,7 @@ rec {
# this creates a patch which can be applied to the kernel to integrate this module..
kernel_module_acerhk = import ../os-specific/linux/kernel/acerhk {
inherit fetchurl stdenv gnupatch;
kernel = kernel_2_6_21;
kernel = builtins.getAttr kernel "2.6.21";
debug = true;
};