From 22d52c456a8d48254c62c7d2f8bacad8b2a9873f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 3 Dec 2007 22:48:03 +0000 Subject: [PATCH] More typos in kernel-related exprs svn path=/nixpkgs/branches/stdenv-updates/; revision=9844 --- pkgs/os-specific/linux/kernel/2.6.20.nix | 2 +- pkgs/os-specific/linux/kernel/2.6.21.nix | 2 +- pkgs/os-specific/linux/kernel/2.6.22.nix | 2 +- pkgs/os-specific/linux/kernel/2.6.23.1.nix | 8 ++++---- pkgs/os-specific/linux/kernel/2.6.23.nix | 2 +- pkgs/os-specific/linux/kernel/meta.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/2.6.20.nix b/pkgs/os-specific/linux/kernel/2.6.20.nix index 4b776dcb7062..b6c0c70b5805 100644 --- a/pkgs/os-specific/linux/kernel/2.6.20.nix +++ b/pkgs/os-specific/linux/kernel/2.6.20.nix @@ -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 diff --git a/pkgs/os-specific/linux/kernel/2.6.21.nix b/pkgs/os-specific/linux/kernel/2.6.21.nix index 1e822fa1627a..da7ef60e096f 100644 --- a/pkgs/os-specific/linux/kernel/2.6.21.nix +++ b/pkgs/os-specific/linux/kernel/2.6.21.nix @@ -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 diff --git a/pkgs/os-specific/linux/kernel/2.6.22.nix b/pkgs/os-specific/linux/kernel/2.6.22.nix index 6725d069381b..63943cd98939 100644 --- a/pkgs/os-specific/linux/kernel/2.6.22.nix +++ b/pkgs/os-specific/linux/kernel/2.6.22.nix @@ -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 diff --git a/pkgs/os-specific/linux/kernel/2.6.23.1.nix b/pkgs/os-specific/linux/kernel/2.6.23.1.nix index 9ba12173a115..3d4244a74dae 100644 --- a/pkgs/os-specific/linux/kernel/2.6.23.1.nix +++ b/pkgs/os-specific/linux/kernel/2.6.23.1.nix @@ -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!"; } ) diff --git a/pkgs/os-specific/linux/kernel/2.6.23.nix b/pkgs/os-specific/linux/kernel/2.6.23.nix index ad06bc4f7eba..ddbd56c92aff 100644 --- a/pkgs/os-specific/linux/kernel/2.6.23.nix +++ b/pkgs/os-specific/linux/kernel/2.6.23.nix @@ -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 diff --git a/pkgs/os-specific/linux/kernel/meta.nix b/pkgs/os-specific/linux/kernel/meta.nix index b52c0b55c52f..8dcdcecab526 100644 --- a/pkgs/os-specific/linux/kernel/meta.nix +++ b/pkgs/os-specific/linux/kernel/meta.nix @@ -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]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 781e1e9f165e..4c9f5af28b88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;