grahamc/hydra - Change ST4TUC3E5XU5SPRYPKWXCKHPCKHU4YXX7ZEZDI7PWN3WIKVEAVFQC

Remove nix-install-package support

'nix-install-package' no longer exists in Nix 1.12.

Closes #268.

Created by Eelco Dolstra on January 15, 2018

ST4TUC3E5XU5SPRYPKWXCKHPCKHU4YXX7ZEZDI7PWN3WIKVEAVFQC

Dependencies

In channels

main

upstream

Change contents

Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 79 [9.43]
B:BD[8.156] → [8.156:157]
Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 80 [9.43]
B:BD[10.4] → [10.4:83]
```
sub pkg : Chained('nix') PathPart Args(1) {
    my ($self, $c, $pkgName) = @_;
```

Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 81 [9.43]

B:BD[10.84] → [11.1532:1639]

B:BD[11.1639] → [12.1272:1429]

∅:D[12.1429] → [11.1639:1786]

B:BD[11.1639] → [11.1639:1786]

∅:D[13.86] → [10.132:133]

∅:D[11.1786] → [10.132:133]

B:BD[10.132] → [10.132:133]

B:BD[10.133] → [14.0:77]

B:BD[14.77] → [7.30:129]

∅:D[15.95] → [10.246:247]

∅:D[7.129] → [10.246:247]

B:BD[10.246] → [10.246:247]

B:BD[10.247] → [16.178:220]

∅:D[16.220] → [10.302:362]

B:BD[10.302] → [10.302:362]

B:BD[10.362] → [17.0:4]

    if (!$c->stash->{build}) {
        $pkgName =~ /-(\d+)\.nixpkg$/ or notFound($c, "Bad package name.");
        # FIXME: need to handle multiple outputs: channelBuilds is
        # joined with the build outputs, so find() can return multiple
        # results.
        $c->stash->{build} = $c->stash->{channelBuilds}->find({ id => $1 })
            || notFound($c, "No such package in this channel.");
    }
    gone($c, "Build " . $c->stash->{build}->id . " is no longer available.")
        if isLocalStore() && any { !isValidPath($_->path) } $c->stash->{build}->buildoutputs->all;
    $c->stash->{current_view} = 'NixPkg';
    $c->response->content_type('application/nix-package');
}

Insertion in src/lib/Hydra/Controller/Build.pm at line 124 [18.1]

[4.270]

[18.1111]


    $c->stash->{binaryCachePublicUri} = $c->config->{binary_cache_public_uri};

File deletion: NixPkg.pm, NixPkg.pm
BFD:BFD[19.646] → [20.439:472]
BF:BFD[20.472] → [20.1:1]
BF:BFD[21.1193] → [21.1391:1424]
BF:BFD[21.1424] → [20.1:1]
B:BD[20.1] → [20.2:73]
B:BD[20.73] → [13.720:754]
∅:D[13.754] → [20.73:210]
B:BD[20.73] → [20.73:210]
B:BD[13.782] → [13.782:783]
B:BD[13.783] → [7.338:418]
∅:D[7.418] → [22.335:336]
∅:D[13.822] → [22.335:336]
B:BD[22.335] → [22.335:336]
∅:D[22.336] → [12.11065:11106]
B:BD[20.211] → [12.11065:11106]
B:BD[12.11106] → [5.0:42]
∅:D[5.42] → [20.272:327]
∅:D[15.146] → [20.272:327]
B:BD[20.272] → [20.272:327]
B:BD[20.327] → [12.11107:11197]
B:BD[12.11197] → [22.337:366]
∅:D[22.366] → [23.3116:3117]
B:BD[24.4902] → [23.3116:3117]
∅:D[23.3117] → [20.389:438]
B:BD[20.389] → [20.389:438]
```
package Hydra::View::NixPkg;
use strict;
use base qw/Catalyst::View/;
use Hydra::Helper::CatalystUtils;
sub process {
    my ($self, $c) = @_;
    $c->response->content_type('application/nix-package');
    my $build = $c->stash->{build};
    my $channelUri = $c->config->{binary_cache_public_uri} // $c->uri_for('/');
    # FIXME: add multiple output support
    my $s = "NIXPKG1 http://invalid.org/"
        . " " . $build->nixname . " " . $build->system
        . " " . $build->drvpath . " " . $build->buildoutputs->find({name => "out"})->path
        . " " . $channelUri;
    $c->response->body($s);
    return 1;
}
1;
```

Deletion in src/root/channel-contents.tt at line 26 [26.3375]

∅:D[3.25] → [25.785:786]

B:BD[25.785] → [25.785:786]

B:BD[25.786] → [2.0:45]

∅:D[2.45] → [25.830:1014]

B:BD[25.830] → [25.830:1014]


<p>Alternatively, if you have associated the
<tt>application/nix-package</tt> MIME type with the
<tt>nix-install-package</tt> program in your web browser, you can
install the package simply by clicking on the packages below.</p>

Deletion in src/root/channel-contents.tt at line 47 [26.3375]
∅:D[27.604] → [26.3923:3976]
B:BD[26.3923] → [26.3923:3976]
```
      [% uri = "${curUri}/pkg/${pkg.name}.nixpkg" %]
```

Replacement in src/root/channel-contents.tt at line 50 [26.3375]

B:BD[27.678] → [28.273:387]

        <td><a class="row-link" href="[% uri %]"><tt>[% b.get_column('releasename') || b.nixname %]</tt></a></td>

[27.678]

[27.775]

        <td><tt>[% b.get_column('releasename') || b.nixname %]</tt></td>

Replacement in src/root/product-list.tt at line 74 [29.3098]
B:BD[6.928] → [6.928:960]
```
              One-Click install
```
[6.928]
[6.960]
```
              Nix package
```

Replacement in src/root/product-list.tt at line 77 [29.3098]

B:BD[6.995] → [6.995:1203]

              [% uri = c.uri_for('/build' build.id 'nix' 'pkg' "${build.nixname}-${build.system}.nixpkg") %]
              <a href="[% uri %]">
                <tt>[% build.nixname %]</tt>
              </a>

[6.995]

[6.1203]

              <tt>[% HTML.escape(build.nixname) %]</tt>

Replacement in src/root/product-list.tt at line 80 [29.3098]

B:BD[6.1238] → [6.1238:1783]

∅:D[6.1783] → [23.31272:31273]

B:BD[30.1332] → [23.31272:31273]

B:BD[23.31273] → [6.1784:1901]

              [% WRAPPER makePopover title="Help" classes="btn-mini" %]
                <p>If you have Nix installed on your machine, you can
                install this package and all its dependencies automatically
                by clicking on the link above.  This requires that you have
                the <tt>application/nix-package</tt> MIME type associated
                with the <tt>nix-install-package</tt> program in your web
                browser.  Alternatively, you can install it from the
                command-line:</p>
                <pre><span class="shell-prompt">$ </span>nix-install-package --non-interactive --url [% uri %]</pre>

[6.1238]

[23.31274]

              [% WRAPPER makePopover title="Help" classes="btn-mini"
              %] <p>Yu can install this package using the Nix package
              manager from the command-line:</p>

Replacement in src/root/product-list.tt at line 84 [29.3098]

B:BD[23.31275] → [6.1902:2128]

                <p>If you get an error message “Permission denied”, you
                should make sure that you have sufficient access rights to
                the Nix store, e.g., run the command as <tt>root</tt>.</p>

[23.31275]

[6.2128]

                <pre><span class="shell-prompt">$ </span>nix-env -i [%HTML.escape(product.path)%][% IF binaryCachePublicUri %] --option binary-caches [% HTML.escape(binaryCachePublicUri) %][% END %]</pre>

Remove nix-install-package support

Dependencies

In channels

Change contents

Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 79 [9.43]

Deletion in src/lib/Hydra/Base/Controller/NixChannel.pm at line 80 [9.43]