Branch: refs/heads/master
Home: https://github.com/NixOS/hydra
Commit: 334135448ebafdf28182d7c8676cf3579f0fec33
https://github.com/NixOS/hydra/commit/334135448ebafdf28182d7c8676cf3579f0fec33
Author: Rob Vermaas <[email protected]>
Date: 2012-04-16 (Mon, 16 Apr 2012)
Changed paths:
M src/lib/Hydra/Controller/Build.pm
R src/lib/Hydra/View/NixDepGraph.pm
M src/root/build.tt
Log Message:
-----------
Remove buildtime and runtime dependency graph. It is useless on normal
derivations.
diff --git a/src/lib/Hydra/Controller/Build.pm
b/src/lib/Hydra/Controller/Build.pm
index 4df80dd..f9f1825 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -289,36 +289,6 @@ sub contents : Chained('build') PathPart Args(1) {
}
-sub runtimedeps : Chained('build') PathPart('runtime-deps') {
- my ($self, $c) = @_;
-
- my $build = $c->stash->{build};
-
- notFound($c, "Path " . $build->outpath . " is no longer available.")
- unless isValidPath($build->outpath);
-
- $c->stash->{current_view} = 'NixDepGraph';
- $c->stash->{storePaths} = [$build->outpath];
-
- $c->res->content_type('image/png'); # !!!
-}
-
-
-sub buildtimedeps : Chained('build') PathPart('buildtime-deps') {
- my ($self, $c) = @_;
-
- my $build = $c->stash->{build};
-
- notFound($c, "Path " . $build->drvpath . " is no longer available.")
- unless isValidPath($build->drvpath);
-
- $c->stash->{current_view} = 'NixDepGraph';
- $c->stash->{storePaths} = [$build->drvpath];
-
- $c->res->content_type('image/png'); # !!!
-}
-
-
sub deps : Chained('build') PathPart('deps') {
my ($self, $c) = @_;
diff --git a/src/lib/Hydra/View/NixDepGraph.pm
b/src/lib/Hydra/View/NixDepGraph.pm
deleted file mode 100644
index f431595..0000000
--- a/src/lib/Hydra/View/NixDepGraph.pm
+++ /dev/null
@@ -1,23 +0,0 @@
-package Hydra::View::NixDepGraph;
-
-use strict;
-use base qw/Catalyst::View/;
-use IO::Pipe;
-
-sub process {
- my ($self, $c) = @_;
-
- $c->response->content_type('image/svg+xml');
-
- my @storePaths = @{$c->stash->{storePaths}};
-
- my $fh = new IO::Handle;
-
- open $fh, "nix-store --query --graph @storePaths | dot -Tsvg:cairo
-Gdpi=100 -Gsize=20,20 -Gbgcolor=transparent |";
-
- $c->response->body($fh);
-
- return 1;
-}
-
-1;
diff --git a/src/root/build.tt b/src/root/build.tt
index 50df3fd..47d3d19 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -285,7 +285,7 @@
<td>
<tt>[% build.drvpath %]</tt>
[% IF drvAvailable %]
- (build-time dependencies: <a href="[%
c.uri_for('/build' build.id 'buildtime-deps') %]">graph</a> | <a href="[%
c.uri_for('/build' build.id 'deps') %]#buildtime">list</a>)
+ (<a href="[% c.uri_for('/build' build.id 'deps')
%]#buildtime">build-time dependencies</a>)
[% END %]
</td>
</tr>
@@ -294,7 +294,7 @@
<td>
<tt>[% build.outpath %]</tt>
[% IF available %]
- (runtime dependencies: <a href="[% c.uri_for('/build'
build.id 'runtime-deps') %]">graph</a> | <a href="[% c.uri_for('/build'
build.id 'deps') %]#runtime">list</a>)
+ (<a href="[% c.uri_for('/build' build.id 'deps')
%]#runtime">runtime dependencies</a>)
[% END %]
</td>
</tr>
================================================================
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
