mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-05-13 07:47:02 +00:00
Code Issues Wiki Activity

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

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

svn path=/nixpkgs/trunk/; revision=22797
This commit is contained in:
Eelco Dolstra 2010-07-28 16:09:13 +00:00
parent fa314f0724
commit d67aefc19d
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/lib/misc.nix
View file

@ -19,8 +19,6 @@ rec {
else else
(y x); (y x);
defaultMerge = x: y: x // (defaultMergeArg x y); defaultMerge = x: y: x // (defaultMergeArg x y);
sumTwoArgs = f: x: y:
f (defaultMerge x y);
foldArgs = merger: f: init: x: foldArgs = merger: f: init: x:
let arg=(merger init (defaultMergeArg init x)); let arg=(merger init (defaultMergeArg init x));
# now add the function with composed args already applied to the final attrs # now add the function with composed args already applied to the final attrs

9
pkgs/top-level/all-packages.nix
View file

@ -2,10 +2,7 @@
imports the functions that build the various packages, and calls imports the functions that build the various packages, and calls
them with appropriate arguments. The result is a set of all the them with appropriate arguments. The result is a set of all the
packages in the Nix Packages collection for some particular packages in the Nix Packages collection for some particular
platform. platform. */
You want to get to know where to add a new package ?
Have a look at nixpkgs/maintainers/docs/classification.txt */
{ # The system (e.g., `i686-linux') for which to build the packages. { # The system (e.g., `i686-linux') for which to build the packages.
@ -6729,10 +6726,6 @@ let
linux = linux_2_6_32; linux = linux_2_6_32;
linuxPackages = linuxPackagesFor linux; 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 { keyutils = import ../os-specific/linux/keyutils {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };