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.fish: Typo NIX_SS{H => L}_CERT_FILE (backport #12405) #12406

Merged
merged 1 commit into from
Feb 3, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 3, 2025

nix-profile.fish has NIX_SSL_CERT_FILE spelled incorrectly.


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

(cherry picked from commit 803fb83)

# Conflicts:
#	scripts/nix-profile.fish.in
@mergify mergify bot requested a review from edolstra as a code owner February 3, 2025 12:37
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Feb 3, 2025
Copy link
Contributor Author

mergify bot commented Feb 3, 2025

Cherry-pick of 803fb83 has failed:

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

You are currently cherry-picking commit 803fb83f7.
  (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.fish.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

@mergify mergify bot merged commit acba2c6 into 2.26-maintenance Feb 3, 2025
23 checks passed
@mergify mergify bot deleted the mergify/bp/2.26-maintenance/pr-12405 branch February 3, 2025 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant