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

various: replace substituteAll with replaceVars #360770

Merged

Conversation

wolfgangwalther
Copy link
Contributor

Working my way towards removing substituteAll in #237216.

This deals with some special cases, which can't be auto-replaced easily. My goal is to deal with all special cases first, and then replace the remaining ones in one go.

Part of my overall effort for structuredAttrs in #205690.

@philiptaron @emilazy

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

This deals with some special cases, i.e. where "null" is used to avoid
replacing some values or where the syntax is not too easy to grep for
for automated replacement.
@wolfgangwalther wolfgangwalther force-pushed the substitute-all-replace-vars-staging branch from ea0ada2 to 4423b07 Compare December 1, 2024 13:57
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

I haven't subjected it to actual Big Computer time but the changes look great.

@K900
Copy link
Contributor

K900 commented Dec 2, 2024

ack

@philiptaron
Copy link
Contributor

ack

is this a positive (acknowledged?) or a negative (choking sound?)?

@K900
Copy link
Contributor

K900 commented Dec 2, 2024

This is "acknowledged", yes.

@philiptaron
Copy link
Contributor

I built each of these changes and they all go through. Merging.

@philiptaron philiptaron merged commit 246e737 into NixOS:staging Dec 2, 2024
34 checks passed
@wolfgangwalther wolfgangwalther deleted the substitute-all-replace-vars-staging branch December 2, 2024 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants