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

Complicated reups #1294

Closed
wants to merge 12 commits into from
Closed

Complicated reups #1294

wants to merge 12 commits into from

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Nov 15, 2024

Description

WIP PR for dealing with more complicated reinstall scenarios.

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

@grahamc grahamc added the upload to s3 The labeled PR is allowed to upload its artifacts to S3 for easy testing label Nov 15, 2024
grahamc added 10 commits November 15, 2024 16:15
@grahamc
fixup receipt fixtures
097a39f
@grahamc
/etc/nix.conf nit
9da32a2
@grahamc
friday afternoon hackety hack: be more chill about nix.conf and if it…
9f2e36c 
… and nix.custom.conf exists

...this should not merge, obviously...

but the idea here is if we're in a reinstall scenario, and nix.custom.conf exists,
and nix.conf exists:

1. assume nix.conf is managed by determinate-nixd
2. don't even fuss about nix.custom.conf and just call it good

this does mean we're losing the configuration we're about to write, which is not ideal,
but let's see what happens and I'm sure we'll drop this patch and make a good version
when Sep is back. (foreshadowing: famous last words.)
@grahamc
:)
48270be
@grahamc
link to dnixd
1201066
@grahamc
derp
ba6c4f3
@grahamc
:)
bfade21
@grahamc
Gently handle failures to remove a file that doesn't exist
ab7abbf
@grahamc
Clipfmt
f0de38a
@grahamc
Don't change modes, don't check uid
98c85f1
@cole-h cole-h mentioned this pull request Nov 18, 2024
Merged
6 tasks
@cole-h cole-h closed this in #1298 Nov 18, 2024
@grahamc grahamc deleted the complicated-reups branch November 21, 2024 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
upload to s3 The labeled PR is allowed to upload its artifacts to S3 for easy testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@grahamc