wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

nix flake metadata: Show store path if available

Browse source
This commit is contained in:
Eelco Dolstra 2025-05-07 15:56:35 +02:00
parent d0a89fa03f
commit f6ad6291ab
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/nix/flake.cc
View file

@ -218,9 +218,13 @@ struct CmdFlakeMetadata : FlakeCommand, MixJSON
auto lockedFlake = lockFlake(); auto lockedFlake = lockFlake();
auto & flake = lockedFlake.flake; auto & flake = lockedFlake.flake;
/* Hack to show the store path if available. */
std::optional<StorePath> storePath; std::optional<StorePath> storePath;
if (flake.lockedRef.input.getNarHash()) if (store->isInStore(flake.path.path.abs())) {
storePath = flake.lockedRef.input.computeStorePath(*store); auto path = store->toStorePath(flake.path.path.abs()).first;
if (store->isValidPath(path))
storePath = path;
}
if (json) { if (json) {
nlohmann::json j; nlohmann::json j;

1
tests/functional/flakes/flakes.sh
View file

@ -69,6 +69,7 @@ nix flake metadata "$flake1Dir" | grepQuiet 'URL:.*flake1.*'
# Test 'nix flake metadata --json'. # Test 'nix flake metadata --json'.
json=$(nix flake metadata flake1 --json | jq .) json=$(nix flake metadata flake1 --json | jq .)
[[ $(echo "$json" | jq -r .description) = 'Bla bla' ]] [[ $(echo "$json" | jq -r .description) = 'Bla bla' ]]
[[ -d $(echo "$json" | jq -r .path) ]]
[[ $(echo "$json" | jq -r .lastModified) = $(git -C "$flake1Dir" log -n1 --format=%ct) ]] [[ $(echo "$json" | jq -r .lastModified) = $(git -C "$flake1Dir" log -n1 --format=%ct) ]]
hash1=$(echo "$json" | jq -r .revision) hash1=$(echo "$json" | jq -r .revision)
[[ -n $(echo "$json" | jq -r .fingerprint) ]] [[ -n $(echo "$json" | jq -r .fingerprint) ]]