aleksanaa/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix eval --raw: Use coerceToString()

Browse source 
Thus,

  $ nix eval --raw '("foo")'
  foo

  $ nix eval --raw nixpkgs.hello
  /nix/store/1y6ckg6khrdsvll54s5spcmf3w6ka9k4-hello-2.10

  $ nix eval --raw '(/etc/resolv.conf)'
  /nix/store/vml92ama92i8mz013nny461mlvg8mvap-resolv.conf
This commit is contained in:
Eelco Dolstra 2017-11-20 18:27:29 +01:00
parent 1ff01187e2
commit f5f29dc2b7
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nix/eval.cc
View file

@ -42,6 +42,10 @@ struct CmdEval : MixJSON, InstallablesCommand
"To get the current version of Nixpkgs:", "To get the current version of Nixpkgs:",
"nix eval --raw nixpkgs.lib.nixpkgsVersion" "nix eval --raw nixpkgs.lib.nixpkgsVersion"
}, },
Example{
"To print the store path of the Hello package:",
"nix eval --raw nixpkgs.hello"
},
}; };
} }
@ -56,10 +60,10 @@ struct CmdEval : MixJSON, InstallablesCommand
for (auto & i : installables) { for (auto & i : installables) {
auto v = i->toValue(*state); auto v = i->toValue(*state);
PathSet context;
if (raw) { if (raw) {
std::cout << state->forceString(*v); std::cout << state->coerceToString(noPos, *v, context);
} else if (json) { } else if (json) {
PathSet context;
auto jsonElem = jsonOut->placeholder(); auto jsonElem = jsonOut->placeholder();
printValueAsJSON(*state, true, *v, jsonElem, context); printValueAsJSON(*state, true, *v, jsonElem, context);
} else { } else {