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

Fixup multiple --extra-conf usages #456

Merged
merged 2 commits into from
May 9, 2023
Merged

Conversation

Hoverbear
Copy link
Contributor

Description

Fixes #427

image

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

@Hoverbear Hoverbear added this to the 0.8.1 milestone May 8, 2023
@Hoverbear Hoverbear self-assigned this May 8, 2023
@Hoverbear Hoverbear requested a review from cole-h May 8, 2023 19:52
@Hoverbear
Copy link
Contributor Author

We found some additional fix to do!

@Hoverbear Hoverbear removed the request for review from cole-h May 8, 2023 20:10
@Hoverbear
Copy link
Contributor Author

@cole-h and I noticed that experimental-features wasn't merging fully if the user passed some in --extra-conf, so we added that too:
image

@Hoverbear Hoverbear requested a review from cole-h May 8, 2023 20:29
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Neat use of the entry API.

}
},
Entry::Vacant(slot) => {
let _ = slot.insert(experimental_features.join(" ").to_string());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this let _ = ... necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess { slot.insert(); } is valid but for some reason I felt like being rather explicit that we don't want that return type.

@Hoverbear Hoverbear merged commit 7c9dfac into main May 9, 2023
6 checks passed
@Hoverbear Hoverbear deleted the extra-conf-multiple-arg-fixup branch May 9, 2023 14:53
@mitchmindtree
Copy link

Hey there, I'm also running into #427 and looking forward to using this fix :)

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

Any chance of adding this label so we might use it in the meantime?

PS: Thanks for all your work on nix-installer! Loving it so far ❤️

@Hoverbear
Copy link
Contributor Author

Gosh sorry, I didn't see this! The changes should be out on 0.9.0:

curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix/tag/v0.9.0 | sh -s -- install

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

How to specify several lines via extra-conf in /etc/nix/nix.conf ?
3 participants