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

unifi, nixos/unifi: support LTS (5.6.36) and release (5.7.20) #37799

Merged
merged 1 commit into from Apr 27, 2018

Conversation

badmutex
Copy link
Contributor

Motivation for this change

Ubiquiti has both a LTS and current version of their Unifi controller software.

The latter adds new features, but may drop support for some devices.

This adds the capability to use either for the unifi module but defaults to the LTS version, which was the previous behavior.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@badmutex badmutex changed the title unifi, nixos/unifi: support LTS (5.6.36,) and release (5.7.20) unifi, nixos/unifi: support LTS (5.6.36) and release (5.7.20) Mar 25, 2018
@badmutex
Copy link
Contributor Author

Related to #36612

'';
};

services.unifi.unifi = mkOption {
Copy link
Member

Choose a reason for hiding this comment

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

I'd prefer this being called package


services.unifi.unifi = mkOption {
type = types.package;
default = pkgs.unifiLTS;
Copy link
Member

Choose a reason for hiding this comment

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

You need to add defaultText = "pkgs.unifiLTS"; to make sure that the manual does not depend on unifiLTS (which is the error in the PR CI status), same for the other package options.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for pointing that out! I did not know about defaultText.

Ubiquiti has both a LTS and current version of their Unifi controller software.

The latter adds new features, but may drop support for some devices.

This adds the capability to use either for the unifi module but defaults
to the LTS version, which was the previous behavior.
@badmutex
Copy link
Contributor Author

Mind taking another look?

@xeji xeji mentioned this pull request Apr 27, 2018
8 tasks
@globin globin merged commit df3566c into NixOS:master Apr 27, 2018
@badmutex badmutex deleted the unifi branch April 29, 2018 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants