ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix .nixpkg channel uri

Browse Source 
Fixes #274.
This commit is contained in:
Eelco Dolstra 2016-03-02 15:35:55 +01:00
parent 8b4f90b0d4
commit e45bbfbef0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/Hydra/View/NixPkg.pm
View File

@ -10,11 +10,18 @@ sub process {
my $build = $c->stash->{build}; my $build = $c->stash->{build};
my $storeMode = $c->config->{store_mode} // "direct";
my $channelUri =
$storeMode eq "direct" ? $c->uri_for('/')
: $storeMode eq "s3-binary-cache" ?
($c->config->{binary_cache_public_uri} // ("https://" . $c->config->{binary_cache_s3_bucket} . ".s3.amazonaws.com/"))
: die "Not supported.\n";
# FIXME: add multiple output support # FIXME: add multiple output support
my $s = "NIXPKG1 http://invalid.org/" my $s = "NIXPKG1 http://invalid.org/"
. " " . $build->nixname . " " . $build->system . " " . $build->nixname . " " . $build->system
. " " . $build->drvpath . " " . $build->buildoutputs->find({name => "out"})->path . " " . $build->drvpath . " " . $build->buildoutputs->find({name => "out"})->path
. " " . $c->uri_for('/'); . " " . $channelUri;
$c->response->body($s); $c->response->body($s);