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 upgrade-nix profile search #12048

Merged
merged 2 commits into from
Dec 15, 2024
Merged

Fix nix upgrade-nix profile search #12048

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
4f831e2
Fix `nix upgrade-nix` profile search
gcurtis Dec 12, 2024
ccaa4c2
upgrade-nix: don't double quote path on error
Mic92 Dec 15, 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
2 changes: 1 addition & 1 deletion src/libutil/executable-path.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ ExecutablePath::findName(const OsString & exe, std::function<bool(const fs::path
for (auto & dir : directories) {
auto candidate = dir / exe;
if (isExecutable(candidate))
return std::filesystem::canonical(candidate);
return candidate.lexically_normal();
}

return std::nullopt;
Expand Down
4 changes: 2 additions & 2 deletions src/nix/upgrade-nix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ struct CmdUpgradeNix : MixDryRun, StoreCommand
auto whereOpt = ExecutablePath::load().findName(OS_STR("nix-env"));
if (!whereOpt)
throw Error("couldn't figure out how Nix is installed, so I can't upgrade it");
auto & where = *whereOpt;
const auto & where = whereOpt->parent_path();

printInfo("found Nix in '%s'", where);

Expand All @@ -126,7 +126,7 @@ struct CmdUpgradeNix : MixDryRun, StoreCommand

if (where.filename() != "bin" ||
!hasSuffix(userEnv, "user-environment"))
throw Error("directory '%s' does not appear to be part of a Nix profile", where);
throw Error("directory %s does not appear to be part of a Nix profile", where);

if (!store->isValidPath(store->parseStorePath(userEnv)))
throw Error("directory '%s' is not in the Nix store", userEnv);
Expand Down
Loading