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

Fix argument order in the Windows implementation of getEnvOs (backport #11855) #11857

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 12, 2024

Motivation

See the build failure in msys2/MINGW-packages#22499

Context

Priorities and Process

Add 👍 to pull requests you find important.

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

CC @puffnfresh


This is an automatic backport of pull request #11855 done by Mergify.

See the build failure in msys2/MINGW-packages#22499

(cherry picked from commit 355f08a)

# Conflicts:
#	src/libutil/windows/environment-variables.cc
Copy link
Contributor Author

mergify bot commented Nov 12, 2024

Cherry-pick of 355f08a has failed:

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

You are currently cherry-picking commit 355f08a72.
  (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/libutil/windows/environment-variables.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

@Ericson2314
Copy link
Member

Manual backport already done.

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