lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #9257 from Artturin/nixenvjsondrvpath

Browse source 
`nix-env --query`: fix `--json` ignoring `--drv-path`

(cherry picked from commit 516e7ddc41f39ff939b5d5b5dc71e590f24890d4)
Change-Id: I84b5bccea9d0383e2e74544743b703942e7be547
This commit is contained in:
eldritch horrors 2024-03-04 05:59:15 +01:00
parent 01069d8c46
commit 340a6cf977
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/src/release-notes/rl-next.md
View file

@ -1,3 +1,5 @@
# Release X.Y (202?-??-??) # Release X.Y (202?-??-??)
- `nix-shell` shebang lines now support single-quoted arguments. - `nix-shell` shebang lines now support single-quoted arguments.
- Fixed a bug where `nix-env --query` ignored `--drv-path` when `--json` was set.

9
src/nix-env/nix-env.cc
View file

@ -922,7 +922,7 @@ static VersionDiff compareVersionAgainstSet(
} }
static void queryJSON(Globals & globals, std::vector<DrvInfo> & elems, bool printOutPath, bool printMeta) static void queryJSON(Globals & globals, std::vector<DrvInfo> & elems, bool printOutPath, bool printDrvPath, bool printMeta)
{ {
using nlohmann::json; using nlohmann::json;
json topObj = json::object(); json topObj = json::object();
@ -953,6 +953,11 @@ static void queryJSON(Globals & globals, std::vector<DrvInfo> & elems, bool prin
} }
} }
if (printDrvPath) {
auto drvPath = i.queryDrvPath();
if (drvPath) pkgObj["drvPath"] = globals.state->store->printStorePath(*drvPath);
}
if (printMeta) { if (printMeta) {
json &metaObj = pkgObj["meta"]; json &metaObj = pkgObj["meta"];
metaObj = json::object(); metaObj = json::object();
@ -1079,7 +1084,7 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
/* Print the desired columns, or XML output. */ /* Print the desired columns, or XML output. */
if (jsonOutput) { if (jsonOutput) {
queryJSON(globals, elems, printOutPath, printMeta); queryJSON(globals, elems, printOutPath, printDrvPath, printMeta);
cout << '\n'; cout << '\n';
return; return;
} }

1
tests/functional/user-envs.sh
View file

@ -26,6 +26,7 @@ nix-env -f ./user-envs.nix -qa --json --out-path | jq -e '.[] | select(.name ==
.outputName == "out", .outputName == "out",
(.outputs.out | test("'$NIX_STORE_DIR'.*-0\\.1")) (.outputs.out | test("'$NIX_STORE_DIR'.*-0\\.1"))
] | all' ] | all'
nix-env -f ./user-envs.nix -qa --json --drv-path | jq -e '.[] | select(.name == "bar-0.1") | (.drvPath | test("'$NIX_STORE_DIR'.*-0\\.1\\.drv"))'
# Query descriptions. # Query descriptions.
nix-env -f ./user-envs.nix -qa '*' --description | grepQuiet silly nix-env -f ./user-envs.nix -qa '*' --description | grepQuiet silly