Sync with nixUnstable

[?]
Jul 21, 2017, 11:09 AM
OC4Q4PXCUDQHZT6XPYN5KOI7HSJHTVAVGJJ2MUFFAG3T5K52GBBQC

Dependencies

  • [2] 53IMJNBB Add isChannel column and meta attribute.
  • [3] 4GTOWRFW hydra-eval-jobs: Fix build
  • [4] YGRLM2SK * Export all relevant info about the derivation.
  • [5] WUMCRXFX Don't ignore assertion failures in getDerivation()
  • [6] AEKIREIH * Updated hydra_eval_jobs for the new evaluator.
  • [7] 3PNG7NIB Remove trailing whitespace
  • [8] 4LWGZL33
  • [9] L4LBF7UF Handle derivations without a system attribute
  • [10] 5X6FHW3S hydra-eval-jobs: Fix building against the latest unstable Nix
  • [11] 4CELXP7P Remove the longDescription field
  • [12] I2HYJBML Debug tweak
  • [13] POPU2ATH * hydra_scheduler: use eval-jobs.
  • [14] IMQRX4MP hydra-eval-jobs: Use JSON instead of XML
  • [15] ZTQEU5QS Hydra: Add support for maxSilent meta attribute (also already added timeout, but not implemented the actual timeout for the build yet)
  • [16] A63IHCMX * Register GC roots properly.
  • [17] PMNWRTGJ Add multiple output support
  • [*] 4N5APGRG * Start of a helper tool to evaluate job expressions efficiently.

Change contents

  • replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 109
    [4.512][4.653:681]()
    DrvInfo drv(state);
    [4.512]
    [4.802]
    auto drv = getDerivation(state, v, false);
  • replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 111
    [4.803][4.27:78](),[4.54][4.27:78]()
    if (getDerivation(state, v, drv, false)) {
    [4.803]
    [4.29]
    if (drv) {
  • replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 114
    [4.1][4.682:741]()
    DrvInfo::Outputs outputs = drv.queryOutputs();
    [4.1]
    [4.747]
    DrvInfo::Outputs outputs = drv->queryOutputs();
  • replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 116
    [4.748][4.0:41]()
    if (drv.system == "unknown")
    [4.748]
    [4.41]
    if (drv->querySystem() == "unknown")
  • replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 121
    [3.65][4.504:727](),[4.504][4.504:727](),[4.808][4.808:1261](),[4.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]
    [4.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));