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

ympd service: Allow webPort to be int #59362

Merged
merged 1 commit into from Apr 12, 2019

Conversation

Projects
None yet
4 participants
@matthiasbeyer
Copy link
Contributor

commented Apr 12, 2019

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

I did not yet test-build my system with this change.

@matthiasbeyer matthiasbeyer requested a review from Infinisil as a code owner 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;

This comment has been minimized.

Copy link
@Infinisil

Infinisil Apr 12, 2019

Contributor

There's types.port even

This comment has been minimized.

Copy link
@matthiasbeyer

matthiasbeyer Apr 12, 2019

Author Contributor

uuuh, nice!

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";

This comment has been minimized.

Copy link
@Infinisil

Infinisil Apr 12, 2019

Contributor

And here you can just inline --webport ${toString port}

@matthiasbeyer

This comment has been minimized.

Copy link
Contributor Author

commented Apr 12, 2019

I'm ready to squash!

@@ -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

This comment has been minimized.

Copy link
@Infinisil

Infinisil Apr 12, 2019

Contributor

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.

This comment has been minimized.

Copy link
@matthiasbeyer

matthiasbeyer Apr 12, 2019

Author Contributor

馃憤

@Infinisil

This comment has been minimized.

Copy link
Contributor

commented Apr 12, 2019

Feel free to squash

ympd service: Allow webPort to be int
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

@matthiasbeyer matthiasbeyer force-pushed the matthiasbeyer:ympd-port-int branch from 9dad17f to 31884f7 Apr 12, 2019

@markuskowa markuskowa merged commit 7d363d4 into NixOS:master Apr 12, 2019

11 checks passed

grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details

@matthiasbeyer matthiasbeyer deleted the matthiasbeyer:ympd-port-int branch May 18, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can鈥檛 perform that action at this time.