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

install-darwin: fix _nixbld uids for macOS sequoia (backport #10919) #11416

Merged
merged 4 commits into from
Sep 16, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 3, 2024

Motivation

Starting in macOS 15 Sequoia, macOS daemon UIDs are encroaching on our default UIDs of 301-332. This commit relocates our range up to avoid clashing with the current UIDs of 301-304 and buy us a little time while still leaving headroom for people installing more than 32 users.

It also adopts GID 350 (same as first UID), since @emilazy pointed out that this will keep our build group from showing up in the Users & Groups interface. (See #10919 (comment))

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.


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

abathur and others added 3 commits September 3, 2024 23:57
Starting in macOS 15 Sequoia, macOS daemon UIDs are encroaching on our
default UIDs of 301-332. This commit relocates our range up to avoid
clashing with the current UIDs of 301-304 and buy us a little time
while still leaving headroom for people installing more than 32 users.

(cherry picked from commit df36ff0)

# Conflicts:
#	scripts/install-darwin-multi-user.sh
(cherry picked from commit 7556742)

# Conflicts:
#	scripts/install-multi-user.sh
#	scripts/install-systemd-multi-user.sh
@mergify mergify bot requested a review from edolstra as a code owner September 3, 2024 23:57
Copy link
Author

mergify bot commented Sep 3, 2024

Cherry-pick of df36ff0 has failed:

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

You are currently cherry-picking commit df36ff0d1.
  (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)

Changes to be committed:
	modified:   scripts/bigsur-nixbld-user-migration.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   scripts/install-darwin-multi-user.sh

Cherry-pick of 7556742 has failed:

On branch mergify/bp/2.19-maintenance/pr-10919
Your branch is ahead of 'origin/2.19-maintenance' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 75567423f.
  (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/install-multi-user.sh
	both modified:   scripts/install-systemd-multi-user.sh

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

@emilazy
Copy link
Member

emilazy commented Sep 11, 2024

I believe backporting #9639 would resolve the conflict here.

@tomberek
Copy link
Contributor

@Mergifyio rebase

Copy link
Author

mergify bot commented Sep 11, 2024

rebase

☑️ Nothing to do

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position=-1 [📌 rebase requirement]
  • any of:
    • #commits-behind>0 [📌 rebase requirement]
    • #commits>1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

@tomberek tomberek merged commit 0446f7b into 2.19-maintenance Sep 16, 2024
16 checks passed
@tomberek tomberek deleted the mergify/bp/2.19-maintenance/pr-10919 branch September 16, 2024 13:19
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.

3 participants