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

Merge pull request #14 from nix-community/ci

Browse source 
fix build against nixUnstable
This commit is contained in:
Jörg Thalheim 2021-12-15 13:25:25 +00:00 committed by GitHub
parent 23523075c2 c297bd9564
commit 14b78c41aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
default.nix
View file

@ -1,6 +1,6 @@
{ stdenv { stdenv
, lib , lib
, nixFlakes , nixUnstable
, meson , meson
, cmake , cmake
, ninja , ninja
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = if srcDir == null then filterMesonBuild ./. else srcDir; src = if srcDir == null then filterMesonBuild ./. else srcDir;
buildInputs = [ buildInputs = [
nlohmann_json nlohmann_json
nixFlakes nixUnstable
boost boost
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

6
flake.lock
View file

@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1637048323, "lastModified": 1639573498,
"narHash": "sha256-h2m2LuUEbV5pvNjXoWbk2rAaBAQAsf3cvJXS8DGi+Bo=", "narHash": "sha256-YAoywqjyjOJYuEZpA8sln84jk99GG9hYbPEYXwGEGGM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6b68d74f036def3d48a23969edfd0fa47f34af3e", "rev": "aef12c8678fd5e927edba764bd04f3ba2930ae15",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@ -188,7 +188,7 @@ static void worker(
continue; continue;
} }
printValueAsJSON(state, true, *metaValue, ss, context); printValueAsJSON(state, true, *metaValue, noPos, ss, context);
nlohmann::json field = nlohmann::json::parse(ss.str()); nlohmann::json field = nlohmann::json::parse(ss.str());
meta[name] = field; meta[name] = field;
} }