MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

hydra-unstable: fix build with nixVersions.unstable

Browse source
This commit is contained in:
Nick Cao 2022-02-08 14:08:11 +08:00
parent 771911a16e
commit 0930709272
No known key found for this signature in database
GPG key ID: 068A56CEF48FA2C1
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/tools/misc/hydra/default.nix
View file

@ -9,6 +9,7 @@
rev = "9bce425c3304173548d8e822029644bb51d35263";
sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU=";
};
patches = [ ./eval.patch ];
nix = nixVersions.unstable;
tests = {

34
pkgs/development/tools/misc/hydra/eval.patch Normal file
View file

@ -0,0 +1,34 @@
--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc
+++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc
@@ -64,11 +64,11 @@
static std::string queryMetaStrings(EvalState & state, DrvInfo & drv, const string & name, const string & subAttribute)
{
- Strings res;
+ list<std::string_view> res;
std::function<void(Value & v)> rec;
rec = [&](Value & v) {
- state.forceValue(v);
+ state.forceValue(v, noPos);
if (v.type() == nString)
res.push_back(v.string.s);
else if (v.isList())
@@ -112,7 +112,7 @@
callFlake(state, lockedFlake, *vFlake);
auto vOutputs = vFlake->attrs->get(state.symbols.create("outputs"))->value;
- state.forceValue(*vOutputs);
+ state.forceValue(*vOutputs, noPos);
auto aHydraJobs = vOutputs->attrs->get(state.symbols.create("hydraJobs"));
if (!aHydraJobs)
@@ -191,7 +191,7 @@
state.forceList(*a->value, *a->pos);
for (unsigned int n = 0; n < a->value->listSize(); ++n) {
auto v = a->value->listElems()[n];
- state.forceValue(*v);
+ state.forceValue(*v, noPos);
if (v->type() == nString)
job["namedConstituents"].push_back(state.forceStringNoCtx(*v));
}