nix-env --query: fix --json ignoring --drv-path
#9257
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Artturin
commented
Nov 2, 2023
| @@ -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); | |||
There was a problem hiding this comment.
For ref this is the code used in the non-json path
if (printDrvPath) {
auto drvPath = i.queryDrvPath();
if (xmlOutput) {
if (drvPath) attrs["drvPath"] = store.printStorePath(*drvPath);
} else
columns.push_back(drvPath ? store.printStorePath(*drvPath) : "-");
}
Artturin
force-pushed
the
nixenvjsondrvpath
branch
from
9498193
to
28aa7e0
Compare
github-actions
bot
added
the
with-tests
Artturin
force-pushed
the
nixenvjsondrvpath
branch
from
28aa7e0
to
2b90cff
Compare
fricklerhandwerk
previously requested changes
Nov 8, 2023
```json
{
"AMB-plugins": {
"drvPath": "/nix/store/l99cb7h2hy8dg005arsjbd9kx0w05d3h-AMB-plugins-0.8.1.drv",
"name": "AMB-plugins-0.8.1",
"outputName": "out",
"outputs": {
"out": null
},
"pname": "AMB-plugins",
"system": "x86_64-linux",
"version": "0.8.1"
},
"ArchiSteamFarm": {
"drvPath": "/nix/store/nhplgyjj34fz6hjmnyih25gxscfh8s7b-ArchiSteamFarm-5.4.12.5.drv",
"name": "ArchiSteamFarm-5.4.12.5",
"outputName": "out",
"outputs": {
"out": null
},
"pname": "ArchiSteamFarm",
"system": "x86_64-linux",
"version": "5.4.12.5"
},
...
```
Artturin
force-pushed
the
nixenvjsondrvpath
branch
from
2b90cff
to
a903f85
Compare
Artturin
changed the title
nix-env --query: Respect --drv-path with --jsonnix-env --query: fix --json ignoring --drv-path
Ericson2314
approved these changes
Nov 18, 2023
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/2023-11-17-nix-team-meeting-minutes-104/35753/1 |
|
@fricklerhandwerk Please either approve or dismiss your review so the auto merge will work |
tebowy
pushed a commit
to tebowy/nix
that referenced
this pull request
Jul 11, 2024
`nix-env --query`: fix `--json` ignoring `--drv-path` (cherry picked from commit 516e7dd) Change-Id: I84b5bccea9d0383e2e74544743b703942e7be547
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
{ "AMB-plugins": { "drvPath": "/nix/store/l99cb7h2hy8dg005arsjbd9kx0w05d3h-AMB-plugins-0.8.1.drv", "name": "AMB-plugins-0.8.1", "outputName": "out", "outputs": { "out": null }, "pname": "AMB-plugins", "system": "x86_64-linux", "version": "0.8.1" }, "ArchiSteamFarm": { "drvPath": "/nix/store/nhplgyjj34fz6hjmnyih25gxscfh8s7b-ArchiSteamFarm-5.4.12.5.drv", "name": "ArchiSteamFarm-5.4.12.5", "outputName": "out", "outputs": { "out": null }, "pname": "ArchiSteamFarm", "system": "x86_64-linux", "version": "5.4.12.5" }, ...Motivation
Context
Priorities
Add 👍 to pull requests you find important.