delroth/nix-eval-jobs
0
0
Fork 0
forked from lix-project/nix-eval-jobs
Code Pull requests Activity

fix for nixUnstable

Browse source
This commit is contained in:
Jörg Thalheim 2022-04-18 14:45:49 +02:00 committed by adisbladis
parent 3094e12732
commit c1b86245a1
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.nix
View file

@ -16,7 +16,9 @@
checks = checks =
let let
mkVariant = nix: (packages.nix-eval-jobs.override { mkVariant = nix: (packages.nix-eval-jobs.override {
inherit nix; # TODO: fix to stable after next nix release
nix = pkgs.nixUnstable;
#inherit nix;
}).overrideAttrs (_: { }).overrideAttrs (_: {
name = "nix-eval-jobs-${nix.version}"; name = "nix-eval-jobs-${nix.version}";
inherit (nix) version; inherit (nix) version;
@ -44,7 +46,9 @@
touch $out touch $out
''; '';
build = mkVariant pkgs.nix; # TODO fix to unstable in next release
build = mkVariant pkgs.nixUnstable;
#build = mkVariant pkgs.nix;
build-unstable = mkVariant pkgs.nixUnstable; build-unstable = mkVariant pkgs.nixUnstable;
}; };

4
src/nix-eval-jobs.cc
View file

@ -217,7 +217,9 @@ static void worker(
reply["system"] = drv->querySystem(); reply["system"] = drv->querySystem();
reply["drvPath"] = drvPath; reply["drvPath"] = drvPath;
for (auto out : outputs){ for (auto out : outputs){
reply["outputs"][out.first] = localStore->printStorePath(out.second); if (out.second) {
reply["outputs"][out.first] = localStore->printStorePath(*out.second);
}
} }
if (myArgs.meta) { if (myArgs.meta) {