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

Added debug option alwaysFail to builderDefs; fixed a long-time bug in the process..

Browse Source 
svn path=/nixpkgs/trunk/; revision=11838
This commit is contained in:
Michael Raskin 2008-05-18 05:12:39 +00:00
parent 374ccd290b
commit 732e12095e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/top-level/builder-defs.nix
View File

@ -396,8 +396,16 @@ args: with args; with stringsWithDeps; with lib;
GHC_PACKAGE_PATH=\$PACKAGE_DB ./register.sh GHC_PACKAGE_PATH=\$PACKAGE_DB ./register.sh
" ["defCreateEmptyPackageDatabaseAndSetupHook" "defCabalSetupCmd"]; " ["defCreateEmptyPackageDatabaseAndSetupHook" "defCabalSetupCmd"];
phaseNames = args.phaseNames ++ realPhaseNames = args.phaseNames ++
["doForceShare" "doPropagate"]; ["doForceShare" "doPropagate"]
++
(optional (getAttr ["alwaysFail"] false args) "doFail")
;
doFail = noDepEntry "
echo 'Failing to keep builddir (and to invalidate result).'
a() { return 127; } ; a ;
";
extraDerivationAttrs = lib.getAttr ["extraDerivationAttrs"] {} args; extraDerivationAttrs = lib.getAttr ["extraDerivationAttrs"] {} args;
@ -407,7 +415,7 @@ args: with args; with stringsWithDeps; with lib;
stdenv.mkDerivation ((rec { stdenv.mkDerivation ((rec {
inherit (localDefs) name; inherit (localDefs) name;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure localDefs localDefs.phaseNames); (textClosure localDefs localDefs.realPhaseNames);
meta = localDefs.meta // {inherit src;}; meta = localDefs.meta // {inherit src;};
}) // (if localDefs ? propagatedBuildInputs then { }) // (if localDefs ? propagatedBuildInputs then {
inherit (localDefs) propagatedBuildInputs; inherit (localDefs) propagatedBuildInputs;