grahamc/hydra - Change DKJFD6JNNK5LJMRGQABMJZKMFZLGY3ADKJWF6J4BBHEUPY3NB67QC

Process Nix API changes

Created by Eelco Dolstra on February 11, 2016

DKJFD6JNNK5LJMRGQABMJZKMFZLGY3ADKJWF6J4BBHEUPY3NB67QC

Dependencies

In channels

upstream

main

Change contents

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

B:BD[5.104] → [2.0:82]

                if (!pathExists(root)) addPermRoot(*store, drvPath, root, false);

[5.104]

[5.178]

                if (!pathExists(root)) state.store->addPermRoot(drvPath, root, false);

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 256 [6.303]
B:BD[7.811] → [8.1367:1404]
```
        EvalState state(searchPath);
```
[7.811]
[6.880]
```
        EvalState state(searchPath, openStore());
```
Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 283 [6.303]
B:BD[9.1625] → [8.1897:1926]
∅:D[8.1926] → [10.0:1]
B:BD[11.2897] → [10.0:1]
```
        store = openStore();
```
Deletion in src/hydra-queue-runner/build-remote.cc at line 7 [12.85]
B:BD[12.220] → [12.220:239]
```
#include "misc.hh"
```
Replacement in src/hydra-queue-runner/build-remote.cc at line 76 [12.85]
B:BD[12.1290] → [12.1290:1349]
```
static void copyClosureTo(std::shared_ptr<StoreAPI> store,
```
[12.1290]
[12.1349]
```
static void copyClosureTo(ref<Store> store,
```
Replacement in src/hydra-queue-runner/build-remote.cc at line 83 [12.85]
B:BD[12.1492] → [12.1492:1541]
```
        computeFSClosure(*store, path, closure);
```
[12.1492]
[12.1593]
```
        store->computeFSClosure(path, closure);
```
Replacement in src/hydra-queue-runner/build-remote.cc at line 98 [12.85]
B:BD[13.83] → [13.83:134]
```
    Paths sorted = topoSortPaths(*store, closure);
```
[13.83]
[13.134]
```
    Paths sorted = store->topoSortPaths(closure);
```
Replacement in src/hydra-queue-runner/build-remote.cc at line 110 [12.85]
∅:D[14.91] → [13.320:365]
B:BD[13.320] → [13.320:365]
```
    exportPaths(*store, missing, false, to);
```
[14.91]
[13.365]
```
    store->exportPaths(missing, false, to);
```
Replacement in src/hydra-queue-runner/build-remote.cc at line 118 [12.85]
B:BD[12.2443] → [12.2443:2504]
```
static void copyClosureFrom(std::shared_ptr<StoreAPI> store,
```
[12.2443]
[15.149]
```
static void copyClosureFrom(ref<Store> store,
```
Replacement in src/hydra-queue-runner/build-remote.cc at line 130 [12.85]
B:BD[12.2721] → [16.116:173]
```
void State::buildRemote(std::shared_ptr<StoreAPI> store,
```
[12.2721]
[16.173]
```
void State::buildRemote(ref<Store> store,
```
Deletion in src/hydra-queue-runner/build-result.cc at line 3 [17.441]
B:BD[17.493] → [17.493:512]
```
#include "misc.hh"
```

Replacement in src/hydra-queue-runner/build-result.cc at line 24 [17.441]

B:BD[17.555] → [14.2002:2086]

BuildOutput getBuildOutput(std::shared_ptr<StoreAPI> store, const Derivation & drv)

[17.555]

[17.606]

BuildOutput getBuildOutput(nix::ref<Store> store, const Derivation & drv)

Replacement in src/hydra-queue-runner/build-result.cc at line 34 [17.441]
B:BD[17.824] → [17.824:875]
```
        computeFSClosure(*store, output, closure);
```
[17.824]
[17.875]
```
        store->computeFSClosure(output, closure);
```

Replacement in src/hydra-queue-runner/build-result.hh at line 40 [17.4329]

B:BD[17.4741] → [14.2129:2224]

BuildOutput getBuildOutput(std::shared_ptr<nix::StoreAPI> store, const nix::Derivation & drv);

[17.4741]

BuildOutput getBuildOutput(nix::ref<nix::Store> store, const nix::Derivation & drv);

Replacement in src/hydra-queue-runner/builder.cc at line 48 [18.133]

B:BD[18.1479] → [18.1479:1552]

bool State::doBuildStep(std::shared_ptr<StoreAPI> store, Step::ptr step,

[18.1479]

[18.1552]

bool State::doBuildStep(nix::ref<Store> store, Step::ptr step,

Replacement in src/hydra-queue-runner/builder.cc at line 357 [18.133]

B:BD[18.13251] → [18.13251:13314]

                    for (auto & path : outputPaths(step->drv))

[18.13251]

[18.13314]

                    for (auto & path : step->drv.outputPaths())

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 362 [17.4840]
B:BD[19.1390] → [19.1390:1437]
```
    for (auto & path : outputPaths(step->drv))
```
[19.1390]
[19.1437]
```
    for (auto & path : step->drv.outputPaths())
```
Deletion in src/hydra-queue-runner/queue-monitor.cc at line 4 [18.20067]
B:BD[20.1279] → [3.58:77]
```
#include "misc.hh"
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 66 [18.20067]

B:BD[18.21512] → [4.203:311]

bool State::getQueuedBuilds(Connection & conn, std::shared_ptr<StoreAPI> store, unsigned int & lastBuildId)

[18.21512]

[18.21620]

bool State::getQueuedBuilds(Connection & conn, ref<Store> store, unsigned int & lastBuildId)

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 317 [18.20067]
B:BD[18.29402] → [20.1403:1464]
```
Step::ptr State::createStep(std::shared_ptr<StoreAPI> store,
```
[18.29402]
[20.1464]
```
Step::ptr State::createStep(ref<Store> store,
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 375 [18.20067]

B:BD[21.1] → [3.78:136]

    step->preferLocalBuild = willBuildLocally(step->drv);

[21.1]

[21.197]

    step->preferLocalBuild = step->drv.willBuildLocally();

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 393 [18.20067]
B:BD[18.31904] → [20.1528:1574]
```
    PathSet outputs = outputPaths(step->drv);
```
[18.31904]
[20.1574]
```
    PathSet outputs = step->drv.outputPaths();
```

Replacement in src/hydra-queue-runner/state.hh at line 380 [23.1128]

B:BD[22.2260] → [4.792:903]

    bool getQueuedBuilds(Connection & conn, std::shared_ptr<nix::StoreAPI> store, unsigned int & lastBuildId);

[22.2260]

[23.7732]

    bool getQueuedBuilds(Connection & conn, nix::ref<nix::Store> store, unsigned int & lastBuildId);

Replacement in src/hydra-queue-runner/state.hh at line 385 [23.1128]

B:BD[23.7785] → [20.3337:3400]

    Step::ptr createStep(std::shared_ptr<nix::StoreAPI> store,

[23.7785]

[20.3400]

    Step::ptr createStep(nix::ref<nix::Store> store,

Replacement in src/hydra-queue-runner/state.hh at line 408 [23.1128]

B:BD[23.8377] → [24.1063:1138]

    bool doBuildStep(std::shared_ptr<nix::StoreAPI> store, Step::ptr step,

[23.8377]

[23.8447]

    bool doBuildStep(nix::ref<nix::Store> store, Step::ptr step,

Replacement in src/hydra-queue-runner/state.hh at line 411 [23.1128]
B:BD[23.8479] → [16.1816:1875]
```
    void buildRemote(std::shared_ptr<nix::StoreAPI> store,
```
[23.8479]
[16.1875]
```
    void buildRemote(nix::ref<nix::Store> store,
```

Process Nix API changes

Dependencies

In channels

Change contents

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

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

Deletion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 283 [6.303]

Deletion in src/hydra-queue-runner/build-remote.cc at line 7 [12.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 76 [12.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 83 [12.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 98 [12.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 110 [12.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 118 [12.85]

Replacement in src/hydra-queue-runner/build-remote.cc at line 130 [12.85]

Deletion in src/hydra-queue-runner/build-result.cc at line 3 [17.441]

Replacement in src/hydra-queue-runner/build-result.cc at line 24 [17.441]

Replacement in src/hydra-queue-runner/build-result.cc at line 34 [17.441]

Replacement in src/hydra-queue-runner/build-result.hh at line 40 [17.4329]

Replacement in src/hydra-queue-runner/builder.cc at line 48 [18.133]

Replacement in src/hydra-queue-runner/builder.cc at line 357 [18.133]

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 362 [17.4840]

Deletion in src/hydra-queue-runner/queue-monitor.cc at line 4 [18.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 66 [18.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 317 [18.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 375 [18.20067]

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 393 [18.20067]

Replacement in src/hydra-queue-runner/state.hh at line 380 [23.1128]

Replacement in src/hydra-queue-runner/state.hh at line 385 [23.1128]

Replacement in src/hydra-queue-runner/state.hh at line 408 [23.1128]

Replacement in src/hydra-queue-runner/state.hh at line 411 [23.1128]