Unverified Commit e1ee205a authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #285931 from mweinelt/zigbee2mqtt-1.35.2 

zigbee2mqtt: 1.35.1 -> 1.35.2
parents 79a13f14 dec6392b

nixos/modules/services/home-automation/zigbee2mqtt.nix

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ in 
      after = [ "network.target" ];

      environment.ZIGBEE2MQTT_DATA = cfg.dataDir;

      serviceConfig = {

        Type = "notify";

        ExecStart = "${cfg.package}/bin/zigbee2mqtt";

        User = "zigbee2mqtt";

        Group = "zigbee2mqtt";

nixos/tests/zigbee2mqtt.nix

+11 −2
Original line number Diff line number Diff line
@@ -3,6 +3,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: 
    name = "zigbee2mqtt";

    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 = {

          enable = true;

        };
@@ -11,10 +20,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: 
      };



    testScript = ''

      machine.wait_for_unit("zigbee2mqtt.service")

      machine.wait_for_unit("multi-user.target")

      machine.wait_until_fails("systemctl status zigbee2mqtt.service")

      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"))

pkgs/servers/zigbee2mqtt/default.nix

+8 −3
Original line number Diff line number Diff line
@@ -2,25 +2,30 @@ 
, buildNpmPackage

, fetchFromGitHub

, nodejs_18

, systemdMinimal

, nixosTests

, nix-update-script

}:



buildNpmPackage rec {

  pname = "zigbee2mqtt";

  version = "1.35.1";

  version = "1.35.2";



  src = fetchFromGitHub {

    owner = "Koenkk";

    repo = "zigbee2mqtt";

    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;



  buildInputs = [

    systemdMinimal

  ];



  passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

  passthru.updateScript = nix-update-script { };