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.

Sign up for GitHub

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

jellyfin: remove assertion if emby enabled: no emby module exists #61080

Merged
merged 1 commit into from May 7, 2019
Merged

jellyfin: remove assertion if emby enabled: no emby module exists #61080

merged 1 commit into from May 7, 2019

Conversation

DIzFer
Copy link
Contributor

@DIzFer DIzFer commented May 7, 2019

Motivation for this change

Jellyfin replaced the emby module, however the used PR expected the emby module to exist, and therefore had an assertion when !config.services.emby.enable, which prevents NixOS from rebuilding because there's no emby attribute in config.services.

This commit removes such assertion, allowing jellyfin to be used again.

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.

@DIzFer
Copy link
Contributor Author

DIzFer commented May 7, 2019

If I'm running the tests correctly, the jellyfin test didn't run before this commit:

nix-build --no-out-link '<nixpkgs/nixos/tests/jellyfin.nix>'                                                                                  
error: attribute 'emby' missing, at /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/services/misc/jellyfin.nix:53:22
(use '--show-trace' to show detailed location information)```

Wheras now, it doesn't report explicit success, but it appears to run successfully.

@etu etu merged commit 0269936 into NixOS:master May 7, 2019
@etu
Copy link
Contributor

etu commented May 7, 2019

@DIzFer Thanks!

@DIzFer DIzFer deleted the jellyfin-remove-emby-ref branch May 8, 2019 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@DIzFer @etu