dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #285931 from mweinelt/zigbee2mqtt-1.35.2

Browse Source 
zigbee2mqtt: 1.35.1 -> 1.35.2
This commit is contained in:
Martin Weinelt 2024-02-03 03:44:36 +01:00 committed by GitHub
commit e1ee205a99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/home-automation/zigbee2mqtt.nix
View File

@ -71,6 +71,7 @@ in
after = [ "network.target" ]; after = [ "network.target" ];
environment.ZIGBEE2MQTT_DATA = cfg.dataDir; environment.ZIGBEE2MQTT_DATA = cfg.dataDir;
serviceConfig = { serviceConfig = {
Type = "notify";
ExecStart = "${cfg.package}/bin/zigbee2mqtt"; ExecStart = "${cfg.package}/bin/zigbee2mqtt";
User = "zigbee2mqtt"; User = "zigbee2mqtt";
Group = "zigbee2mqtt"; Group = "zigbee2mqtt";

13
nixos/tests/zigbee2mqtt.nix
View File

@ -3,6 +3,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
name = "zigbee2mqtt"; name = "zigbee2mqtt";
nodes.machine = { pkgs, ... }: nodes.machine = { pkgs, ... }:
{ {
systemd.services.dummy-serial = {
wantedBy = [
"multi-user.target"
];
serviceConfig = {
ExecStart = "${pkgs.socat}/bin/socat pty,link=/dev/ttyACM0,mode=666 pty,link=/dev/ttyACM1";
};
};
services.zigbee2mqtt = { services.zigbee2mqtt = {
enable = true; enable = true;
}; };
@ -11,10 +20,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
}; };
testScript = '' testScript = ''
machine.wait_for_unit("zigbee2mqtt.service") machine.wait_for_unit("multi-user.target")
machine.wait_until_fails("systemctl status zigbee2mqtt.service") machine.wait_until_fails("systemctl status zigbee2mqtt.service")
machine.succeed( machine.succeed(
"journalctl -eu zigbee2mqtt | grep \"Error: Error while opening serialport 'Error: Error: No such file or directory, cannot open /dev/ttyACM0'\"" "journalctl -eu zigbee2mqtt | grep 'Failed to connect to the adapter'"
) )
machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service")) machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service"))

11
pkgs/servers/zigbee2mqtt/default.nix
View File

@ -2,25 +2,30 @@
, buildNpmPackage , buildNpmPackage
, fetchFromGitHub , fetchFromGitHub
, nodejs_18 , nodejs_18
, systemdMinimal
, nixosTests , nixosTests
, nix-update-script , nix-update-script
}: }:
buildNpmPackage rec { buildNpmPackage rec {
pname = "zigbee2mqtt"; pname = "zigbee2mqtt";
version = "1.35.1"; version = "1.35.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Koenkk"; owner = "Koenkk";
repo = "zigbee2mqtt"; repo = "zigbee2mqtt";
rev = version; rev = version;
hash = "sha256-ZOIV7PLBnPbisIStC+MNMZgf+Hw/+n4lONpgomRkZEE="; hash = "sha256-AesGq2pWb8e2CJxTmP7RmtNYoAsXLAWp65eUjfjBK/A=";
}; };
npmDepsHash = "sha256-2WSuc9bmt5kK477c3AMOLFguvXZ2Nl+Qb67j5k7eL3o="; npmDepsHash = "sha256-9mNUOidUmwOA+bFC8+pCerZ7JEYfQhYUM8D/WBW8IaE=";
nodejs = nodejs_18; nodejs = nodejs_18;
buildInputs = [
systemdMinimal
];
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };