From e45bbfbef068e61567760efd8769bff7a9431699 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Mar 2016 15:35:55 +0100 Subject: [PATCH] Fix .nixpkg channel uri Fixes #274. --- src/lib/Hydra/View/NixPkg.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/Hydra/View/NixPkg.pm b/src/lib/Hydra/View/NixPkg.pm index 99823b91..1209c882 100644 --- a/src/lib/Hydra/View/NixPkg.pm +++ b/src/lib/Hydra/View/NixPkg.pm @@ -10,11 +10,18 @@ sub process { 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 my $s = "NIXPKG1 http://invalid.org/" . " " . $build->nixname . " " . $build->system . " " . $build->drvpath . " " . $build->buildoutputs->find({name => "out"})->path - . " " . $c->uri_for('/'); + . " " . $channelUri; $c->response->body($s);