From 801dc3576481983e1a6db2f16d7ec0672523a20e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 3 Jan 2010 17:56:55 +0000 Subject: [PATCH] * Export the stdenv adapter functions. * Add a "kernel" attribute containing the default kernel to make it easier to override. svn path=/nixpkgs/trunk/; revision=19189 --- pkgs/top-level/all-packages.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca0d8fe83cb..e03733c91ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;