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.

Sign up for GitHub

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

Jump to bottom

Various fixups #1329

Merged
merged 5 commits into from
Dec 2, 2024
Merged

Various fixups #1329

merged 5 commits into from
Dec 2, 2024

Conversation

cole-h
Copy link
Member

@cole-h cole-h commented Dec 2, 2024

Description

FH-477
FH-479
FH-482

Checklist
  • Formatted with cargo fmt
  • Built with nix build
  • Ran flake checks with nix flake check
  • Added or updated relevant tests (leave unchecked if not applicable)
  • Added or updated relevant documentation (leave unchecked if not applicable)
  • Linked to related issues (leave unchecked if not applicable)
Validating with install.determinate.systems

If a maintainer has added the upload to s3 label to this PR, it will become available for installation via install.determinate.systems:

curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix/pr/$PR_NUMBER | sh -s -- install

cole-h added 5 commits December 2, 2024 11:02
@cole-h
CreateUser: retry dscl command if it gets SIGKILLed
47e5c55
@cole-h
AddUserToGroup: disambiguate between "group not found" and "user not …
3fb0e08 
…found"
@cole-h
AddUserToGroup: handle case where user and group both already exist
d452dfb
@cole-h
fixup: bogus arg to dseditgroup
c531848 
This has always been wrong:

     -t recordtype
              The type of the record to be added to or deleted from the group specified by groupname.
              Valid values are user, computer, group, or computergroup.

but I guess macOS just ignores / autodetects the correct type when
provided with a bogus value.

Validated by doing various operations with `-t jfkdlsjfkldasjl` and
seeing no errors, but passing the "wrong type", i.e. `-t group` in this
invocation, did error with "Record was not found".
@cole-h
SetupDefaultProfile: prevent post-build-hook from messing nix-env up
c039e67 
...if it's configured, we'll skip it for the nix-env invocations.
@cole-h cole-h merged commit b3afc54 into main Dec 2, 2024
21 checks passed
@cole-h cole-h deleted the pkg-fixups branch December 2, 2024 20:48
@cole-h cole-h added this to the 0.31.0 milestone Dec 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc grahamc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.31.0
Development

Successfully merging this pull request may close these issues.
2 participants
@cole-h @grahamc