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

Jump to bottom

nixos/snapserver: update module to work with snapcast 0.20 #94071

Merged
merged 2 commits into from Aug 2, 2020
Merged

nixos/snapserver: update module to work with snapcast 0.20 #94071

merged 2 commits into from Aug 2, 2020

Conversation

mweinelt
Copy link
Member

Motivation for this change

With the update of snapcast from 0.15 to 0.20 in #90294 I inadvertently broke the module, since the CLI parameters changed quite a bit.

This should rectify and even improve the situation.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mweinelt mweinelt requested a review from tobim July 28, 2020 11:43
@mweinelt mweinelt marked this pull request as draft July 28, 2020 12:18
@mweinelt mweinelt marked this pull request as ready for review July 28, 2020 12:48
@mweinelt
Copy link
Member Author

mweinelt commented Jul 28, 2020 •
edited

For some reason I'm always gettingthe renamed trace, even though I'm not using the controlPort variable any more. This is also visible in the tests.

trace: Obsolete option `services.snapserver.controlPort' is used. It was renamed to `services.snapserver.tcp.port'.

@tobim
Copy link
Contributor

tobim commented Jul 28, 2020

I'll try to squeeze a review in later today.

@mweinelt
Copy link
Member Author

@tobim I also believe we need to add a static group for snapcast, since we need to allow other users like mpd to write to the pipe at /run/snapserver/mpd.

tobim
tobim suggested changes Aug 2, 2020
View reviewed changes
Copy link
Contributor

@tobim tobim left a comment

Choose a reason for hiding this comment

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

I also believe we need to add a static group for snapcast, since we need to allow other users like mpd to write to the pipe at /run/snapserver/mpd.

The server always creates the pipe with write access for all:
https://github.com/badaix/snapcast/blob/d44f3be4edee76494cecb1c28caf46969f3ba15c/server/streamreader/pipe_stream.cpp#L50

If we need access control for that it should be implemented upsteam.

nixos/modules/services/audio/snapserver.nix

in {
imports = [
(mkRenamedOptionModule [ "services" "snapserver" "controlPort"] [ "services" "snapserver" "tcp" "port" ])
Copy link
Contributor

Choose a reason for hiding this comment

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

Adjust line 282 to fix the deprecation warning.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed. Good catch.

@mweinelt
Copy link
Member Author

mweinelt commented Aug 2, 2020

Indeed, thanks for the pointer to the snapcast source code.

@mweinelt
Copy link
Member Author

mweinelt commented Aug 2, 2020

@GrahamcOfBorg test snapcast

@mweinelt
nixos/tests: add snapcast
0a9dd49 
Checks
- if all configured ports are listened on
- if all pipes for multiple streams get set up
- if rpc interaction is possible
tobim
tobim approved these changes Aug 2, 2020
View reviewed changes
Copy link
Contributor

@tobim tobim left a comment

Choose a reason for hiding this comment

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

Tested locally, works with mpd.

@mweinelt mweinelt merged commit bd9ea65 into NixOS:master Aug 2, 2020
@mweinelt
Copy link
Member Author

mweinelt commented Aug 2, 2020

Thanks for reviewing this!

@mweinelt mweinelt deleted the snapserver branch August 2, 2020 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tobim tobim tobim approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mweinelt @tobim @andir