max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-12 17:26:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix 'nix-instantiate --find-file' and add a test

Browse source 
Reported by @lheckemann.
This commit is contained in:
Eelco Dolstra 2022-10-12 21:51:36 +02:00
parent 511590976c
commit 12dd8d49c6
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/nix-instantiate/nix-instantiate.cc
View file

@ -169,7 +169,10 @@ static int main_nix_instantiate(int argc, char * * argv)
if (findFile) { if (findFile) {
for (auto & i : files) { for (auto & i : files) {
auto p = state->findFile(i); auto p = state->findFile(i);
std::cout << p.readFile() << std::endl; if (auto fn = p.getPhysicalPath())
std::cout << fn->abs() << std::endl;
else
throw Error("'%s' has no physical path", p);
} }
return 0; return 0;
} }

3
tests/nix_path.sh
View file

@ -9,3 +9,6 @@ nix-instantiate --eval -E '<by-relative-path/simple.nix>' --restrict-eval
# Should ideally also test this, but there’s no pure way to do it, so just trust me that it works # Should ideally also test this, but there’s no pure way to do it, so just trust me that it works
# nix-instantiate --eval -E '<nixpkgs>' -I nixpkgs=channel:nixos-unstable --restrict-eval # nix-instantiate --eval -E '<nixpkgs>' -I nixpkgs=channel:nixos-unstable --restrict-eval
[[ $(nix-instantiate --find-file by-absolute-path/simple.nix) = $PWD/simple.nix ]]
[[ $(nix-instantiate --find-file by-relative-path/simple.nix) = $PWD/simple.nix ]]