Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nix edit #10814

Merged
merged 2 commits into from
May 31, 2024
Merged

Fix nix edit #10814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1a817f
fix nix edit in pure mode
Mic92 May 31, 2024
69c1598
add regression test for nix edit
Mic92 May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/libfetchers/filtering-source-accessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

namespace nix {

std::optional<std::filesystem::path> FilteringSourceAccessor::getPhysicalPath(const CanonPath & path)
{
checkAccess(path);
return next->getPhysicalPath(prefix / path);
}

std::string FilteringSourceAccessor::readFile(const CanonPath & path)
{
checkAccess(path);
Expand Down
2 changes: 2 additions & 0 deletions src/libfetchers/filtering-source-accessor.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ struct FilteringSourceAccessor : SourceAccessor
displayPrefix.clear();
}

std::optional<std::filesystem::path> getPhysicalPath(const CanonPath & path) override;

std::string readFile(const CanonPath & path) override;

bool pathExists(const CanonPath & path) override;
Expand Down
13 changes: 13 additions & 0 deletions tests/functional/flakes/edit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/env bash

source ./common.sh

requireGit

flake1Dir=$TEST_ROOT/flake1

createGitRepo "$flake1Dir"
createSimpleGitFlake "$flake1Dir"

export EDITOR=cat
nix edit "$flake1Dir#" | grepQuiet simple.builder.sh
1 change: 1 addition & 0 deletions tests/functional/local.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ nix_tests = \
test-infra.sh \
flakes/flakes.sh \
flakes/develop.sh \
flakes/edit.sh \
flakes/run.sh \
flakes/mercurial.sh \
flakes/circular.sh \
Expand Down
1 change: 1 addition & 0 deletions tests/functional/simple.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ mkDerivation {
builder = ./simple.builder.sh;
PATH = "";
goodPath = path;
meta.position = "${__curPos.file}:${toString __curPos.line}";
Copy link
Member Author

@Mic92 Mic92 May 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also saw that we didn't meta.position anywhere.

}
Loading