* Use the generic kernel builder.

svn path=/nixpkgs/trunk/; revision=13779

pkgs/os-specific/linux/kernel/linux-2.6.20.nix

@@ -1,77 +1,21 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
+args @ {stdenv, fetchurl, userModeLinux ? false, ...}:
 
-  # A list of patches to apply to the kernel.  Each element of this list
+import ./generic.nix (
-  # should be an attribute set {name, patch} where `name' is a
-  # symbolic name and `patch' is the actual patch.  The patch may
-  # optionally be compressed with gzip or bzip2.
-, kernelPatches ? []
 
-, # Whether to build a User-Mode Linux kernel.
+  rec {
-  userModeLinux ? false
+    version = "2.6.20.12";
-
-, # Allows you to set your own kernel version suffix (e.g.,
-  # "-my-kernel").
-  localVersion ? ""
-
-, # Your own kernel configuration file, if you don't want to use the
-  # default. 
-  kernelConfig ? null  
-}:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let
-
-  lib = import ../../../lib;
-
-  version = "2.6.20.12";
-
-in
-
-stdenv.mkDerivation {
-  name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
-  builder = ./builder.sh;
   
-  src = fetchurl {
+    src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "1s7vdpg2897q5pcyxxypqcnibwpbdawbimkf3pngmahj8wr9c03x";
+      sha256 = "1s7vdpg2897q5pcyxxypqcnibwpbdawbimkf3pngmahj8wr9c03x";
-  };
+    };
-  
-  patches = map (p: p.patch) kernelPatches;
-  
-  extraConfig = lib.concatStrings (map (p: "\n" + (if p ? extraConfig then p.extraConfig else "") + "\n") kernelPatches);
 
-  config =
+    config =
-    if kernelConfig != null then kernelConfig else
+      if userModeLinux then ./config-2.6.20-uml 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 == "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
-    if stdenv.system == "x86_64-linux" then ./config-2.6.20-x86_64-smp else
+      abort "No kernel configuration for your platform!";
-    abort "No kernel configuration for your platform!";
+  }
-  
-  buildInputs = [perl mktemp];
-  
-  arch =
-    if userModeLinux then "um" else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    abort "Platform ${stdenv.system} is not supported.";
 
-  makeFlags = if userModeLinux then "ARCH=um SHELL=bash HAVE_AIO_ABI=" else "";
+  // args
-
+)
-  inherit module_init_tools;
-
-  allowLocalVersion = false; # don't allow patches to set a suffix
-  inherit localVersion; # but do allow the user to set one.
-
-  meta = {
-    description =
-      (if userModeLinux then
-        "User-Mode Linux"
-       else
-        "The Linux kernel") +
-      (if kernelPatches == [] then "" else
-        " (with patches: "
-        + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
-        + ")");
-  };
-}

pkgs/os-specific/linux/kernel/linux-2.6.21.nix

@@ -1,76 +1,21 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
+args @ {stdenv, fetchurl, userModeLinux ? false, ...}:
 
-  # A list of patches to apply to the kernel.  Each element of this list
+import ./generic.nix (
-  # should be an attribute set {name, patch} where `name' is a
-  # symbolic name and `patch' is the actual patch.  The patch may
-  # optionally be compressed with gzip or bzip2.
-, kernelPatches ? []
 
-, # Whether to build a User-Mode Linux kernel.
+  rec {
-  userModeLinux ? false
+    version = "2.6.21.7";
-
-, # Allows you to set your own kernel version suffix (e.g.,
-  # "-my-kernel").
-  localVersion ? ""
-
-, # Your own kernel configuration file, if you don't want to use the
-  # default. 
-  kernelConfig ? null  
-}:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let
-
-  lib = import ../../../lib;
-
-  version = "2.6.21.7";
-
-in
-
-stdenv.mkDerivation {
-  name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
-  builder = ./builder.sh;
   
-  src = fetchurl {
+    src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "1c8ndsz35qd8vyng3xsxjjkjv5bnzyvc9b5vd85fz5v0bjp8hx50";
+      sha256 = "1c8ndsz35qd8vyng3xsxjjkjv5bnzyvc9b5vd85fz5v0bjp8hx50";
-  };
+    };
-  
-  patches = map (p: p.patch) kernelPatches;
-  extraConfig = lib.concatStrings (map (p: "\n" + (if p ? extraConfig then p.extraConfig else "") + "\n") kernelPatches);
 
-  config =
+    config =
-    if kernelConfig != null then kernelConfig else
+      if userModeLinux then ./config-2.6.21-uml 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 == "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
-    if stdenv.system == "x86_64-linux" then ./config-2.6.21-x86_64-smp else
+      abort "No kernel configuration for your platform!";
-    abort "No kernel configuration for your platform!";
+  }
-  
-  buildInputs = [perl mktemp];
-  
-  arch =
-    if userModeLinux then "um" else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    abort "Platform ${stdenv.system} is not supported.";
 
-  makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else "";
+  // args
-
+)
-  inherit module_init_tools;
-
-  allowLocalVersion = false; # don't allow patches to set a suffix
-  inherit localVersion; # but do allow the user to set one.
-
-  meta = {
-    description =
-      (if userModeLinux then
-        "User-Mode Linux"
-       else
-        "The Linux kernel") +
-      (if kernelPatches == [] then "" else
-        " (with patches: "
-        + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
-        + ")");
-  };
-}

pkgs/os-specific/linux/kernel/linux-2.6.21_ck.nix

@@ -1,84 +0,0 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
-
-  # A list of patches to apply to the kernel.  Each element of this list
-  # should be an attribute set {name, patch} where `name' is a
-  # symbolic name and `patch' is the actual patch.  The patch may
-  # optionally be compressed with gzip or bzip2.
-, kernelPatches ? []
-
-, # Whether to build a User-Mode Linux kernel.
-  userModeLinux ? false
-
-, # Allows you to set your own kernel version suffix (e.g.,
-  # "-my-kernel").
-  localVersion ? ""
-
-, # Your own kernel configuration file, if you don't want to use the
-  # default. 
-  kernelConfig ? null
-
-, # A list of additional statements to be appended to the
-  # configuration file.
-  extraConfig ? []
-}:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let
-
-  lib = import ../../../lib;
-
-  version = "2.6.21";
-
-in
-
-stdenv.mkDerivation {
-  name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2";
-    sha256 = "f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942";
-  };
-  
-  patches = map (p: p.patch) kernelPatches;
-  extraConfig =
-    let addNewlines = map (s: "\n" + s + "\n");
-        configFromPatches =
-          map (p: if p ? extraConfig then p.extraConfig else "") kernelPatches;
-    in lib.concatStrings (addNewlines (configFromPatches ++ extraConfig));
-
-  config =
-    if kernelConfig != null then kernelConfig 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
-    abort "No kernel configuration for your platform!";
-  
-  buildInputs = [perl mktemp];
-  
-  arch =
-    if userModeLinux then "um" else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    abort "Platform ${stdenv.system} is not supported.";
-
-  makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else "";
-
-  inherit module_init_tools;
-
-  allowLocalVersion = false; # don't allow patches to set a suffix
-  inherit localVersion; # but do allow the user to set one.
-
-  meta = {
-    description =
-      (if userModeLinux then
-        "User-Mode Linux"
-       else
-        "The Linux kernel") +
-      (if kernelPatches == [] then "" else
-        " (with patches: "
-        + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
-        + ")");
-  };
-}

pkgs/os-specific/linux/kernel/linux-2.6.22.nix

@@ -1,84 +1,21 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
+args @ {stdenv, fetchurl, userModeLinux ? false, ...}:
 
-  # A list of patches to apply to the kernel.  Each element of this list
+import ./generic.nix (
-  # should be an attribute set {name, patch} where `name' is a
-  # symbolic name and `patch' is the actual patch.  The patch may
-  # optionally be compressed with gzip or bzip2.
-, kernelPatches ? []
 
-, # Whether to build a User-Mode Linux kernel.
+  rec {
-  userModeLinux ? false
+    version = "2.6.22.18";
-
-, # Allows you to set your own kernel version suffix (e.g.,
-  # "-my-kernel").
-  localVersion ? ""
-
-, # Your own kernel configuration file, if you don't want to use the
-  # default. 
-  kernelConfig ? null
-
-, # A list of additional statements to be appended to the
-  # configuration file.
-  extraConfig ? []
-}:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let
-
-  lib = import ../../../lib;
-
-  version = "2.6.22.18";
-
-in
-
-stdenv.mkDerivation {
-  name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
-  builder = ./builder.sh;
   
-  src = fetchurl {
+    src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "09acj1xr16j9y91gzwzcjhanhcpyac1ah2lc42mfi7d8c0plagry";
+      sha256 = "09acj1xr16j9y91gzwzcjhanhcpyac1ah2lc42mfi7d8c0plagry";
-  };
+    };
-  
-  patches = map (p: p.patch) kernelPatches;
-  extraConfig =
-    let addNewlines = map (s: "\n" + s + "\n");
-        configFromPatches =
-          map (p: if p ? extraConfig then p.extraConfig else "") kernelPatches;
-    in lib.concatStrings (addNewlines (configFromPatches ++ extraConfig));
 
-  config =
+    config =
-    if kernelConfig != null then kernelConfig else
+      if userModeLinux then ./config-2.6.22-uml 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 == "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
-    if stdenv.system == "x86_64-linux" then ./config-2.6.22-x86_64-smp else
+      abort "No kernel configuration for your platform!";
-    abort "No kernel configuration for your platform!";
+  }
-  
-  buildInputs = [perl mktemp];
-  
-  arch =
-    if userModeLinux then "um" else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    abort "Platform ${stdenv.system} is not supported.";
 
-  makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else "";
+  // args
-
+)
-  inherit module_init_tools;
-
-  allowLocalVersion = false; # don't allow patches to set a suffix
-  inherit localVersion; # but do allow the user to set one.
-
-  meta = {
-    description =
-      (if userModeLinux then
-        "User-Mode Linux"
-       else
-        "The Linux kernel") +
-      (if kernelPatches == [] then "" else
-        " (with patches: "
-        + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
-        + ")");
-  };
-}

pkgs/os-specific/linux/kernel/linux-2.6.23.nix

@@ -1,91 +1,21 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
+args @ {stdenv, fetchurl, userModeLinux ? false, ...}:
 
-  # A list of patches to apply to the kernel.  Each element of this list
+import ./generic.nix (
-  # should be an attribute set {name, patch} where `name' is a
-  # symbolic name and `patch' is the actual patch.  The patch may
-  # optionally be compressed with gzip or bzip2.
-, kernelPatches ? []
 
-, # Whether to build a User-Mode Linux kernel.
+  rec {
-  userModeLinux ? false
+    version = "2.6.23.17";
-
-, # Allows you to set your own kernel version suffix (e.g.,
-  # "-my-kernel").
-  localVersion ? ""
-
-, # Your own kernel configuration file, if you don't want to use the
-  # default. 
-  kernelConfig ? null
-
-, # A list of additional statements to be appended to the
-  # configuration file.
-  extraConfig ? []
-}:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let
-
-  lib = import ../../../lib;
-
-  version = "2.6.23.17";
-
-in
-
-stdenv.mkDerivation {
-  name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
-
-  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) {} kernelPatches;
-  };
   
-  builder = ./builder.sh;
+    src = fetchurl {
-  
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-  src = fetchurl {
+      sha256 = "0lww6ywgl353xlaxcc3hg5d2q1vcydbqhddvkfpphr07zr7mwl32";
-    url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+    };
-    sha256 = "0lww6ywgl353xlaxcc3hg5d2q1vcydbqhddvkfpphr07zr7mwl32";
-  };
-  
-  patches = map (p: p.patch) kernelPatches;
-  extraConfig =
-    let addNewlines = map (s: "\n" + s + "\n");
-        configFromPatches =
-          map (p: if p ? extraConfig then p.extraConfig else "") kernelPatches;
-    in lib.concatStrings (addNewlines (configFromPatches ++ extraConfig));
 
-  config =
+    config =
-    if kernelConfig != null then kernelConfig else
+      if userModeLinux then ./config-2.6.23-uml 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 == "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
-    if stdenv.system == "x86_64-linux" then ./config-2.6.23-x86_64-smp else
+      abort "No kernel configuration for your platform!";
-    abort "No kernel configuration for your platform!";
+  }
-  
-  buildInputs = [perl mktemp];
-  
-  arch =
-    if userModeLinux then "um" else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    abort "Platform ${stdenv.system} is not supported.";
 
-  makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else "";
+  // args
-
+)
-  inherit module_init_tools;
-
-  allowLocalVersion = false; # don't allow patches to set a suffix
-  inherit localVersion; # but do allow the user to set one.
-
-  meta = {
-    description =
-      (if userModeLinux then
-        "User-Mode Linux"
-       else
-        "The Linux kernel") +
-      (if kernelPatches == [] then "" else
-        " (with patches: "
-        + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
-        + ")");
-  };
-}

pkgs/os-specific/linux/kernel/linux-2.6.25.nix

@@ -1,95 +1,25 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
+args @ {stdenv, fetchurl, userModeLinux ? false, ...}:
 
-  # A list of patches to apply to the kernel.  Each element of this list
+import ./generic.nix (
-  # should be an attribute set {name, patch} where `name' is a
-  # symbolic name and `patch' is the actual patch.  The patch may
-  # optionally be compressed with gzip or bzip2.
-, kernelPatches ? []
 
-, # Whether to build a User-Mode Linux kernel.
+  rec {
-  userModeLinux ? false
+    version = "2.6.25.17";
-
-, # Allows you to set your own kernel version suffix (e.g.,
-  # "-my-kernel").
-  localVersion ? ""
-
-, # Your own kernel configuration file, if you don't want to use the
-  # default. 
-  kernelConfig ? null
-
-, # A list of additional statements to be appended to the
-  # configuration file.
-  extraConfig ? []
-}:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let
-
-  lib = stdenv.lib;
-
-  version = "2.6.25.17";
-
-  baseFeatures = {
-    iwlwifi = true;
-  };
-
-in
-
-stdenv.mkDerivation {
-  name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
-
-  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) baseFeatures kernelPatches;
-  };
   
-  builder = ./builder.sh;
+    src = fetchurl {
-  
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-  src = fetchurl {
+      sha256 = "15jx163rryvvdy65wgfpws8l5cqrczfygsz6v5280i5glhy1dh77";
-    url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+    };
-    sha256 = "15jx163rryvvdy65wgfpws8l5cqrczfygsz6v5280i5glhy1dh77";
-  };
-  
-  patches = map (p: p.patch) kernelPatches;
-  extraConfig =
-    let addNewlines = map (s: "\n" + s + "\n");
-        configFromPatches =
-          map (p: if p ? extraConfig then p.extraConfig else "") kernelPatches;
-    in lib.concatStrings (addNewlines (configFromPatches ++ extraConfig));
 
-  config =
+    features = {
-    if kernelConfig != null then kernelConfig else
+      iwlwifi = true;
-    if userModeLinux then ./config-2.6.25-uml else
+    };
-    if stdenv.system == "i686-linux" then ./config-2.6.25-i686-smp else
+ 
-    if stdenv.system == "x86_64-linux" then ./config-2.6.25-x86_64-smp else
+    config =
-    abort "No kernel configuration for your platform!";
+      if userModeLinux then ./config-2.6.25-uml else
-  
+      if stdenv.system == "i686-linux" then ./config-2.6.25-i686-smp else
-  buildInputs = [perl mktemp];
+      if stdenv.system == "x86_64-linux" then ./config-2.6.25-x86_64-smp else
-  
+      abort "No kernel configuration for your platform!";
-  arch =
+  }
-    if userModeLinux then "um" else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    abort "Platform ${stdenv.system} is not supported.";
 
-  makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else "";
+  // args
-
+)
-  inherit module_init_tools;
-
-  allowLocalVersion = false; # don't allow patches to set a suffix
-  inherit localVersion; # but do allow the user to set one.
-
-  meta = {
-    description =
-      (if userModeLinux then
-        "User-Mode Linux"
-       else
-        "The Linux kernel") +
-      (if kernelPatches == [] then "" else
-        " (with patches: "
-        + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
-        + ")");
-  };
-}

pkgs/os-specific/linux/kernel/linux-2.6.26.nix

@@ -1,95 +1,26 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
+args @ {stdenv, fetchurl, userModeLinux ? false, ...}:
 
-  # A list of patches to apply to the kernel.  Each element of this list
+assert !userModeLinux;
-  # should be an attribute set {name, patch} where `name' is a
-  # symbolic name and `patch' is the actual patch.  The patch may
-  # optionally be compressed with gzip or bzip2.
-, kernelPatches ? []
 
-, # Whether to build a User-Mode Linux kernel.
+import ./generic.nix (
-  userModeLinux ? false
 
-, # Allows you to set your own kernel version suffix (e.g.,
+  rec {
-  # "-my-kernel").
+    version = "2.6.26.7";
-  localVersion ? ""
-
-, # Your own kernel configuration file, if you don't want to use the
-  # default. 
-  kernelConfig ? null
-
-, # A list of additional statements to be appended to the
-  # configuration file.
-  extraConfig ? []
-}:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let
-
-  lib = stdenv.lib;
-
-  version = "2.6.26.7";
-
-  baseFeatures = {
-    iwlwifi = true;
-  };
-
-in
-
-stdenv.mkDerivation {
-  name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
-
-  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) baseFeatures kernelPatches;
-  };
   
-  builder = ./builder.sh;
+    src = fetchurl {
-  
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-  src = fetchurl {
+      sha256 = "1za4xq9q4gngmdxxwi728hdp30wjkwg4sh07fgyrs4nakjbjsgsj";
-    url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+    };
-    sha256 = "1za4xq9q4gngmdxxwi728hdp30wjkwg4sh07fgyrs4nakjbjsgsj";
-  };
-  
-  patches = map (p: p.patch) kernelPatches;
-  extraConfig =
-    let addNewlines = map (s: "\n" + s + "\n");
-        configFromPatches =
-          map (p: if p ? extraConfig then p.extraConfig else "") kernelPatches;
-    in lib.concatStrings (addNewlines (configFromPatches ++ extraConfig));
 
-  config =
+    features = {
-    if kernelConfig != null then kernelConfig else
+      iwlwifi = true;
-    if userModeLinux then ./config-2.6.26-uml else
+    };
-    if stdenv.system == "i686-linux" then ./config-2.6.26-i686-smp else
+ 
-    if stdenv.system == "x86_64-linux" then ./config-2.6.26-x86_64-smp else
+    config =
-    abort "No kernel configuration for your platform!";
+      if stdenv.system == "i686-linux" then ./config-2.6.26-i686-smp else
-  
+      if stdenv.system == "x86_64-linux" then ./config-2.6.26-x86_64-smp else
-  buildInputs = [perl mktemp];
+      abort "No kernel configuration for your platform!";
-  
+  }
-  arch =
-    if userModeLinux then "um" else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    abort "Platform ${stdenv.system} is not supported.";
 
-  makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else "";
+  // args
-
+)
-  inherit module_init_tools;
-
-  allowLocalVersion = false; # don't allow patches to set a suffix
-  inherit localVersion; # but do allow the user to set one.
-
-  meta = {
-    description =
-      (if userModeLinux then
-        "User-Mode Linux"
-       else
-        "The Linux kernel") +
-      (if kernelPatches == [] then "" else
-        " (with patches: "
-        + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
-        + ")");
-  };
-}

pkgs/os-specific/linux/kernel/linux-2.6.27.nix

@@ -1,95 +1,26 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
+args @ {stdenv, fetchurl, userModeLinux ? false, ...}:
 
-  # A list of patches to apply to the kernel.  Each element of this list
+assert !userModeLinux;
-  # should be an attribute set {name, patch} where `name' is a
-  # symbolic name and `patch' is the actual patch.  The patch may
-  # optionally be compressed with gzip or bzip2.
-, kernelPatches ? []
 
-, # Whether to build a User-Mode Linux kernel.
+import ./generic.nix (
-  userModeLinux ? false
 
-, # Allows you to set your own kernel version suffix (e.g.,
+  rec {
-  # "-my-kernel").
+    version = "2.6.27.10";
-  localVersion ? ""
-
-, # Your own kernel configuration file, if you don't want to use the
-  # default. 
-  kernelConfig ? null
-
-, # A list of additional statements to be appended to the
-  # configuration file.
-  extraConfig ? []
-}:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let
-
-  lib = stdenv.lib;
-
-  version = "2.6.27.10";
-
-  baseFeatures = {
-    iwlwifi = true;
-  };
-
-in
-
-stdenv.mkDerivation {
-  name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
-
-  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) baseFeatures kernelPatches;
-  };
   
-  builder = ./builder.sh;
+    src = fetchurl {
-  
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-  src = fetchurl {
+      sha256 = "1g6k7m75cqjznibl249g43plkrgmca96sq5c7bdp18rmnalwh9w5";
-    url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
+    };
-    sha256 = "1g6k7m75cqjznibl249g43plkrgmca96sq5c7bdp18rmnalwh9w5";
-  };
-  
-  patches = map (p: p.patch) kernelPatches;
-  extraConfig =
-    let addNewlines = map (s: "\n" + s + "\n");
-        configFromPatches =
-          map (p: if p ? extraConfig then p.extraConfig else "") kernelPatches;
-    in lib.concatStrings (addNewlines (configFromPatches ++ extraConfig));
 
-  config =
+    features = {
-    if kernelConfig != null then kernelConfig else
+      iwlwifi = true;
-    if userModeLinux then ./config-2.6.27-uml else
+    };
-    if stdenv.system == "i686-linux" then ./config-2.6.27-i686-smp else
+ 
-    if stdenv.system == "x86_64-linux" then ./config-2.6.27-x86_64-smp else
+    config =
-    abort "No kernel configuration for your platform!";
+      if stdenv.system == "i686-linux" then ./config-2.6.27-i686-smp else
-  
+      if stdenv.system == "x86_64-linux" then ./config-2.6.27-x86_64-smp else
-  buildInputs = [perl mktemp];
+      abort "No kernel configuration for your platform!";
-  
+  }
-  arch =
-    if userModeLinux then "um" else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    abort "Platform ${stdenv.system} is not supported.";
 
-  makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else "";
+  // args
-
+)
-  inherit module_init_tools;
-
-  allowLocalVersion = false; # don't allow patches to set a suffix
-  inherit localVersion; # but do allow the user to set one.
-
-  meta = {
-    description =
-      (if userModeLinux then
-        "User-Mode Linux"
-       else
-        "The Linux kernel") +
-      (if kernelPatches == [] then "" else
-        " (with patches: "
-        + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
-        + ")");
-  };
-}

pkgs/top-level/all-packages.nix

@@ -6224,64 +6224,6 @@ let
       [(getConfig ["kernel" "addConfig"] "")];
   };
 
-  kernel_2_6_21_ck = import ../os-specific/linux/kernel/linux-2.6.21_ck.nix {
-    inherit fetchurl stdenv perl mktemp module_init_tools;
-    kernelPatches = [
-      { name = "ext3cow";
-        patch = ../os-specific/linux/kernel/linux-2.6.20.3-ext3cow.patch;
-        extraConfig =
-        "CONFIG_EXT3COW_FS=m\n" +
-        "CONFIG_EXT3COW_FS_XATTR=y\n" +
-        "CONFIG_EXT3COW_FS_POSIX_ACL=y\n" +
-        "CONFIG_EXT3COW_FS_SECURITY=y\n";
-      }
-      { name = "Con Kolivas Patch";
-        patch = ../os-specific/linux/kernel/patch-2.6.21-ck1;
-      }
-      { name = "paravirt-nvidia";
-        patch = ../os-specific/linux/kernel/2.6.20-paravirt-nvidia.patch;
-      }
-      { name = "skas-2.6.20-v9-pre9";
-        patch = fetchurl {
-          url = http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-2.6.20-v9-pre9/skas-2.6.20-v9-pre9.patch.bz2;
-          md5 = "02e619e5b3aaf0f9768f03ac42753e74";
-        };
-        extraConfig =
-          "CONFIG_PROC_MM=y\n" +
-          "# CONFIG_PROC_MM_DUMPABLE is not set\n";
-      }
-      { name = "fbsplash-0.9.2-r5-2.6.21";
-        patch = fetchurl {
-          url = http://dev.gentoo.org/~dsd/genpatches/trunk/2.6.21/4200_fbsplash-0.9.2-r5.patch;
-          sha256 = "00s8074fzsly2zpir885zqkvq267qyzg6vhsn7n1z2v1z78avxd8";
-        };
-        extraConfig = "CONFIG_FB_SPLASH=y";
-      }
-    ];
-  };
-
-  kernel_2_6_25 = import ../os-specific/linux/kernel/linux-2.6.25.nix {
-    inherit fetchurl stdenv perl mktemp module_init_tools;
-    kernelPatches = [
-      { name = "fbcondecor-0.9.4-2.6.25-rc6";
-        patch = fetchurl {
-          url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch;
-          sha256 = "1wm94n7f0qyb8xvafip15r158z5pzw7zb7q8hrgddb092c6ibmq8";
-        };
-        extraConfig = "CONFIG_FB_CON_DECOR=y";
-        features = { fbConDecor = true; };
-      }
-      { name = "sec_perm-2.6.24";
-        patch = ../os-specific/linux/kernel/sec_perm-2.6.24.patch;
-        features = { secPermPatch = true; };
-      }
-    ];
-    extraConfig =
-      lib.optional (getConfig ["kernel" "timer_stats"] false) "CONFIG_TIMER_STATS=y" ++
-      lib.optional (getConfig ["kernel" "no_irqbalance"] false) "# CONFIG_IRQBALANCE is not set" ++
-      [(getConfig ["kernel" "addConfig"] "")];
-  };
-
   kernel_2_6_23 = import ../os-specific/linux/kernel/linux-2.6.23.nix {
     inherit fetchurl stdenv perl mktemp module_init_tools;
     kernelPatches = [
@@ -6326,6 +6268,28 @@ let
       [(getConfig ["kernel" "addConfig"] "")];
   };
 
+  kernel_2_6_25 = import ../os-specific/linux/kernel/linux-2.6.25.nix {
+    inherit fetchurl stdenv perl mktemp module_init_tools;
+    kernelPatches = [
+      { name = "fbcondecor-0.9.4-2.6.25-rc6";
+        patch = fetchurl {
+          url = http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch;
+          sha256 = "1wm94n7f0qyb8xvafip15r158z5pzw7zb7q8hrgddb092c6ibmq8";
+        };
+        extraConfig = "CONFIG_FB_CON_DECOR=y";
+        features = { fbConDecor = true; };
+      }
+      { name = "sec_perm-2.6.24";
+        patch = ../os-specific/linux/kernel/sec_perm-2.6.24.patch;
+        features = { secPermPatch = true; };
+      }
+    ];
+    extraConfig =
+      lib.optional (getConfig ["kernel" "timer_stats"] false) "CONFIG_TIMER_STATS=y" ++
+      lib.optional (getConfig ["kernel" "no_irqbalance"] false) "# CONFIG_IRQBALANCE is not set" ++
+      [(getConfig ["kernel" "addConfig"] "")];
+  };
+
   kernel_2_6_26 = import ../os-specific/linux/kernel/linux-2.6.26.nix {
     inherit fetchurl stdenv perl mktemp module_init_tools;
     kernelPatches = [
@@ -6508,9 +6472,8 @@ let
 
   # The current default kernel / kernel modules.
   kernelPackages = kernelPackages_2_6_25;
-  #kernel = kernelPackages.kernel;
 
-  customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/linux.nix) {
+  customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/generic.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools lib;
   });