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-profile.sh.in: fix envvar condition (backport #11541) #12197

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 10, 2025

Motivation

#11351 introduced a regression. The check for the existence of an environment variable caused an error for some shell versions.

Context

Should fix #11535.

Priorities and Process

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 #11541 done by [Mergify](https://mergify.com).

(cherry picked from commit 97fffd8)

# Conflicts:
#	scripts/nix-profile.sh.in
Copy link
Contributor Author

mergify bot commented Jan 10, 2025

Cherry-pick of 97fffd8 has failed:

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

You are currently cherry-picking commit 97fffd876.
  (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:   scripts/nix-profile.sh.in

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant