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

Browse source
This commit is contained in:
Eelco Dolstra 2008-11-29 00:56:40 +00:00
parent 33f3bee810
commit 19c3c83794
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Hydra/root/product-list.tt
View file

@ -28,7 +28,7 @@
<p>The package can then be found in the path <tt>[% <p>The package can then be found in the path <tt>[%
product.path %]</tt>. You’ll probably also want to do product.path %]</tt>. You’ll probably also want to do
<pre>nix-env -i [% product.path %]</pre> <pre>$ nix-env -i [% product.path %]</pre>
to actually install the package in your Nix user environment.</p> to actually install the package in your Nix user environment.</p>
@ -90,6 +90,8 @@
“README” file “README” file
[% CASE "manual" %] [% CASE "manual" %]
Manual Manual
[% CASE "release-notes" %]
Release notes
[% CASE DEFAULT %] [% CASE DEFAULT %]
Documentation of type <tt>[% product.subtype %]</tt> Documentation of type <tt>[% product.subtype %]</tt>
[% END %] [% END %]

5
src/Hydra/script/hydra_scheduler.pl
View file

@ -346,9 +346,10 @@ sub checkJobSet {
# Fetch the input containing the Nix expression. # Fetch the input containing the Nix expression.
(my $exprInput) = $jobset->jobsetinputs->search({name => $jobset->nixexprinput}); (my $exprInput) = $jobset->jobsetinputs->search({name => $jobset->nixexprinput});
die unless defined $exprInput; die "No input named " . $jobset->nixexprinput unless defined $exprInput;
die "not supported yet" if scalar($exprInput->jobsetinputalts) != 1; die "Multiple alternatives for the Nix expression input not supported yet"
if scalar($exprInput->jobsetinputalts) != 1;
fetchInput($exprInput, $exprInput->jobsetinputalts->first, $inputInfo); fetchInput($exprInput, $exprInput->jobsetinputalts->first, $inputInfo);