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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d284f3
zigbee2mqtt: upgrade deps.sh to update.sh
mweinelt Aug 3, 2020
98c2bd1
zigbee2mqtt: 1.14.1 -> 1.14.2
mweinelt Aug 3, 2020
87b8364
zigbee2mqtt: add passthru test
mweinelt Aug 3, 2020
b41b902
nixos/zigbee2mqtt: add test to all-tests.nix
mweinelt Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ in
yabar = handleTest ./yabar.nix {};
yggdrasil = handleTest ./yggdrasil.nix {};
zfs = handleTest ./zfs.nix {};
zigbee2mqtt = handleTest ./zigbee2mqtt.nix {};
zoneminder = handleTest ./zoneminder.nix {};
zookeeper = handleTest ./zookeeper.nix {};
zsh-history = handleTest ./zsh-history.nix {};
Expand Down
8 changes: 5 additions & 3 deletions pkgs/servers/zigbee2mqtt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

let
package = (import ./node.nix { inherit pkgs system; }).package;
in
package.override rec {
version = "1.14.1";
version = "1.14.2";
reconstructLock = true;

postInstall = ''
Expand All @@ -20,9 +20,11 @@ package.override rec {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
sha256 = "1g1j634474m6arr3qyvf2bzmjh4qs02rhnfh0dlm8qz8rh3xj2rk";
sha256 = "0yv51rds28az5pqzgkprhrzwmky29l1mvqb73l7dbs8qlx8x1x52";
};

passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

meta = with pkgs.stdenv.lib; {
description = "Zigbee to MQTT bridge using zigbee-shepherd";
license = licenses.gpl3;
Expand Down
15 changes: 0 additions & 15 deletions pkgs/servers/zigbee2mqtt/deps.sh
View file
Open in desktop

This file was deleted.