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.

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

nix upgrade-nix: Give a better error message if the profile is using 'nix profile' (backport #12166) #12231

Open
wants to merge 1 commit into
base: 2.24-maintenance
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 11, 2025

Motivation

DeterminateSystems/nix-installer#1362

Before:

error: directory '/nix/var/nix/profiles/per-user/eelco/test/bin' does not appear to be part of a Nix profile

After:

error: directory "/nix/var/nix/profiles/per-user/eelco/test" is managed by 'nix profile' and currently cannot be upgraded by 'nix upgrade-nix'

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #12166 done by [Mergify](https://mergify.com).

…'nix profile'

(cherry picked from commit fccfdbe)

# Conflicts:
#	src/nix/upgrade-nix.cc
Copy link
Contributor Author

mergify bot commented Jan 11, 2025

Cherry-pick of fccfdbe has failed:

On branch mergify/bp/2.24-maintenance/pr-12166
Your branch is up to date with 'origin/2.24-maintenance'.

You are currently cherry-picking commit fccfdbea5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/nix/upgrade-nix.cc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the new-cli Relating to the "nix" command label Jan 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts merge-queue new-cli Relating to the "nix" command
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant