checks: check /etc/nix/nix.custom.conf hash
#1266
Merged
+87
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emilazy
force-pushed
the
push-qwtkyltnunqn
branch
from
3932fa1 to
97679ad
Compare
Enzime
reviewed
Jan 14, 2025
| # Generated by https://github.com/DeterminateSystems/nix-installer. | ||
| # See `/nix/nix-installer --version` for the version details. | ||
|
|
||
| !include nix.custom.conf |
There was a problem hiding this comment.
Shouldn't this be at the bottom to be able to override their defaults?
There was a problem hiding this comment.
Probably, yeah. This is what’s shipped in the wild in v0.33.0, though, so I think we have to handle this version of the file anyway.
emilazy
force-pushed
the
push-qwtkyltnunqn
branch
from
97679ad to
b199a52
Compare
|
A new version with the relevant PR has been released; I’ve tested the code and fixed it to use |
emilazy
force-pushed
the
push-qwtkyltnunqn
branch
2 times, most recently
from
f9eefa6 to
edee959
Compare
|
Updated for the new hashes in v0.34.0; confirmed that it still works. |
Enzime
previously approved these changes
Jan 17, 2025
modules/nix/default.nix
Outdated
| @@ -823,8 +823,58 @@ in | |||
| ]); | |||
| users.knownGroups = mkIf cfg.configureBuildUsers [ "nixbld" ]; | |||
|
|
|||
| # The Determinate Systems installer puts user‐specified settings in | |||
| # `/etc/nix/nix.custom.conf` since vX.YY.Z. Supplement the | |||
There was a problem hiding this comment.
I'm guessing this is meant to have an actual version number
emilazy
force-pushed
the
push-qwtkyltnunqn
branch
from
edee959 to
8abb2e7
Compare
Enzime
approved these changes
Jan 18, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After DeterminateSystems/nix-installer#1379, the Determinate Systems installer will write custom user configuration to
nix.custom.confand include it fromnix.conf. We need to check for its presence and error out if it contains any settings so as to not inadvertently clobber user configuration. The error message here could maybe be improved but it’s better than not handling it at all.Drafted until that PR is ready to ship and we know what the hash of the
nix.confand emptynix.custom.confwill be.This should land before #1259 if it’s ready in time, or else get backported.
Note: This work was funded by Determinate Systems. The design is my own.