grahamc/hydra2 - Change STZE4KKRL2AGCPP2FOMBNZHJTRTKJQZSEKALWEV6FK5BII6H7EDAC

Fix build against Nix master

Also, remove support in hydra-eval-jobs for multiple jobset input alternatives. The web interface hasn't supported this in a long time. Thus we can use the regular "–arg" handler.

Created by Eelco Dolstra on October 26, 2017

STZE4KKRL2AGCPP2FOMBNZHJTRTKJQZSEKALWEV6FK5BII6H7EDAC

Dependencies

In channels

main

Change contents

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 13 [9.303]
B:BD[7.23] → [8.0:26]
```
#include "common-opts.hh"
```
Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 14 [9.303]
[2.22]
[9.451]
```
#include "common-eval-args.hh"
```
Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 20 [9.303]
∅:D[10.26] → [11.74:75]
B:BD[11.74] → [11.74:75]
B:BD[11.75] → [10.27:28]
B:BD[12.420] → [12.420:535]
```
typedef std::list<Value *, traceable_allocator<Value *> > ValueList;
typedef std::map<Symbol, ValueList> AutoArgs;
```
Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 23 [9.303]
∅:D[13.87] → [14.0:68]
B:BD[11.218] → [14.0:68]
∅:D[14.68] → [15.96:98]
∅:D[16.217] → [15.96:98]
B:BD[15.96] → [15.96:98]
B:BD[15.98] → [13.88:148]
∅:D[13.148] → [14.69:138]
B:BD[15.157] → [14.69:138]
∅:D[14.138] → [16.318:393]
B:BD[16.318] → [16.318:393]
B:BD[16.393] → [17.0:53]
∅:D[17.53] → [15.306:308]
∅:D[16.426] → [15.306:308]
B:BD[15.306] → [15.306:308]
B:BD[15.308] → [16.427:450]
B:BD[16.450] → [12.536:613]
B:BD[12.613] → [17.54:88]
∅:D[17.88] → [12.647:676]
B:BD[12.647] → [12.647:676]
B:BD[12.676] → [13.149:202]
∅:D[14.192] → [15.448:470]
∅:D[13.202] → [15.448:470]
∅:D[16.624] → [15.448:470]
B:BD[15.448] → [15.448:470]
∅:D[18.53] → [15.470:471]
B:BD[15.470] → [15.470:471]
B:BD[15.471] → [16.625:684]
```
    const AutoArgs & argsLeft, Value & v, const string & attrPath);
static void tryJobAlts(EvalState & state, JSONObject & top,
    const AutoArgs & argsLeft, const string & attrPath, Value & fun,
    Formals::Formals_::iterator cur,
    Formals::Formals_::iterator last,
    Bindings & actualArgs) // FIXME: should be const
{
    if (cur == last) {
        Value v, * arg = state.allocValue();
        state.mkAttrs(*arg, 0);
        arg->attrs = &actualArgs;
        mkApp(v, fun, *arg);
        findJobs(state, top, argsLeft, v, attrPath);
        return;
    }
    AutoArgs::const_iterator a = argsLeft.find(cur->name);
```
[13.87]
[19.143]
```
    Bindings & autoArgs, Value & v, const string & attrPath);
```
Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 25 [9.303]
B:BD[19.144] → [19.144:196]
```
    Formals::Formals_::iterator next = cur; ++next;
```

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 26 [9.303]

B:BD[20.1] → [20.1:177]

B:BD[20.177] → [13.203:284]

∅:D[14.274] → [20.268:290]

∅:D[13.284] → [20.268:290]

B:BD[20.268] → [20.268:290]

∅:D[19.196] → [16.805:821]

∅:D[20.290] → [16.805:821]

∅:D[18.343] → [16.805:821]

B:BD[16.805] → [16.805:821]

B:BD[16.821] → [4.0:33]

∅:D[4.33] → [17.89:185]

B:BD[12.733] → [17.89:185]

B:BD[17.185] → [4.34:108]

∅:D[4.108] → [16.979:1017]

B:BD[16.979] → [16.979:1017]

B:BD[16.1017] → [4.109:160]

∅:D[4.160] → [12.786:833]

B:BD[12.786] → [12.786:833]

∅:D[12.905] → [16.1130:1166]

B:BD[16.1130] → [16.1130:1166]

B:BD[16.1166] → [13.285:368]

∅:D[14.358] → [16.1260:1273]

∅:D[13.368] → [16.1260:1273]

B:BD[16.1260] → [16.1260:1273]

B:BD[21.306] → [22.211:221]

    if (a == argsLeft.end()) {
        if (!cur->def)
            throw TypeError(format("job `%1%' requires an argument named `%2%'")
                % attrPath % cur->name);
        tryJobAlts(state, top, argsLeft, attrPath, fun, next, last, actualArgs);
        return;
    }
    int n = 0;
    for (auto & i : a->second) {
        Bindings & actualArgs2(*state.allocBindings(actualArgs.size() + 1)); // !!! inefficient
        for (auto & j : actualArgs)
            actualArgs2.push_back(j);
        AutoArgs argsLeft2(argsLeft);
        actualArgs2.push_back(Attr(cur->name, i));
        actualArgs2.sort(); // !!! inefficient
        argsLeft2.erase(cur->name);
        tryJobAlts(state, top, argsLeft2, attrPath, fun, next, last, actualArgs2);
        ++n;
    }
}

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 53 [9.303]
∅:D[13.434] → [14.359:426]
B:BD[21.377] → [14.359:426]
```
    const AutoArgs & argsLeft, Value & v, const string & attrPath)
```
[13.434]
[11.255]
```
    Bindings & autoArgs, Value & vIn, const string & attrPath)
```
Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 59 [9.303]
∅:D[12.980] → [16.1674:1699]
B:BD[11.308] → [16.1674:1699]
```
    state.forceValue(v);
```
[12.980]
[11.336]
```
    Value v;
    state.autoCallFunction(autoArgs, vIn, v);
```

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 124 [9.303]

B:BD[4.544] → [4.544:605]

                    findJobs(state, top, argsLeft, *i.value,

[4.544]

[4.605]

                    findJobs(state, top, autoArgs, *i.value,

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 130 [9.303]

B:BD[11.1419] → [16.1986:2048]

B:BD[16.2048] → [23.0:49]

B:BD[23.49] → [13.1552:1606]

∅:D[14.544] → [16.2112:2214]

∅:D[13.1606] → [16.2112:2214]

B:BD[16.2112] → [16.2112:2214]

B:BD[16.2214] → [23.50:68]

∅:D[23.68] → [24.0:7]

B:BD[16.2239] → [24.0:7]

    else if (v.type == tLambda && v.lambda.fun->matchAttrs) {
        Bindings & tmp(*state.allocBindings(0));
        tryJobAlts(state, top, argsLeft, attrPath, v,
            v.lambda.fun->formals->formals.begin(),
            v.lambda.fun->formals->formals.end(),
            tmp);
    }

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 140 [9.303]
∅:D[13.1665] → [14.545:612]
B:BD[21.551] → [14.545:612]
```
    const AutoArgs & argsLeft, Value & v, const string & attrPath)
```
[13.1665]
[21.646]
```
    Bindings & autoArgs, Value & v, const string & attrPath)
```

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 143 [9.303]

B:BD[21.658] → [13.1666:1726]

        findJobsWrapped(state, top, argsLeft, v, attrPath);

[21.658]

[25.0]

        findJobsWrapped(state, top, autoArgs, v, attrPath);

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 163 [9.303]
B:BD[8.28] → [26.100:128]
```
        Strings searchPath;
```
Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 164 [9.303]
B:BD[26.154] → [26.154:199]
```
        std::map<string, Strings> autoArgs_;
```

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 165 [9.303]

B:BD[26.200] → [26.200:975]

        parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) {
            if (*arg == "--arg" || *arg == "--argstr") {
                /* This is like --arg in nix-instantiate, except that it
                   supports multiple versions for the same argument.
                   That is, autoArgs is a mapping from variable names to
                   *lists* of values. */
                auto what = *arg;
                string name = getArg(what, arg, end);
                string value = getArg(what, arg, end);
                autoArgs_[name].push_back((what == "--arg" ? 'E' : 'S') + value);
            }
            else if (parseSearchPathArg(arg, end, searchPath))
                ;
            else if (*arg == "--gc-roots-dir")

[26.200]

[26.975]

        struct MyArgs : LegacyArgs, MixEvalArgs
        {
            using LegacyArgs::LegacyArgs;
        };
        MyArgs myArgs(baseNameOf(argv[0]), [&](Strings::iterator & arg, const Strings::iterator & end) {
            if (*arg == "--gc-roots-dir")

Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 181 [9.303]
[26.1195]
[27.0]
```
        myArgs.parseCmdline(argvToStrings(argc, argv));
```
Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 185 [9.303]
B:BD[6.119] → [6.119:158]
```
        settings.useBuildHook = false;
```
[6.119]
[6.158]
```
        settings.builders = "";
```
Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 189 [9.303]
B:BD[27.105] → [27.105:152]
```
        settings.set("restrict-eval", "true");
```
[27.105]
[9.854]
```
        settings.restrictEval = true;
```

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 195 [9.303]

B:BD[28.811] → [29.88:138]

        EvalState state(searchPath, openStore());

[28.811]

[9.880]

        EvalState state(myArgs.searchPath, openStore());

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 197 [9.303]

B:BD[9.881] → [26.1405:1432]

B:BD[26.1432] → [30.0:101]

∅:D[30.101] → [26.1432:1469]

B:BD[26.1432] → [26.1432:1469]

B:BD[26.1469] → [30.102:164]

B:BD[30.164] → [31.0:31]

∅:D[31.31] → [26.1469:1750]

∅:D[30.321] → [26.1469:1750]

B:BD[26.1469] → [26.1469:1750]

B:BD[26.1750] → [30.322:372]

B:BD[30.372] → [31.32:61]

B:BD[31.61] → [3.0:69]

∅:D[3.69] → [31.131:184]

B:BD[31.131] → [31.131:184]

∅:D[31.184] → [26.1820:1844]

∅:D[30.427] → [26.1820:1844]

B:BD[26.1820] → [26.1820:1844]

B:BD[26.1844] → [30.428:641]

        AutoArgs autoArgs;
        Value * inputsSet = state.allocValue();
        state.mkAttrs(*inputsSet, autoArgs_.size());
        for (auto & i : autoArgs_) {
            Symbol inputName = state.symbols.create(i.first);
            bool first = true;
            for (auto & j : i.second) {
                Value * v = state.allocValue();
                if (j[0] == 'E')
                    state.eval(state.parseExprFromString(string(j, 1), absPath(".")), *v);
                else
                    mkString(*v, string(j, 1));
                autoArgs[inputName].push_back(v);
                if (first) {
                    inputsSet->attrs->push_back(Attr(inputName, v));
                    first = false;
                }
            }
        }
        Symbol sInputs = state.symbols.create("inputs");
        if (autoArgs.find(sInputs) == autoArgs.end()) {
            inputsSet->attrs->sort();
            autoArgs[sInputs].push_back(inputsSet);
        }

[9.881]

[11.1624]

        Bindings & autoArgs = *myArgs.getAutoArgs(state);

Replacement in src/script/hydra-eval-jobset at line 306 [32.1319]

B:BD[5.9894] → [5.9894:11021]

        foreach my $alt (@{$inputInfo->{$input}}) {
            if ($alt->{type} eq "string") {
                push @res, "--argstr", $input, $alt->{value};
            }
            elsif ($alt->{type} eq "boolean") {
                push @res, "--arg", $input, booleanToString($exprType, $alt->{value});
            }
            elsif ($alt->{type} eq "nix") {
                die "input type ‘nix’ only supported for Nix-based jobsets\n" unless $exprType eq "nix";
                push @res, "--arg", $input, $alt->{value};
            }
            elsif ($alt->{type} eq "eval") {
                die "input type ‘eval’ only supported for Nix-based jobsets\n" unless $exprType eq "nix";
                my $s = "{ ";
                # FIXME: escape $_.  But dots should not be escaped.
                $s .= "$_ = builtins.storePath ${\$alt->{jobs}->{$_}}; "
                    foreach keys %{$alt->{jobs}};
                $s .= "}";
                push @res, "--arg", $input, $s;
            }
            else {
                push @res, "--arg", $input, buildInputToString($exprType, $alt);
            }

[5.9894]

[5.11021]


        die "multiple jobset input alternatives are no longer supported"
            if scalar @{$inputInfo->{$input}} != 1;
        my $alt = $inputInfo->{$input}->[0];
        if ($alt->{type} eq "string") {
            push @res, "--argstr", $input, $alt->{value};

Insertion in src/script/hydra-eval-jobset at line 315 [32.1319]

[5.11031]

        elsif ($alt->{type} eq "boolean") {
            push @res, "--arg", $input, booleanToString($exprType, $alt->{value});
        }
        elsif ($alt->{type} eq "nix") {
            die "input type ‘nix’ only supported for Nix-based jobsets\n" unless $exprType eq "nix";
            push @res, "--arg", $input, $alt->{value};
        }
        elsif ($alt->{type} eq "eval") {
            die "input type ‘eval’ only supported for Nix-based jobsets\n" unless $exprType eq "nix";
            my $s = "{ ";
            # FIXME: escape $_.  But dots should not be escaped.
            $s .= "$_ = builtins.storePath ${\$alt->{jobs}->{$_}}; "
                foreach keys %{$alt->{jobs}};
            $s .= "}";
            push @res, "--arg", $input, $s;
        }
        else {
            push @res, "--arg", $input, buildInputToString($exprType, $alt);
        }

Fix build against Nix master

Dependencies

In channels

Change contents

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 13 [9.303]

Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 14 [9.303]

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 20 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 23 [9.303]

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 25 [9.303]

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 26 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 53 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 59 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 124 [9.303]

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 130 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 140 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 143 [9.303]

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 163 [9.303]

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 164 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 165 [9.303]

Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 181 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 185 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 189 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 195 [9.303]

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 197 [9.303]

Replacement in src/script/hydra-eval-jobset at line 306 [32.1319]

Insertion in src/script/hydra-eval-jobset at line 315 [32.1319]