* 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
This commit is contained in:
parent
fa314f0724
commit
d67aefc19d
@ -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
|
||||
|
@ -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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user