From e0caa641c027c80037754d97202c85f282a25966 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 22 May 2008 19:29:23 +0000
Subject: [PATCH] Packages changes, needed after recent kernel expression
 restructurisation

svn path=/nixpkgs/trunk/; revision=11883
---
 pkgs/os-specific/linux/kernel/linux.nix |  8 ++++++++
 pkgs/top-level/all-packages.nix         | 23 ++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux.nix b/pkgs/os-specific/linux/kernel/linux.nix
index d4b4ad6c7638..dc1996c0b9fc 100644
--- a/pkgs/os-specific/linux/kernel/linux.nix
+++ b/pkgs/os-specific/linux/kernel/linux.nix
@@ -29,6 +29,8 @@
 , # A list of additional statements to be appended to the
   # configuration file.
   extraConfig ? []
+
+, features ? []
 }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@@ -42,6 +44,12 @@ in
 stdenv.mkDerivation {
   name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
   builder = ./builder-custom.sh;
+
+  passthru = {
+    inherit version;
+    # Combine the `features' attribute sets of all the kernel patches.
+    features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
+  };
   
   inherit src;
   preConfigure = preConfigure;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e50d47b6e89..e1948a90f513 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3999,14 +3999,6 @@ let pkgs = rec {
 
   alsaUtils = alsa.alsaUtils;
 
-  atherosFun = lib.sumArgs (selectVersion ../os-specific/linux/atheros "0.9.4") {
-    inherit fetchurl stdenv builderDefs;
-  };
-
-  atherosFunCurrent = kernel: atherosFun {
-    inherit kernel;
-  } null;
-
   blcrFun = builderDefsPackage (selectVersion ../os-specific/linux/blcr "0.6.5"){
     inherit perl;
   };
@@ -4411,6 +4403,10 @@ let pkgs = rec {
       inherit fetchurl stdenv kernel;
     };
 
+    atheros = composedArgsAndFun (selectVersion ../os-specific/linux/atheros "0.9.4") {
+      inherit fetchurl stdenv builderDefs kernel;
+    } null;
+
     nvidiaDrivers = import ../os-specific/linux/nvidia {
       inherit stdenv fetchurl kernel xlibs gtkLibs;
     };
@@ -4419,6 +4415,10 @@ let pkgs = rec {
       inherit fetchurl stdenv kernel ncurses fxload;
     };
 
+    kqemu = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.3.0pre11") {
+      inherit kernel;
+    } null;
+
     # Actually, klibc builds fine with the static kernelHeaders, but
     # splashutils expects a klibc with patched headers...
     klibc = import ../os-specific/linux/klibc {
@@ -4474,13 +4474,6 @@ let pkgs = rec {
     inherit fetchurl stdenv perl mktemp module_init_tools lib;
   };
 
-  kqemuFun = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.3.0pre11") {
-    inherit builderDefs;
-  };
-
-  # No finished expression is provided - pick your own kernel
-  kqemuFunCurrent = kernel: kqemuFun {inherit kernel;};
-
   libselinux = import ../os-specific/linux/libselinux {
     inherit fetchurl stdenv libsepol;
   };