Skip to content

pass cli-options.nix through the git sandbox #5

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

Merged
merged 1 commit into from
Apr 24, 2025
Merged

pass cli-options.nix through the git sandbox #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/libfetchers/git-utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,14 @@ struct GitRepoImpl : GitRepo, std::enable_shared_from_this<GitRepoImpl>

// Usually ignored, so add it manually
if (pathExists(cwd / ".devenv.flake.nix")) {
info.files.insert(CanonPath((cwd / ".devenv/cli-options.nix").string()).removePrefix(CanonPath(path.string())).rel());
info.files.insert(CanonPath((cwd / ".devenv.flake.nix").string()).removePrefix(CanonPath(path.string())).rel());
info.files.insert(CanonPath((cwd / ".devenv/flake.json").string()).removePrefix(CanonPath(path.string())).rel());
info.files.insert(CanonPath((cwd / ".devenv/devenv.json").string()).removePrefix(CanonPath(path.string())).rel());
// support devenv test
for (const auto & entry : fs::directory_iterator(cwd)) {
if (entry.path().filename().string().find(".devenv.") == 0 && fs::is_directory(entry.path())) {
// add flake.json and devenv.json
// add flake.json, devenv.json and cli-options.nix
info.files.insert(CanonPath((cwd / entry.path() / "cli-options.nix").string()).removePrefix(CanonPath(path.string())).rel());
Copy link
Member Author

Choose a reason for hiding this comment

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

No idea if we need this one

info.files.insert(CanonPath((cwd / entry.path() / "flake.json").string()).removePrefix(CanonPath(path.string())).rel());
info.files.insert(CanonPath((cwd / entry.path() / "devenv.json").string()).removePrefix(CanonPath(path.string())).rel());
}
Expand Down
Loading