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

.nixpkgs: Drop obsolete manifest URI

Browse Source
This commit is contained in:
Eelco Dolstra 2016-03-02 15:24:23 +01:00
parent ec82bc2517
commit 8b4f90b0d4
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/Hydra/Base/Controller/NixChannel.pm
View File

@ -87,8 +87,6 @@ sub pkg : Chained('nix') PathPart Args(1) {
gone($c, "Build " . $c->stash->{build}->id . " is no longer available.") gone($c, "Build " . $c->stash->{build}->id . " is no longer available.")
unless all { isValidPath($_->path) } $c->stash->{build}->buildoutputs->all; unless all { isValidPath($_->path) } $c->stash->{build}->buildoutputs->all;
$c->stash->{manifestUri} = $c->uri_for($self->action_for("manifest"), $c->req->captures);
$c->stash->{current_view} = 'NixPkg'; $c->stash->{current_view} = 'NixPkg';
$c->response->content_type('application/nix-package'); $c->response->content_type('application/nix-package');

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

@ -11,7 +11,7 @@ sub process {
my $build = $c->stash->{build}; my $build = $c->stash->{build};
# FIXME: add multiple output support # FIXME: add multiple output support
my $s = "NIXPKG1 " . $c->stash->{manifestUri} 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('/'); . " " . $c->uri_for('/');