Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

2 files changed, 3 insertions, 55 deletions

diff --git a/nixpkgs/pkgs/servers/home-assistant/patches/ffmpeg-path.patch b/nixpkgs/pkgs/servers/home-assistant/patches/ffmpeg-path.patch
index a72674ff7a5f..a4177a35f484 100644
--- a/nixpkgs/pkgs/servers/home-assistant/patches/ffmpeg-path.patch
+++ b/nixpkgs/pkgs/servers/home-assistant/patches/ffmpeg-path.patch
@@ -1,8 +1,8 @@
 diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py
-index 74c826f47d..91f359da2a 100644
+index a98766c78c..1c47bb1f80 100644
 --- a/homeassistant/components/ffmpeg/__init__.py
 +++ b/homeassistant/components/ffmpeg/__init__.py
-@@ -40,7 +40,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin"
+@@ -41,7 +41,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin"
  CONF_EXTRA_ARGUMENTS = "extra_arguments"
  CONF_OUTPUT = "output"
  
@@ -12,7 +12,7 @@ index 74c826f47d..91f359da2a 100644
  CONFIG_SCHEMA = vol.Schema(
      {
 diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py
-index e1730ffdab..e9cd7934fd 100644
+index 521ac732e5..ab8a56934f 100644
 --- a/tests/components/ffmpeg/test_init.py
 +++ b/tests/components/ffmpeg/test_init.py
 @@ -87,7 +87,7 @@ class TestFFmpegSetup:
diff --git a/nixpkgs/pkgs/servers/home-assistant/patches/wilight-import.patch b/nixpkgs/pkgs/servers/home-assistant/patches/wilight-import.patch
deleted file mode 100644
index 2d6626b97438..000000000000
--- a/nixpkgs/pkgs/servers/home-assistant/patches/wilight-import.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/homeassistant/components/wilight/__init__.py b/homeassistant/components/wilight/__init__.py
-index 2cdcf20c1e..37b034c9ae 100644
---- a/homeassistant/components/wilight/__init__.py
-+++ b/homeassistant/components/wilight/__init__.py
-@@ -2,7 +2,7 @@
- 
- from typing import Any
- 
--from pywilight.wilight_device import Device as PyWiLightDevice
-+from pywilight.wilight_device import PyWiLightDevice
- 
- from homeassistant.config_entries import ConfigEntry
- from homeassistant.const import Platform
-diff --git a/homeassistant/components/wilight/fan.py b/homeassistant/components/wilight/fan.py
-index c598e6db39..3d0c6d0ff3 100644
---- a/homeassistant/components/wilight/fan.py
-+++ b/homeassistant/components/wilight/fan.py
-@@ -13,7 +13,7 @@ from pywilight.const import (
-     WL_SPEED_LOW,
-     WL_SPEED_MEDIUM,
- )
--from pywilight.wilight_device import Device as PyWiLightDevice
-+from pywilight.wilight_device import PyWiLightDevice
- 
- from homeassistant.components.fan import DIRECTION_FORWARD, FanEntity, FanEntityFeature
- from homeassistant.config_entries import ConfigEntry
-diff --git a/homeassistant/components/wilight/light.py b/homeassistant/components/wilight/light.py
-index ea9e19dcb3..2509dc5073 100644
---- a/homeassistant/components/wilight/light.py
-+++ b/homeassistant/components/wilight/light.py
-@@ -4,7 +4,7 @@ from __future__ import annotations
- from typing import Any
- 
- from pywilight.const import ITEM_LIGHT, LIGHT_COLOR, LIGHT_DIMMER, LIGHT_ON_OFF
--from pywilight.wilight_device import Device as PyWiLightDevice
-+from pywilight.wilight_device import PyWiLightDevice
- 
- from homeassistant.components.light import (
-     ATTR_BRIGHTNESS,
-diff --git a/homeassistant/components/wilight/parent_device.py b/homeassistant/components/wilight/parent_device.py
-index 17a33fef63..8091e78cc7 100644
---- a/homeassistant/components/wilight/parent_device.py
-+++ b/homeassistant/components/wilight/parent_device.py
-@@ -5,7 +5,7 @@ import asyncio
- import logging
- 
- import pywilight
--from pywilight.wilight_device import Device as PyWiLightDevice
-+from pywilight.wilight_device import PyWiLightDevice
- import requests
- 
- from homeassistant.config_entries import ConfigEntry