Fix build

[?]
Aug 27, 2020, 3:46 PM
4DHGJ2FLM2QZTDKOYCXJQV4EDLRPOAOT7P7RGACCM5NFRRDX3AZAC

Dependencies

  • [2] 6NUK6AZA Fix build
  • [3] WEFXD6SW Fix build
  • [4] QHO6IDC7 Fix build
  • [5] EJJCY263 Account steps with preferLocalBuild as a separate system type
  • [6] EBJP3MNA Build against nix-master
  • [7] MHVIT4JY Split hydra-queue-runner.cc more
  • [8] DKJFD6JN Process Nix API changes
  • [9] YSZQ3ORR Fix build
  • [10] FJ5H26J6 Fix building against nix master
  • [11] H7SZRHUB Use nix::willBuildLocally()
  • [12] EFWDY2V7 Support testing build determinism
  • [13] 5JMO43B4 buildRemote(): Copy paths to the destination store in O(1) memory
  • [14] HTDANBLN Merge pull request #730 from NixOS/flake
  • [15] VUYJ47EV hydra-eval-jobs: Parallelize
  • [16] BYVRA54Q Temporarily disable machines on any exception, not just connection failures
  • [17] WV4SSAIY Build against nix-master
  • [*] NQPGIRXX Revert "hydra-eval-jobs -> nix eval-hydra-jobs"
  • [*] 5AIYUMTB Basic remote building

Change contents

  • replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 476
    [4.147][4.14466:14561](),[4.232][4.14466:14561](),[2.654][4.14466:14561](),[4.14466][4.14466:14561]()
    auto newDrvPath = store->printStorePath(writeDerivation(store, drv, drvName));
    [2.654]
    [4.14561]
    auto newDrvPath = store->printStorePath(writeDerivation(*store, drv));
  • edit in src/hydra-queue-runner/build-remote.cc at line 448
    [4.1152][4.1152:1278]()
    ValidPathInfo info(localStore->parseStorePath(storePathS));
    assert(outputs.count(info.path));
  • replacement in src/hydra-queue-runner/build-remote.cc at line 449
    [4.7588][4.1279:1362]()
    info.references = readStorePaths<StorePathSet>(*localStore, from);
    [4.7588]
    [4.7646]
    auto references = readStorePaths<StorePathSet>(*localStore, from);
  • replacement in src/hydra-queue-runner/build-remote.cc at line 451
    [4.7699][4.1363:1460](),[4.1460][3.83:158](),[3.158][4.1525:1593](),[4.1525][4.1525:1593]()
    info.narSize = readLongLong(from);
    totalNarSize += info.narSize;
    info.narHash = Hash::parseAny(readString(from), htSHA256);
    info.ca = parseContentAddressOpt(readString(from));
    [4.7699]
    [4.1593]
    auto narSize = readLongLong(from);
    auto narHash = Hash::parseAny(readString(from), htSHA256);
    auto ca = parseContentAddressOpt(readString(from));
  • edit in src/hydra-queue-runner/build-remote.cc at line 455
    [4.1647]
    [4.1647]
    ValidPathInfo info(localStore->parseStorePath(storePathS), narHash);
    assert(outputs.count(info.path));
    info.references = references;
    info.narSize = narSize;
    totalNarSize += info.narSize;
    info.narHash = narHash;
    info.ca = ca;
  • replacement in src/hydra-queue-runner/queue-monitor.cc at line 433
    [4.1][4.219:285]()
    step->preferLocalBuild = step->parsedDrv->willBuildLocally();
    [4.1]
    [4.8536]
    step->preferLocalBuild = step->parsedDrv->willBuildLocally(*localStore);