grahamc/hydra2 - Change L5Z6CN7MHFGRL2QPLCVQJSDECT35EW52INUV5RVI4CXH2YSDJGNAC

In Hydra channels, show only packages matching the user's system type

Fixes NixOS/nix#169.

Created by Eelco Dolstra on October 7, 2013

L5Z6CN7MHFGRL2QPLCVQJSDECT35EW52INUV5RVI4CXH2YSDJGNAC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/View/NixExprs.pm at line 22 [4.381]
B:BD[4.521] → [4.521:542]
```
    my $res = "[\n";
```
[4.521]
[4.542]
```
    my %perSystem;
```

Replacement in src/lib/Hydra/View/NixExprs.pm at line 26 [4.381]

B:BD[3.10956] → [3.10956:10994]

∅:D[3.10994] → [4.679:727]

B:BD[4.679] → [4.679:727]

B:BD[4.727] → [2.0:103]

∅:D[2.103] → [5.235:302]

B:BD[5.235] → [5.235:302]

B:BD[5.302] → [3.10995:11064]

∅:D[6.69] → [4.970:1004]

∅:D[3.11064] → [4.970:1004]

B:BD[4.970] → [4.970:1004]

B:BD[4.1004] → [5.303:381]

        $res .= "  # $pkg->{name}\n";
        $res .= "  { type = \"derivation\";\n";
        $res .= "    name = " . escape ($build->get_column("releasename") or $build->nixname) . ";\n";
        $res .= "    system = " . (escape $build->system) . ";\n";
        $res .= "    outPath = " . (escape $pkg->{outPath}) . ";\n";
        $res .= "    meta = {\n";
        $res .= "      description = " . (escape $build->description) . ";\n"

[3.10956]

[4.1077]

        my $s = "";
        $s .= "  # $pkg->{name}\n";
        $s .= "  ${\escape $build->get_column('job')} = {\n";
        $s .= "    type = \"derivation\";\n";
        $s .= "    name = ${\escape ($build->get_column('releasename') or $build->nixname)};\n";
        $s .= "    system = ${\escape $build->system};\n";
        $s .= "    outPath = ${\escape $pkg->{outPath}};\n";
        $s .= "    meta = {\n";
        $s .= "      description = ${\escape $build->description};\n"

Replacement in src/lib/Hydra/View/NixExprs.pm at line 36 [4.381]

B:BD[4.1113] → [5.382:468]

        $res .= "      longDescription = " . (escape $build->longdescription) . ";\n"

[4.1113]

[4.1194]

        $s .= "      longDescription = ${\escape $build->longdescription};\n"

Replacement in src/lib/Hydra/View/NixExprs.pm at line 38 [4.381]

B:BD[4.1234] → [5.469:539]

        $res .= "      license = " . (escape $build->license) . ";\n"

[4.1234]

[4.1299]

        $s .= "      license = ${\escape $build->license};\n"

Replacement in src/lib/Hydra/View/NixExprs.pm at line 40 [4.381]

B:BD[4.1331] → [4.1331:1384]

        $res .= "    };\n";
        $res .= "  }\n";

[4.1331]

[4.1384]

        $s .= "      maintainers = ${\escape $build->maintainers};\n"
            if $build->maintainers;
        $s .= "    };\n";
        $s .= "  };\n\n";
        $perSystem{$build->system} .= $s;
    }
    my $res = "{ system ? builtins.currentSystem }:\n\n";
    my $first = 1;
    foreach my $system (keys %perSystem) {
        $res .= "else " if !$first;
        $res .= "if system == ${\escape $system} then {\n\n";
        $res .= $perSystem{$system};
        $res .= "}\n\n";
        $first = 0;

Replacement in src/lib/Hydra/View/NixExprs.pm at line 58 [4.381]
B:BD[4.1391] → [4.1391:1410]
```
    $res .= "]\n";
```
[4.1391]
[7.124]
```
    $res .= "else " if !$first;
    $res .= "{}\n";
```

Replacement in src/lib/Hydra/View/NixExprs.pm at line 62 [4.381]

B:BD[7.158] → [8.53:160]

∅:D[8.160] → [9.0:63]

B:BD[7.158] → [9.0:63]

    $tar->add_data("channel/channel-name", ($c->stash->{channelName} or "unnamed-channel"), {mtime => 0});
    $tar->add_data("channel/default.nix", $res, {mtime => 0});

[7.158]

[7.207]

    $tar->add_data("channel/channel-name", ($c->stash->{channelName} or "unnamed-channel"), {mtime => 1});
    $tar->add_data("channel/default.nix", $res, {mtime => 1});