JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Export the stdenv adapter functions.

Browse Source 
* Add a "kernel" attribute containing the default kernel to make it
  easier to override.

svn path=/nixpkgs/trunk/; revision=19189
This commit is contained in:
Eelco Dolstra 2010-01-03 17:56:55 +00:00
parent 4b122bab88
commit 801dc35764
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/all-packages.nix
View File

@ -77,9 +77,12 @@ let
# Helper functions that are exported through `pkgs'.
helperFunctions =
(import ../stdenv/adapters.nix { inherit (pkgs) dietlibc fetchurl runCommand; }) //
stdenvAdapters //
(import ../build-support/trivial-builders.nix { inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
stdenvAdapters =
import ../stdenv/adapters.nix { inherit (pkgs) dietlibc fetchurl runCommand; };
# Allow packages to be overriden globally via the `packageOverrides'
# configuration option, which must be a function that takes `pkgs'
@ -123,7 +126,7 @@ let
### Helper functions.
inherit lib config getConfig;
inherit lib config getConfig stdenvAdapters;
inherit (lib) lowPrio appendToName makeOverridable;
@ -5610,7 +5613,8 @@ let
kernelPackages_2_6_32 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_32);
# The current default kernel / kernel modules.
kernelPackages = kernelPackages_2_6_28;
kernel = kernel_2_6_28;
kernelPackages = kernelPackagesFor kernel;
customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/generic.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools;