b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #158455 from NickCao/nix-unstable

Browse source 
nixUnstable: pre20220127 -> pre20220207
This commit is contained in:
Artturi 2022-02-26 07:42:03 +02:00 committed by GitHub
parent fc00557b04 0930709272
commit b398f196e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 3 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));
}

6
pkgs/tools/package-management/nix/default.nix
View file

@ -66,12 +66,12 @@ in lib.makeExtensible (self: {
unstable = lib.lowPrio (common rec {
version = "2.7";
suffix = "pre20220127_${lib.substring 0 7 src.rev}";
suffix = "pre20220221_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "558c4ee3e370c9f9a6ea293df54ed6914a999f1c";
sha256 = "sha256-hMzKQflpgf3P7OdYKSnD1VMBSnF48XSRjaNX3bUJct4=";
rev = "caf51729450d4c57d48ddbef8e855e9bf65f8792";
sha256 = "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw=";
};
});
})