delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #231 from shlevy/prev-build-drv-info

Browse source 
Pass along drvPath and outputName for inputs that are previous builds.
This commit is contained in:
Eelco Dolstra 2015-08-10 20:23:29 +02:00
parent 9e33f07cb8 1705ca41e7
commit cf9516baa4
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/lib/Hydra/Helper/AddBuilds.pm
View file

@ -105,11 +105,19 @@ sub fetchInputBuild {
my $relName = ($prevBuild->releasename or $prevBuild->nixname);
my $version = $2 if $relName =~ /^($pkgNameRE)-($versionRE)$/;
return
{ storePath => getMainOutput($prevBuild)->path
my $mainOutput = getMainOutput($prevBuild);
my $result =
{ storePath => $mainOutput->path
, id => $prevBuild->id
, version => $version
, outputName => $mainOutput->name
};
if (isValidPath($prevBuild->drvpath)) {
$result->{drvPath} = $prevBuild->drvpath;
}
return $result;
}
@ -279,6 +287,8 @@ sub buildInputToString {
(defined $input->{gitTag} ? "; gitTag = \"" . $input->{gitTag} . "\"" : "") .
(defined $input->{shortRev} ? "; shortRev = \"" . $input->{shortRev} . "\"" : "") .
(defined $input->{version} ? "; version = \"" . $input->{version} . "\"" : "") .
(defined $input->{outputName} ? "; outputName = \"" . $input->{outputName} . "\"" : "") .
(defined $input->{drvPath} ? "; drvPath = builtins.storePath " . $input->{drvPath} . "" : "") .
";}";
}
return $result;