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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib.modules.doRename: Add condition parameter #285612

Merged
merged 1 commit into from
Feb 5, 2024

Conversation

roberth
Copy link
Member

@roberth roberth commented Feb 1, 2024

Description of changes

This is to support single-to-multi service migrations, so that the to (e.g. foos."") isn't defined unconditionally. See test cases.

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@roberth roberth added 0.kind: enhancement 6.topic: module system About "NixOS" module system internals labels Feb 1, 2024
@github-actions github-actions bot added the 6.topic: lib The Nixpkgs function library label Feb 1, 2024
This is to support single-to-multi service migrations, so that the
`to` (e.g. `foos.""`) isn't defined unconditionally. See test cases.
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

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

Overall looking good!

@@ -1256,7 +1256,7 @@ let
(opt.highestPrio or defaultOverridePriority)
(f opt.value);

doRename = { from, to, visible, warn, use, withPriority ? true }:
doRename = { from, to, visible, warn, use, withPriority ? true, condition ? true }:
Copy link
Member

Choose a reason for hiding this comment

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

We don't have any docs for this function, but at least an inline comment here would be good

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks! Here's the follow-up:

roberth added a commit to hercules-ci/nixpkgs that referenced this pull request Feb 5, 2024
I don't think these are rendered yet, but this at least provides
the content.

Follow-up to NixOS#285612
@roberth roberth merged commit 5d7125e into NixOS:master Feb 5, 2024
23 checks passed
roberth added a commit to hercules-ci/nixpkgs that referenced this pull request Feb 5, 2024
I don't think these are rendered yet, but this at least provides
the content.

Follow-up to NixOS#285612
@roberth roberth added the backport release-23.11 Backport PR automatically label Feb 5, 2024
Copy link
Contributor

github-actions bot commented Feb 5, 2024

Successfully created backport PR for release-23.11:

roberth added a commit to hercules-ci/nixpkgs that referenced this pull request Feb 14, 2024
I don't think these are rendered yet, but this at least provides
the content.

Follow-up to NixOS#285612
github-actions bot pushed a commit to nix-community/nixpkgs.lib that referenced this pull request Feb 25, 2024
I don't think these are rendered yet, but this at least provides
the content.

Follow-up to NixOS/nixpkgs#285612
sarahec pushed a commit to sarahec/nixpkgs that referenced this pull request Feb 25, 2024
I don't think these are rendered yet, but this at least provides
the content.

Follow-up to NixOS#285612
github-actions bot pushed a commit to arcnmx/nixpkgs-lib that referenced this pull request Mar 10, 2024
I don't think these are rendered yet, but this at least provides
the content.

Follow-up to NixOS/nixpkgs#285612
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants