diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-07 18:14:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 18:14:53 +0000 |
| commit | 6e4d5726025ecda5a10dbf3f6db4300316f95a49 (patch) | |
| tree | 9446172081c1aa3243c3bcf12f42198032ddbe4d /pkgs/servers | |
| parent | 1d48804dab8a67e1891d7cb1f0517f52e62d270b (diff) | |
| parent | d1183f3dc44b9ee5134fcbcd45555c48aa678e93 (diff) | |
| download | nixpkgs-6e4d5726025ecda5a10dbf3f6db4300316f95a49.tar nixpkgs-6e4d5726025ecda5a10dbf3f6db4300316f95a49.tar.gz nixpkgs-6e4d5726025ecda5a10dbf3f6db4300316f95a49.tar.bz2 nixpkgs-6e4d5726025ecda5a10dbf3f6db4300316f95a49.tar.lz nixpkgs-6e4d5726025ecda5a10dbf3f6db4300316f95a49.tar.xz nixpkgs-6e4d5726025ecda5a10dbf3f6db4300316f95a49.tar.zst nixpkgs-6e4d5726025ecda5a10dbf3f6db4300316f95a49.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/home-assistant/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/zigbee2mqtt/default.nix | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2ae7a6c33fa..43e332964cf 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -189,6 +189,7 @@ in with py.pkgs; buildPythonApplication rec { "caldav" "calendar" "camera" + "cast" "climate" "cloud" "command_line" diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 85465fd7d14..2a7c31a47a0 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -3,6 +3,8 @@ let package = (import ./node.nix { inherit pkgs system; }).package; in package.override rec { + # don't upgrade! Newer versions cause stack overflows and fail trunk-combined + # see https://github.com/NixOS/nixpkgs/pull/118400 version = "1.16.2"; reconstructLock = true; |