ympd service: Allow webPort to be int #59362
Merged
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
infinisil
requested changes
Apr 12, 2019
| @@ -15,7 +15,7 @@ in { | |||
| enable = mkEnableOption "ympd, the MPD Web GUI"; | |||
|
|
|||
| webPort = mkOption { | |||
| type = types.string; | |||
| type = types.either types.string types.int; | |||
| serviceConfig.ExecStart = let | ||
| port = builtins.toString cfg.webPort; | ||
| in | ||
| "${pkgs.ympd}/bin/ympd --host ${cfg.mpd.host} --port ${toString cfg.mpd.port} --webport ${port} --user nobody"; |
There was a problem hiding this comment.
And here you can just inline --webport ${toString port}
|
I'm ready to squash! |
infinisil
reviewed
Apr 12, 2019
| @@ -15,7 +15,7 @@ in { | |||
| enable = mkEnableOption "ympd, the MPD Web GUI"; | |||
|
|
|||
| webPort = mkOption { | |||
| type = types.string; | |||
| type = types.either types.string types.port; # string for backwards compat | |||
There was a problem hiding this comment.
Oh actually one more thing, while you're changing this part of the code, you can also switch to types.str, as types.string is deprecated.
|
Feel free to squash |
infinisil
approved these changes
Apr 12, 2019
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
matthiasbeyer
force-pushed
the
ympd-port-int
branch
from
9dad17f
to
31884f7
Compare
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.
Motivation for this change
I am lazy and don't want to type
". 馃槃I don't see a reason why this should not be allowed to be int.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)I did not yet test-build my system with this change.