commit 99eabc0ab3dab1634eadc0092fb2efad8321d9c3 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2505.section.md

···

       255
       255
        
       

     

       256
       256
        
       - `nodePackages."@commitlint/config-conventional"` has been removed, as it is a library, and projects should depend on it instead.

     

       257
       257
        
       

     

       258
       258
       +
       -  zigbee2mqtt is now available in version 2.x as `zigbee2mqtt_2`. In NixOS 25.11 we'll remove `zigbee2mqtt_1` and default to `zigbee2mqtt_2`. See the [breaking changes](https://github.com/Koenkk/zigbee2mqtt/discussions/24198) announcement for 2.0.0.

     

       259
       259
       +
       

     

       258
       260
        
       - `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead.

     

       259
       261
        
       

     

       260
       262
        
       - `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead.

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

···

       125
       125
        
               SystemCallFilter = [

     

       126
       126
        
                 "@system-service @pkey"

     

       127
       127
        
                 "~@privileged @resources"

     

       128
       128
       +
                 "@chown"

     

       128
       129
        
               ];

     

       129
       130
        
               UMask = "0077";

     

       130
       131
        
             };

+8 -1

nixos/tests/all-tests.nix

···

       1218
       1218
        
         zenohd = handleTest ./zenohd.nix {};

     

       1219
       1219
        
         zeronet-conservancy = handleTest ./zeronet-conservancy.nix {};

     

       1220
       1220
        
         zfs = handleTest ./zfs.nix {};

     

       1221
       1221
       -
         zigbee2mqtt = handleTest ./zigbee2mqtt.nix {};

     

       1221
       1221
       +
         zigbee2mqtt_1 = runTest {

     

       1222
       1222
       +
           imports = [ ./zigbee2mqtt.nix ];

     

       1223
       1223
       +
           _module.args.package = pkgs.zigbee2mqtt_1;

     

       1224
       1224
       +
         };

     

       1225
       1225
       +
         zigbee2mqtt_2 = runTest {

     

       1226
       1226
       +
           imports = [ ./zigbee2mqtt.nix ];

     

       1227
       1227
       +
           _module.args.package = pkgs.zigbee2mqtt_2;

     

       1228
       1228
       +
         };

     

       1222
       1229
        
         zipline = handleTest ./zipline.nix {};

     

       1223
       1230
        
         zoneminder = handleTest ./zoneminder.nix {};

     

       1224
       1231
        
         zookeeper = handleTest ./zookeeper.nix {};

+40 -30

nixos/tests/zigbee2mqtt.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "zigbee2mqtt";

     

       5
       5
       -
           nodes.machine =

     

       6
       6
       -
             { pkgs, ... }:

     

       7
       7
       -
             {

     

       8
       8
       -
               systemd.services.dummy-serial = {

     

       9
       9
       -
                 wantedBy = [

     

       10
       10
       -
                   "multi-user.target"

     

       11
       11
       -
                 ];

     

       12
       12
       -
                 serviceConfig = {

     

       13
       13
       -
                   ExecStart = "${pkgs.socat}/bin/socat pty,link=/dev/ttyACM0,mode=666 pty,link=/dev/ttyACM1";

     

       14
       14
       -
                 };

     

       15
       15
       -
               };

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         package,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       16
       7
        
       

     

       17
       17
       -
               services.zigbee2mqtt = {

     

       18
       18
       -
                 enable = true;

     

       19
       19
       -
               };

     

       20
       20
       -
       

     

       21
       21
       -
               systemd.services.zigbee2mqtt.serviceConfig.DevicePolicy = lib.mkForce "auto";

     

       8
       8
       +
       let

     

       9
       9
       +
         error =

     

       10
       10
       +
           if lib.versionOlder package.version "2" then

     

       11
       11
       +
             "Inappropriate ioctl for device, cannot set"

     

       12
       12
       +
           else

     

       13
       13
       +
             "No valid USB adapter found";

     

       14
       14
       +
       in

     

       15
       15
       +
       {

     

       16
       16
       +
         name = "zigbee2mqtt-${lib.versions.major package.version}.x";

     

       17
       17
       +
         nodes.machine = {

     

       18
       18
       +
           systemd.services.dummy-serial = {

     

       19
       19
       +
             wantedBy = [

     

       20
       20
       +
               "multi-user.target"

     

       21
       21
       +
             ];

     

       22
       22
       +
             serviceConfig = {

     

       23
       23
       +
               ExecStart = "${pkgs.socat}/bin/socat pty,link=/dev/ttyACM0,mode=666 pty,link=/dev/ttyACM1";

     

       22
       24
        
             };

     

       25
       25
       +
           };

     

       23
       26
        
       

     

       24
       24
       -
           testScript = ''

     

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

     

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

     

       27
       27
       -
             machine.succeed(

     

       28
       28
       -
                 "journalctl -eu zigbee2mqtt | grep 'Error: Inappropriate ioctl for device, cannot set'"

     

       29
       29
       -
             )

     

       27
       27
       +
           services.zigbee2mqtt = {

     

       28
       28
       +
             enable = true;

     

       29
       29
       +
             inherit package;

     

       30
       30
       +
           };

     

       31
       31
       +
       

     

       32
       32
       +
           systemd.services.zigbee2mqtt.serviceConfig.DevicePolicy = lib.mkForce "auto";

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         testScript = ''

     

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

     

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

     

       38
       38
       +
           machine.succeed(

     

       39
       39
       +
               "journalctl -eu zigbee2mqtt | grep '${error}'"

     

       40
       40
       +
           )

     

       30
       41
        
       

     

       31
       31
       -
             machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service"))

     

       32
       32
       -
           '';

     

       33
       33
       -
         }

     

       34
       34
       -
       )

     

       42
       42
       +
           machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service"))

     

       43
       43
       +
         '';

     

       44
       44
       +
       }

+1 -1

pkgs/by-name/zi/zigbee2mqtt_1/package.nix

···

       28
       28
        
       

     

       29
       29
        
         npmFlags = lib.optionals (!withSystemd) [ "--omit=optional" ];

     

       30
       30
        
       

     

       31
       31
       -
         passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

     

       31
       31
       +
         passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt_1;

     

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

     

       33
       33
        
       

     

       34
       34
        
         meta = with lib; {

+73

pkgs/by-name/zi/zigbee2mqtt_2/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         nodejs,

     

       6
       6
       +
         npmHooks,

     

       7
       7
       +
         pnpm_9,

     

       8
       8
       +
         systemdMinimal,

     

       9
       9
       +
         nixosTests,

     

       10
       10
       +
         nix-update-script,

     

       11
       11
       +
         withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal,

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       let

     

       15
       15
       +
         pnpm = pnpm_9;

     

       16
       16
       +
       in

     

       17
       17
       +
       stdenv.mkDerivation (finalAttrs: {

     

       18
       18
       +
         pname = "zigbee2mqtt";

     

       19
       19
       +
         version = "2.1.1";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "Koenkk";

     

       23
       23
       +
           repo = "zigbee2mqtt";

     

       24
       24
       +
           tag = finalAttrs.version;

     

       25
       25
       +
           hash = "sha256-YVsQ4Zo0nlIb9m4wiK7xcqB7eE/h2ZvTTqEYLDagoHM=";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         pnpmDeps = pnpm.fetchDeps {

     

       29
       29
       +
           inherit (finalAttrs) pname version src;

     

       30
       30
       +
           hash = "sha256-Wr7FngKfedUrtOLpaTxvAdJZfCXo1/+oLMIJMOCgafk=";

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         nativeBuildInputs = [

     

       34
       34
       +
           nodejs

     

       35
       35
       +
           npmHooks.npmInstallHook

     

       36
       36
       +
           pnpm.configHook

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         buildInputs = lib.optionals withSystemd [

     

       40
       40
       +
           systemdMinimal

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         buildPhase = ''

     

       44
       44
       +
           runHook preBuild

     

       45
       45
       +
       

     

       46
       46
       +
           pnpm run build

     

       47
       47
       +
       

     

       48
       48
       +
           runHook postBuild

     

       49
       49
       +
         '';

     

       50
       50
       +
       

     

       51
       51
       +
         dontNpmPrune = true;

     

       52
       52
       +
       

     

       53
       53
       +
         passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt_2;

     

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

     

       55
       55
       +
       

     

       56
       56
       +
         meta = with lib; {

     

       57
       57
       +
           changelog = "https://github.com/Koenkk/zigbee2mqtt/releases/tag/${finalAttrs.version}";

     

       58
       58
       +
           description = "Zigbee to MQTT bridge using zigbee-shepherd";

     

       59
       59
       +
           homepage = "https://github.com/Koenkk/zigbee2mqtt";

     

       60
       60
       +
           license = licenses.gpl3;

     

       61
       61
       +
           longDescription = ''

     

       62
       62
       +
             Allows you to use your Zigbee devices without the vendor's bridge or gateway.

     

       63
       63
       +
       

     

       64
       64
       +
             It bridges events and allows you to control your Zigbee devices via MQTT.

     

       65
       65
       +
             In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using.

     

       66
       66
       +
           '';

     

       67
       67
       +
           maintainers = with maintainers; [

     

       68
       68
       +
             sweber

     

       69
       69
       +
             hexa

     

       70
       70
       +
           ];

     

       71
       71
       +
           mainProgram = "zigbee2mqtt";

     

       72
       72
       +
         };

     

       73
       73
       +
       })