grahamc/hydra2 - Change MVB7RRLTOLZALMUVUNSCMXDB76QLICJAV2GYQQZO7E6S327LHMSQC

* Move NARs from the NixChannel controller to the Root controller and

drop the "/nix/store". I.e. instead of

http:&#x2f;&#x2f;hydra.nixos.org&#x2f;jobset&#x2f;nixpkgs&#x2f;trunk&#x2f;channel&#x2f;latest&#x2f;nar&#x2f;nix&#x2f;store&#x2f;99djmii6l4yw9gn07zxqabh8z58pp84c-libmspack-0.0.20040308alpha.drv

we now have

http:&#x2f;&#x2f;hydra.nixos.org&#x2f;nar&#x2f;99djmii6l4yw9gn07zxqabh8z58pp84c-libmspack-0.0.20040308alpha.drv

The main reason is that this is much faster, since we don't need to get all the channel data (which isn't used anyway for NAR generation). This speeds up downloading a NAR from the Nixpkgs channel by > 2 seconds.

Drop "Hydra::View::" from view names to get rid of an ugly warning.

Created by Eelco Dolstra on June 22, 2010

MVB7RRLTOLZALMUVUNSCMXDB76QLICJAV2GYQQZO7E6S327LHMSQC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 12 [5.43]
B:BD[5.269] → [5.269:328]
```
    $c->stash->{current_view} = 'Hydra::View::NixClosure';
```
[5.269]
[5.328]
```
    $c->stash->{current_view} = 'NixClosure';
```

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 23 [5.43]

B:BD[5.677] → [5.677:737]

B:BD[5.737] → [6.0:85]

    $c->stash->{current_view} = 'Hydra::View::NixManifest';
    $c->stash->{narBase} = $c->uri_for($self->action_for("nar"), $c->req->captures);

[5.677]

[5.737]

    $c->stash->{current_view} = 'NixManifest';
    $c->stash->{narBase} = $c->uri_for($c->controller('Root')->action_for("nar"));

Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 26 [5.43]
B:BD[5.739] → [6.86:156]
```
sub nar : Chained('nix') PathPart {
    my ($self, $c, @rest) = @_;
```
Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 27 [5.43]
B:BD[6.157] → [6.157:197]
```
    my $path .= "/" . join("/", @rest);
```

Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 28 [5.43]

B:BD[5.740] → [7.62:93]

B:BD[7.93] → [3.0:44]

∅:D[3.44] → [7.135:206]

B:BD[7.135] → [7.135:206]

∅:D[7.206] → [5.740:741]

∅:D[6.285] → [5.740:741]

B:BD[5.740] → [5.740:741]

B:BD[5.741] → [6.286:451]

B:BD[6.451] → [8.0:4]

    if (!isValidPath($path)) {
        $c->response->status(410); # "Gone"
        error($c, "Path " . $path . " is no longer available.");
    }
    # !!! check that $path is in the closure of $c->stash->{storePaths}.
    $c->stash->{current_view} = 'Hydra::View::NixNAR';
    $c->stash->{storePath} = $path;
}

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 40 [5.43]
B:BD[8.247] → [8.247:302]
```
    $c->stash->{current_view} = 'Hydra::View::NixPkg';
```
[8.247]
[8.302]
```
    $c->stash->{current_view} = 'NixPkg';
```
Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 48 [5.43]
B:BD[9.78] → [9.78:135]
```
    $c->stash->{current_view} = 'Hydra::View::NixExprs';
```
[9.78]
[2.41]
```
    $c->stash->{current_view} = 'NixExprs';
```

Replacement in src/lib/Hydra/Controller/Build.pm at line 269 [11.1]

B:BD[10.413] → [10.413:473]

    $c->stash->{current_view} = 'Hydra::View::NixDepGraph';

[10.413]

[10.473]

    $c->stash->{current_view} = 'NixDepGraph';

Replacement in src/lib/Hydra/Controller/Build.pm at line 284 [11.1]

B:BD[10.842] → [10.842:902]

    $c->stash->{current_view} = 'Hydra::View::NixDepGraph';

[10.842]

[10.902]

    $c->stash->{current_view} = 'NixDepGraph';

Insertion in src/lib/Hydra/Controller/Root.pm at line 159 [13.804]
[12.1744]
[13.2636]
```
sub nar :Local :Args(1) {
    my ($self, $c, $path) = @_;
```
Insertion in src/lib/Hydra/Controller/Root.pm at line 164 [13.804]
[13.2637]
[13.2637]
```
    $path = "/nix/store/$path";
```

Insertion in src/lib/Hydra/Controller/Root.pm at line 166 [13.804]

[13.2638]

    if (!isValidPath($path)) {
        $c->response->status(410); # "Gone"
        error($c, "Path " . $path . " is no longer available.");
    }
    $c->stash->{current_view} = 'NixNAR';
    $c->stash->{storePath} = $path;
}

Insertion in src/lib/Hydra/View/NixManifest.pm at line 29 [14.295]
[4.153]
[4.153]
```
        $escaped =~ s/^.*\///; # remove /nix/store/
```

Replacement in src/lib/Hydra/View/NixManifest.pm at line 34 [14.295]

B:BD[14.1222] → [4.250:301]

        my $url = $c->stash->{narBase} . $escaped;

[14.1222]

[15.590]

        my $url = $c->stash->{narBase} . "/" . $escaped;

* Move NARs from the NixChannel controller to the Root controller and

Dependencies

In channels

Change contents

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 12 [5.43]

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 23 [5.43]

Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 26 [5.43]

Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 27 [5.43]

Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 28 [5.43]

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 40 [5.43]

Replacement in src/lib/Hydra/Base/Controller/NixChannel.pm at line 48 [5.43]

Replacement in src/lib/Hydra/Controller/Build.pm at line 269 [11.1]

Replacement in src/lib/Hydra/Controller/Build.pm at line 284 [11.1]

Insertion in src/lib/Hydra/Controller/Root.pm at line 159 [13.804]

Insertion in src/lib/Hydra/Controller/Root.pm at line 164 [13.804]

Insertion in src/lib/Hydra/Controller/Root.pm at line 166 [13.804]

Insertion in src/lib/Hydra/View/NixManifest.pm at line 29 [14.295]

Replacement in src/lib/Hydra/View/NixManifest.pm at line 34 [14.295]