Merge pull request #105973 from zaninime/zigbee2mqtt

zigbee2mqtt: 1.16.1 -> 1.16.2

nixos/modules/services/misc/zigbee2mqtt.nix

@@ -70,6 +70,7 @@ in
       description = "Zigbee2mqtt Service";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
+      environment.ZIGBEE2MQTT_DATA = cfg.dataDir;
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/zigbee2mqtt";
         User = "zigbee2mqtt";

pkgs/servers/zigbee2mqtt/default.nix

@@ -3,24 +3,14 @@ let
   package = (import ./node.nix { inherit pkgs system; }).package;
 in
 package.override rec {
-  version = "1.16.1";
+  version = "1.16.2";
   reconstructLock = true;
 
-  postInstall = ''
-    sed -i '1s;^;#!/usr/bin/env node\n;' $out/lib/node_modules/zigbee2mqtt/index.js
-    chmod +x $out/lib/node_modules/zigbee2mqtt/index.js
-    mkdir $out/bin
-    ln -s $out/lib/node_modules/zigbee2mqtt/index.js $out/bin/zigbee2mqtt
-
-    rm -rf $out/lib/node_modules/zigbee2mqtt/data
-    ln -s ${dataDir} $out/lib/node_modules/zigbee2mqtt/data
-  '';
-
   src = pkgs.fetchFromGitHub {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
     rev = version;
-    sha256 = "16pizkiic7m8w9q56lgzdpy3hpvnw7fwrkkmldg57wpmqmq1r3dj";
+    sha256 = "0rpmm4pwm8s4i9fl26ql0czg5kijv42k9wwik7jb3ppi5jzxrakd";
   };
 
   passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

pkgs/servers/zigbee2mqtt/update.sh

@@ -10,8 +10,8 @@ if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then
     exit 0
 fi
 
-wget $ZIGBEE2MQTT/package.json
-wget $ZIGBEE2MQTT/npm-shrinkwrap.json
+curl -LO $ZIGBEE2MQTT/package.json
+curl -LO $ZIGBEE2MQTT/npm-shrinkwrap.json
 
 node2nix --nodejs-12 \
   -l npm-shrinkwrap.json \