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

zigbee2mqtt: 1.14.1 -> 1.14.2 #94583

Merged
merged 4 commits into from Aug 3, 2020
Merged

zigbee2mqtt: 1.14.1 -> 1.14.2 #94583

merged 4 commits into from Aug 3, 2020

Conversation

mweinelt
Copy link
Member

@mweinelt mweinelt commented Aug 3, 2020

Motivation for this change

1.14.2 adds support for https://www.tindie.com/products/slaesh/cc2652-zigbee-coordinator-or-openthread-router/.

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 sweber83 August 3, 2020 01:58
@zowoq
Copy link
Contributor

zowoq commented Aug 3, 2020 •
edited

@mweinelt I've excluded node-packages.nix from the editorconfig check. 3188a37

PR needs to be rebased on master for the check to go green.

@mweinelt
Copy link
Member Author

mweinelt commented Aug 3, 2020

Thanks, rebased.

@mweinelt
Copy link
Member Author

mweinelt commented Aug 3, 2020

The tests seem to have been skipped

  • The following builds were skipped because they don't evaluate on x86_64-linux: zigbee2mqtt.passthru.tests
  • The following builds were skipped because they don't evaluate on aarch64-linux: zigbee2mqtt.passthru.tests

Anyone has a clue why?

@zowoq
Copy link
Contributor

zowoq commented Aug 3, 2020

zigbee2mqtt doesn't seem to be listed in https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/all-tests.nix

@mweinelt
Copy link
Member Author

mweinelt commented Aug 3, 2020

Spot on.

@ofborg ofborg bot added the 6.topic: nixos label Aug 3, 2020
sweber83
sweber83 approved these changes Aug 3, 2020
View reviewed changes
Copy link
Contributor

@sweber83 sweber83 left a comment

Choose a reason for hiding this comment

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

The update script is a nice improvement 👍

pkgs/servers/zigbee2mqtt/update.sh Outdated Show resolved Hide resolved
@ofborg ofborg bot requested a review from sweber83 August 3, 2020 14:35
sweber83
sweber83 approved these changes Aug 3, 2020
View reviewed changes
Copy link
Contributor

@sweber83 sweber83 left a comment

Choose a reason for hiding this comment

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

Looks good!

@mweinelt mweinelt merged commit d1f59cf into NixOS:master Aug 3, 2020
@mweinelt mweinelt deleted the zigbee2mqtt branch August 3, 2020 15:50
@mweinelt
Copy link
Member Author

mweinelt commented Aug 3, 2020

Thanks everyone! I ordered my CC2652RB USB-Stick just today, so I can't wait to set this up!

mweinelt
mweinelt commented Aug 3, 2020
View reviewed changes
pkgs/servers/zigbee2mqtt/default.nix
@@ -1,9 +1,9 @@
{ pkgs, stdenv, system, dataDir ? "/opt/zigbee2mqtt/data" }:
{ pkgs, stdenv, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }:
Copy link
Member Author

Choose a reason for hiding this comment

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

@sweber83 Any particular reason we save state to /opt/zigbee2mqtt and not /var/lib/zigbee2mqtt?

Copy link
Contributor

Choose a reason for hiding this comment

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

The default dataDir of the package conforms with the documentation of zigbee2mqtt, for non-NixOS nix users.
The NixOS module has its own default, which is /var/lib/zigbee2mqtt.
We could change the package to also default to /var/lib/zigbee2mqtt, but I think it makes sense to use the upstream default for non-NixOS distros.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the explanation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sweber83 sweber83 sweber83 approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 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 @zowoq @sweber83