grahamc/hydra2 - Change OC4Q4PXCUDQHZT6XPYN5KOI7HSJHTVAVGJJ2MUFFAG3T5K52GBBQC

Sync with nixUnstable

Created by Eelco Dolstra on July 21, 2017

OC4Q4PXCUDQHZT6XPYN5KOI7HSJHTVAVGJJ2MUFFAG3T5K52GBBQC

Dependencies

In channels

main

Change contents

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 109 [6.303]
B:BD[4.512] → [5.653:681]
```
        DrvInfo drv(state);
```
[4.512]
[7.802]
```
        auto drv = getDerivation(state, v, false);
```
Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 111 [6.303]
∅:D[7.803] → [8.27:78]
B:BD[9.54] → [8.27:78]
```
        if (getDerivation(state, v, drv, false)) {
```
[7.803]
[10.29]
```
        if (drv) {
```

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 114 [6.303]

B:BD[11.1] → [5.682:741]

            DrvInfo::Outputs outputs = drv.queryOutputs();

[11.1]

[4.747]

            DrvInfo::Outputs outputs = drv->queryOutputs();

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 116 [6.303]

B:BD[4.748] → [12.0:41]

            if (drv.system == "unknown")

[4.748]

[12.41]

            if (drv->querySystem() == "unknown")

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 121 [6.303]

∅:D[3.65] → [13.504:727]

B:BD[13.504] → [13.504:727]

B:BD[13.808] → [13.808:1261]

B:BD[13.1261] → [2.0:79]

            res.attr("nixName", drv.name);
            res.attr("system", drv.system);
            res.attr("drvPath", drvPath = drv.queryDrvPath());
            res.attr("description", drv.queryMetaString("description"));
            res.attr("license", queryMetaStrings(state, drv, "license"));
            res.attr("homepage", drv.queryMetaString("homepage"));
            res.attr("maintainers", queryMetaStrings(state, drv, "maintainers"));
            res.attr("schedulingPriority", drv.queryMetaInt("schedulingPriority", 100));
            res.attr("timeout", drv.queryMetaInt("timeout", 36000));
            res.attr("maxSilent", drv.queryMetaInt("maxSilent", 7200));
            res.attr("isChannel", drv.queryMetaBool("isHydraChannel", false));

[3.65]

[14.259]

            res.attr("nixName", drv->queryName());
            res.attr("system", drv->querySystem());
            res.attr("drvPath", drvPath = drv->queryDrvPath());
            res.attr("description", drv->queryMetaString("description"));
            res.attr("license", queryMetaStrings(state, *drv, "license"));
            res.attr("homepage", drv->queryMetaString("homepage"));
            res.attr("maintainers", queryMetaStrings(state, *drv, "maintainers"));
            res.attr("schedulingPriority", drv->queryMetaInt("schedulingPriority", 100));
            res.attr("timeout", drv->queryMetaInt("timeout", 36000));
            res.attr("maxSilent", drv->queryMetaInt("maxSilent", 7200));
            res.attr("isChannel", drv->queryMetaBool("isHydraChannel", false));