nixos/networkd: allow strings for addresses
#342307
Open
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
The difference between `address` and `addresses` is that the former adds
an `Address` key into the `[Network]` section whereas the latter creates
its own `[Address]` section. However, these are effectively equivalent
as far as systemd-networkd is concerned (from `systemd.network(5)`):
This is a short-hand for an [Address] section only containing an
Address key (see below).
I think it's pretty awkward that you have to remember which one to use.
This patch alters the type of `addresses` to allow both
`[Address]`-config encoded as Nix attribute-set and strings that will be
rendered to
[Address]
Address=...
As a result, the `address` option is obsolete, so I decided to deprecate
it.
github-actions
bot
added
6.topic: nixos
Ma27
commented
Sep 16, 2024
| @@ -2470,6 +2470,7 @@ let | |||
| address = mkOption { | |||
| default = [ ]; | |||
| type = types.listOf types.str; | |||
| apply = warn "`systemd.network.networks.\"${name}\".address` is deprecated, use `systemd.network.networks.\"${name}\".addresses` instead."; | |||
There was a problem hiding this comment.
Went this route since mkRenamedOptionModule seems broken for submodules: #96006
ofborg
bot
added
10.rebuild-darwin: 0
|
This still requires fixups of the existing usages, but I'd still like to get some feedback on that. |
|
Yes, I think |
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.
Description of changes
addressyet. First I'd like to discuss ifaddressor deprecate it.The difference between
addressandaddressesis that the former adds anAddresskey into the[Network]section whereas the latter creates its own[Address]section. However, these are effectively equivalent as far as systemd-networkd is concerned (fromsystemd.network(5)):I think it's pretty awkward that you have to remember which one to use.
This patch alters the type of
addressesto allow both[Address]-config encoded as Nix attribute-set and strings that will be rendered toAs a result, the
addressoption is obsolete, so I decided to deprecate it.cc @NixOS/systemd @mweinelt
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.