raito/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Pass along drvPath and outputName for inputs that are previous builds.

Browse source 
This allows importing the .drv and getting the same store paths as if the
input had been passed in as nix expressions defining a proper derivation.
This commit is contained in:
Shea Levy 2015-08-10 08:02:10 -04:00
parent 9e33f07cb8
commit 2a240e458e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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