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

all-packages.nix changes for all previous commits..

Browse Source 
svn path=/nixpkgs/trunk/; revision=11276
This commit is contained in:
Michael Raskin 2008-03-24 19:40:15 +00:00
parent 4ec702d2ab
commit 57f29aca82
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,7 +270,7 @@ let pkgs = rec {
inherit stringsWithDeps lib stdenv writeScript fetchurl; inherit stringsWithDeps lib stdenv writeScript fetchurl;
}; };
builderDefsPackage = expr: lib.sumArgs builderDefsPackage = expr: lib.composedArgs
(((builderDefs null).builderDefsPackage builderDefs) expr); (((builderDefs null).builderDefsPackage builderDefs) expr);
stringsWithDeps = import ../lib/strings-with-deps.nix { stringsWithDeps = import ../lib/strings-with-deps.nix {
@ -368,8 +368,9 @@ let pkgs = rec {
makeWrapper = makeSetupHook ../build-support/make-wrapper/make-wrapper.sh; makeWrapper = makeSetupHook ../build-support/make-wrapper/make-wrapper.sh;
makeModulesClosure = {kernel, rootModules}: import ../build-support/kernel/modules-closure.nix { makeModulesClosure = {kernel, rootModules, allowMissing ? false}:
inherit stdenv module_init_tools kernel rootModules; import ../build-support/kernel/modules-closure.nix {
inherit stdenv module_init_tools kernel rootModules allowMissing;
}; };
# Run the shell command `buildCommand' to produce a store object # Run the shell command `buildCommand' to produce a store object
@ -4175,8 +4176,12 @@ let pkgs = rec {
[(getConfig ["kernel" "addConfig"] "")]; [(getConfig ["kernel" "addConfig"] "")];
}; };
kqemuFun = lib.sumArgs (selectVersion ../os-specific/linux/kqemu "1.3.0pre11") { customKernel = lib.sumArgs (import ../os-specific/linux/kernel/linux.nix) {
inherit fetchurl stdenv builderDefs; inherit fetchurl stdenv perl mktemp module_init_tools lib;
};
kqemuFun = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.3.0pre11") {
inherit builderDefs;
}; };
# No finished expression is provided - pick your own kernel # No finished expression is provided - pick your own kernel