* Remove `customKernel' which is obsolete as far as I can tell.

* Remove `sumTwoArgs' since it has no remaining callers.

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

2 files changed, 1 insertions, 10 deletions

diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix
index 321b641372d..85fa1629b0b 100644
--- a/pkgs/lib/misc.nix
+++ b/pkgs/lib/misc.nix
@@ -19,8 +19,6 @@ rec {
   else 
     (y x);
   defaultMerge = x: y: x // (defaultMergeArg x y);
-  sumTwoArgs = f: x: y: 
-    f (defaultMerge x y);
   foldArgs = merger: f: init: x: 
     let arg=(merger init (defaultMergeArg init x));
       # now add the function with composed args already applied to the final attrs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab954ae00bb..4c16b16ec30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2,10 +2,7 @@
    imports the functions that build the various packages, and calls
    them with appropriate arguments.  The result is a set of all the
    packages in the Nix Packages collection for some particular
-   platform.
-
-   You want to get to know where to add a new package ?
-   Have a look at nixpkgs/maintainers/docs/classification.txt */
+   platform. */
 
 
 { # The system (e.g., `i686-linux') for which to build the packages.
@@ -6729,10 +6726,6 @@ let
   linux = linux_2_6_32;
   linuxPackages = linuxPackagesFor linux;
 
-  customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/generic.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools;
-  });
-
   keyutils = import ../os-specific/linux/keyutils {
     inherit fetchurl stdenv;
   };