Merge master into staging-next

Changed files
+282 -187
maintainers
nixos
lib
modules
services
home-automation
pkgs
applications
networking
instant-messengers
signalbackup-tools
by-name
nu
numbat
development
python-modules
aioairzone-cloud
aiocomelit
aiohomekit
aiounifi
aiovodafone
bleak-retry-connector
blinkpy
google-nest-sdm
hass-nabucasa
icalendar
mastodon-py
matrix-nio
nitime
pyatv
python-opensky
recurring-ical-events
x-wr-timezone
zeroconf
zha-quirks
zigpy
tools
glamoroustoolkit
pscale
servers
shells
fish
tools
audio
misc
esphome
networking
gobgp
virtualization
+6
maintainers/maintainer-list.nix
···
githubId = 1713676;
name = "Luis G. Torres";
};
+
giomf = {
+
email = "giomf@mailbox.org";
+
github = "giomf";
+
githubId = 35076723;
+
name = "Guillaume Fournier";
+
};
giorgiga = {
email = "giorgio.gallo@bitnic.it";
github = "giorgiga";
+4 -1
nixos/lib/systemd-lib.nix
···
pkgs.runCommand "unit-${mkPathSafeName name}"
{ preferLocalBuild = true;
allowSubstitutes = false;
-
inherit (unit) text;
+
# unit.text can be null. But variables that are null listed in
+
# passAsFile are ignored by nix, resulting in no file being created,
+
# making the mv operation fail.
+
text = optionalString (unit.text != null) unit.text;
passAsFile = [ "text" ];
}
''
+1
nixos/modules/services/home-automation/home-assistant.nix
···
"govee_ble"
"homekit_controller"
"inkbird"
+
"improv_ble"
"keymitt_ble"
"led_ble"
"medcom_ble"
+2 -2
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
···
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
-
version = "20231015";
+
version = "20231030-1";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
-
hash = "sha256-P3IbCWzc7V2yX8qZIPUncJXFFq9iFl7csDj2tiTZ7AY=";
+
hash = "sha256-xY5UpM1vYAL2hZUkh5O4Z6zJ5HVxXTtvDlXedlsU820=";
};
postPatch = ''
+37
pkgs/by-name/nu/numbat/package.nix
···
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, rustPlatform
+
, darwin
+
}:
+
+
rustPlatform.buildRustPackage rec {
+
pname = "numbat";
+
version = "1.6.3";
+
+
src = fetchFromGitHub {
+
owner = "sharkdp";
+
repo = "numbat";
+
rev = "v${version}";
+
hash = "sha256-r6uPe2NL+6r/fKjf0C/5DLdB5YP3SIo8g8EsDxKP/3g=";
+
};
+
+
cargoHash = "sha256-MPqJjCfIwgK8QigWQYfWAYlg9RNMzF4x+0SprS0raKY=";
+
+
buildInputs = lib.optionals stdenv.isDarwin [
+
darwin.apple_sdk.frameworks.Security
+
];
+
+
meta = with lib; {
+
description = "High precision scientific calculator with full support for physical units";
+
longDescription = ''
+
A statically typed programming language for scientific computations
+
with first class support for physical dimensions and units
+
'';
+
homepage = "https://numbat.dev";
+
changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}";
+
license = with licenses; [ asl20 mit ];
+
mainProgram = "numbat";
+
maintainers = with maintainers; [ giomf ];
+
};
+
}
+3 -5
pkgs/development/python-modules/aioairzone-cloud/default.nix
···
, fetchFromGitHub
, pythonOlder
, setuptools
-
, wheel
}:
buildPythonPackage rec {
pname = "aioairzone-cloud";
-
version = "0.3.0";
-
format = "pyproject";
+
version = "0.3.1";
+
pyproject = true;
disabled = pythonOlder "3.7";
···
owner = "Noltari";
repo = "aioairzone-cloud";
rev = "refs/tags/${version}";
-
hash = "sha256-tsx98DG/TvTrVwUy9fscErf+3zUC5XVs50lHKW/9pdQ=";
+
hash = "sha256-PWdyyzdPXDOfZgyLasT9TW+g+So2wOkcf9Fy77Oydl4=";
};
nativeBuildInputs = [
setuptools
-
wheel
];
propagatedBuildInputs = [
+4 -2
pkgs/development/python-modules/aiocomelit/default.nix
···
, aiohttp
, buildPythonPackage
, fetchFromGitHub
+
, pint
, poetry-core
, pytestCheckHook
, pythonOlder
···
buildPythonPackage rec {
pname = "aiocomelit";
-
version = "0.0.9";
+
version = "0.3.0";
format = "pyproject";
disabled = pythonOlder "3.10";
···
owner = "chemelli74";
repo = "aiocomelit";
rev = "refs/tags/v${version}";
-
hash = "sha256-xVSxXiHSyUa31X+eOK5ZXH/+Uwm8lfStY0nZ2mKWFpI=";
+
hash = "sha256-o8i1H4MsK21kJVbLD22PAUqj5Q9k31JfdZQYARPQICc=";
};
postPatch = ''
···
propagatedBuildInputs = [
aiohttp
+
pint
];
nativeCheckInputs = [
+2 -2
pkgs/development/python-modules/aiohomekit/default.nix
···
buildPythonPackage rec {
pname = "aiohomekit";
-
version = "3.0.6";
+
version = "3.0.9";
format = "pyproject";
disabled = pythonOlder "3.9";
···
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
-
hash = "sha256-e7KSgUOEA3iAR4QdUhjYcHsPdtCJRxu6u+uxuDMaghQ=";
+
hash = "sha256-YaLSpWSaiEP7X+IujrQgXgWl3aPc1WDMq2yaMUTu328=";
};
nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/aiounifi/default.nix
···
buildPythonPackage rec {
pname = "aiounifi";
-
version = "63";
+
version = "64";
format = "pyproject";
disabled = pythonOlder "3.11";
···
owner = "Kane610";
repo = pname;
rev = "refs/tags/v${version}";
-
hash = "sha256-am11pFgYMRccUNaK/iKdp6mfk5NQ4QnU41xbFiGCMPs=";
+
hash = "sha256-A6IfUUaXv/Dm8yncgC0SFBrabCFx0Y24pOul0bqxBLc=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/aiovodafone/default.nix
···
buildPythonPackage rec {
pname = "aiovodafone";
-
version = "0.3.1";
+
version = "0.4.2";
format = "pyproject";
disabled = pythonOlder "3.10";
···
owner = "chemelli74";
repo = "aiovodafone";
rev = "refs/tags/v${version}";
-
hash = "sha256-Zitssjoe88T7gphfAQXyv2el7jbMLKTnr1GSe5LTWnI=";
+
hash = "sha256-sWONjWchXu5pRFXY/ZhOXvF0z/qUc1LjqcaSiVPA1MU=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/bleak-retry-connector/default.nix
···
buildPythonPackage rec {
pname = "bleak-retry-connector";
-
version = "3.2.1";
+
version = "3.3.0";
format = "pyproject";
disabled = pythonOlder "3.7";
···
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
-
hash = "sha256-3dftk/C6g6Hclc/N8LlsYcZfxA1I6bMiXkzRcUg69Oc=";
+
hash = "sha256-5yhr+W2ZSy/uSgmz23pyIKcoJ34h/eDsoyv+N9Hi36w=";
};
postPatch = ''
+7 -2
pkgs/development/python-modules/blinkpy/default.nix
···
buildPythonPackage rec {
pname = "blinkpy";
-
version = "0.22.0";
+
version = "0.22.2";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "fronzbot";
repo = "blinkpy";
rev = "refs/tags/v${version}";
-
hash = "sha256-r8kf5L6bvtivqd9dSi8om1wIi8IHmipKFckNMPT515I=";
+
hash = "sha256-T6ryiWVpraaXzwHYBXjuIO8PUqUcQBcLi1+O+iNBaoc=";
};
+
+
postPatch = ''
+
substituteInPlace pyproject.toml \
+
--replace ', "wheel~=0.40.0"' ""
+
'';
nativeBuildInputs = [
setuptools
+2 -2
pkgs/development/python-modules/google-nest-sdm/default.nix
···
buildPythonPackage rec {
pname = "google-nest-sdm";
-
version = "3.0.2";
+
version = "3.0.3";
format = "setuptools";
disabled = pythonOlder "3.10";
···
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = "refs/tags/${version}";
-
hash = "sha256-NNHkcOCoG5Xagc0jTR50uHMA5mMgsh3BIzVJ77OEEjk=";
+
hash = "sha256-VO/TY/QBzVFxqIumVJjw+Ic0hrqkRBS+7wQKBhcN9Jw=";
};
propagatedBuildInputs = [
+13 -4
pkgs/development/python-modules/hass-nabucasa/default.nix
···
, atomicwrites-homeassistant
, attrs
, buildPythonPackage
+
, ciso8601
+
, cryptography
, fetchFromGitHub
, pycognito
, pytest-aiohttp
, pytest-timeout
, pytestCheckHook
, pythonOlder
+
, setuptools
, snitun
, syrupy
, xmltodict
···
buildPythonPackage rec {
pname = "hass-nabucasa";
-
version = "0.71.0";
-
format = "setuptools";
+
version = "0.74.0";
+
pyproject = true;
-
disabled = pythonOlder "3.8";
+
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = "refs/tags/${version}";
-
hash = "sha256-2v8LEVYY7PEzcIMaXcy9h+8O2KrU0zTKyZb2IrO35JQ=";
+
hash = "sha256-r4Huvn9mBqnASpUd+drwORE+fApLV/l6Y3aO/UIiEC8=";
};
postPatch = ''
···
--replace "snitun==" "snitun>=" \
'';
+
nativeBuildInputs = [
+
setuptools
+
];
+
propagatedBuildInputs = [
acme
aiohttp
atomicwrites-homeassistant
attrs
+
ciso8601
+
cryptography
pycognito
snitun
];
+6 -4
pkgs/development/python-modules/icalendar/default.nix
···
, python-dateutil
, pytz
, hypothesis
-
, pytest
+
, pytestCheckHook
}:
buildPythonPackage rec {
-
version = "5.0.7";
+
version = "5.0.10";
pname = "icalendar";
format = "setuptools";
···
owner = "collective";
repo = "icalendar";
rev = "refs/tags/v${version}";
-
hash = "sha256-fblcbyctnvd7DOc+tMWzg+90NHzZvH5xiY6BfJakQVo=";
+
hash = "sha256-sRsUjNClJ58kmCRiwSe7oq20eamj95Vwy/o0xPU8qPw=";
};
propagatedBuildInputs = [
···
nativeCheckInputs = [
hypothesis
-
pytest
+
pytestCheckHook
];
+
+
pytestFlagsArray = [ "src/icalendar" ];
meta = with lib; {
changelog = "https://github.com/collective/icalendar/blob/v${version}/CHANGES.rst";
+29 -12
pkgs/development/python-modules/mastodon-py/default.nix
···
, http-ece
, python-dateutil
, python-magic
-
, pytz
, requests
, six
, pytestCheckHook
···
, pytest-vcr
, requests-mock
, setuptools
-
, pytest-cov
}:
buildPythonPackage rec {
pname = "mastodon-py";
-
# tests are broken on last release, check after next release (> 1.8.1)
-
version = "unstable-2023-06-24";
-
-
format = "pyproject";
+
version = "1.8.1";
+
pyproject = true;
src = fetchFromGitHub {
owner = "halcy";
repo = "Mastodon.py";
-
rev = "cd86887d88bbc07de462d1e00a8fbc3d956c0151";
-
hash = "sha256-rJocFvtBPrSSny3lwENuRsQdAzi3u8b+SfDNGloniWI=";
+
rev = "refs/tags/${version}";
+
hash = "sha256-r0AAUjd2MBfZANEpyztMNyaQTlGWvWoUVjJNO1eL218=";
};
+
postPatch = ''
+
sed -i '/addopts/d' setup.cfg
+
'';
+
+
nativeBuildInputs = [
+
setuptools
+
];
+
propagatedBuildInputs = [
blurhash
-
cryptography
decorator
-
http-ece
python-dateutil
python-magic
-
pytz
requests
six
];
+
passthru.optional-dependencies = {
+
blurhash = [
+
blurhash
+
];
+
webpush = [
+
http-ece
+
cryptography
+
];
+
};
+
nativeCheckInputs = [
pytestCheckHook
pytest-mock
pytest-vcr
-
pytest-cov
requests-mock
setuptools
+
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+
+
disabledTests = [
+
"test_notifications_dismiss_pre_2_9_2"
+
"test_status_card_pre_2_9_2"
+
"test_stream_user_direct"
+
"test_stream_user_local"
];
pythonImportsCheck = [ "mastodon" ];
+2 -2
pkgs/development/python-modules/matrix-nio/default.nix
···
buildPythonPackage rec {
pname = "matrix-nio";
-
version = "0.21.2";
+
version = "0.22.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "poljar";
repo = "matrix-nio";
rev = version;
-
hash = "sha256-eK5DPmPZ/hv3i3lzoIuS9sJXKpUNhmBv4+Nw2u/RZi0=";
+
hash = "sha256-hFSS2Nys95YJgBNED8SBan24iRo2q/UOr6pqUPAF5Ms=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/nitime/default.nix
···
buildPythonPackage rec {
pname = "nitime";
-
version = "0.10.1";
+
version = "0.10.2";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-NnoVrSt6MTTcNup1e+/1v5JoHCYcycuQH4rHLzXJt+Y=";
+
hash = "sha256-NCaWr7ZqL1XV0QfUD+4+Yn33N1cCP33ib5oJ91OtJLU=";
};
# Upstream wants to build against the oldest version of numpy possible, but
+17 -13
pkgs/development/python-modules/pyatv/default.nix
···
{ lib
, buildPythonPackage
, aiohttp
-
, bitarray
+
, async-timeout
, chacha20poly1305-reuseable
, cryptography
, deepdiff
, fetchFromGitHub
+
, ifaddr
, mediafile
, miniaudio
-
, netifaces
, protobuf
+
, pydantic
+
, pyfakefs
, pytest-aiohttp
, pytest-asyncio
, pytest-httpserver
···
, pythonRelaxDepsHook
, pythonOlder
, requests
+
, setuptools
, srptools
, stdenv
+
, tabulate
, zeroconf
}:
buildPythonPackage rec {
pname = "pyatv";
-
version = "0.13.4";
-
format = "setuptools";
+
version = "0.14.4";
+
pyproject = true;
-
disabled = pythonOlder "3.7";
+
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "postlund";
-
repo = pname;
+
repo = "pyatv";
rev = "refs/tags/v${version}";
-
hash = "sha256-rZnL18vO8eYn70GzeKSY528iTc0r/seGv0dYDYGHNzw=";
+
hash = "sha256-w3WOlZFfuCmekUsr8msi2LXTm6j8/Bk49L3MiYF7lOM=";
};
postPatch = ''
···
nativeBuildInputs = [
pythonRelaxDepsHook
+
setuptools
];
propagatedBuildInputs = [
aiohttp
-
bitarray
+
async-timeout
chacha20poly1305-reuseable
cryptography
+
ifaddr
mediafile
miniaudio
-
netifaces
protobuf
+
pydantic
requests
srptools
+
tabulate
zeroconf
];
nativeCheckInputs = [
deepdiff
+
pyfakefs
pytest-aiohttp
pytest-asyncio
pytest-httpserver
pytest-timeout
pytestCheckHook
-
];
-
-
pytestFlagsArray = [
-
"--asyncio-mode=legacy"
];
disabledTests = lib.optionals (stdenv.isDarwin) [
+4 -2
pkgs/development/python-modules/python-opensky/default.nix
···
, pytest-asyncio
, pytestCheckHook
, pythonOlder
+
, syrupy
, yarl
}:
buildPythonPackage rec {
pname = "python-opensky";
-
version = "0.2.0";
+
version = "0.2.1";
format = "pyproject";
disabled = pythonOlder "3.10";
···
owner = "joostlek";
repo = "python-opensky";
rev = "refs/tags/v${version}";
-
hash = "sha256-62ncinv6XUGB1dYle/yqSCyJNbGD9BLaOqrF/zjL2fA=";
+
hash = "sha256-xNXFvCUZ/x5ox3KxmG3eA73wpX4fwhvAVmlfcKiT1V8=";
};
postPatch = ''
···
aresponses
pytest-asyncio
pytestCheckHook
+
syrupy
];
pythonImportsCheck = [
+2 -2
pkgs/development/python-modules/recurring-ical-events/default.nix
···
buildPythonPackage rec {
pname = "recurring-ical-events";
-
version = "2.0.2";
+
version = "2.1.0";
format = "setuptools";
···
owner = "niccokunzmann";
repo = "python-recurring-ical-events";
rev = "v${version}";
-
hash = "sha256-aM7c/HE8xLqT5wCLaCrfFn6c7FIkCJA6TTICZprAgNM=";
+
hash = "sha256-HNImooD6+hsMIfJX8LuHw1YyFIQNbY7dAjqdupPbhEE=";
};
propagatedBuildInputs = [
+3
pkgs/development/python-modules/x-wr-timezone/default.nix
···
export PATH=$out/bin:$PATH
'';
+
# https://github.com/niccokunzmann/x-wr-timezone/issues/8
+
doCheck = false;
+
pythonImportsCheck = [ "x_wr_timezone" ];
meta = {
+2 -2
pkgs/development/python-modules/zeroconf/default.nix
···
buildPythonPackage rec {
pname = "zeroconf";
-
version = "0.115.2";
+
version = "0.119.0";
format = "pyproject";
disabled = pythonOlder "3.7";
···
owner = "jstasiak";
repo = "python-zeroconf";
rev = "refs/tags/${version}";
-
hash = "sha256-qLJWOZyWyLx5orDbvVSluA+zFvHN2393hyVC3ty87ug=";
+
hash = "sha256-VaqKk2WrRLZM2tfx3+y9GngEc6rMcw0b12ExFVfDYf4=";
};
nativeBuildInputs = [
+2
pkgs/development/python-modules/zha-quirks/default.nix
···
, aiohttp
, buildPythonPackage
, fetchFromGitHub
+
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, zigpy
···
];
nativeCheckInputs = [
+
pytest-asyncio
pytestCheckHook
];
+2 -2
pkgs/development/python-modules/zigpy/default.nix
···
buildPythonPackage rec {
pname = "zigpy";
-
version = "0.57.2";
+
version = "0.58.1";
format = "pyproject";
disabled = pythonOlder "3.8";
···
owner = "zigpy";
repo = "zigpy";
rev = "refs/tags/${version}";
-
hash = "sha256-v4H8syWbXqmfvOznRECgSjYi246+socPJTffb79MXK4=";
+
hash = "sha256-i2P9QyhT/UQ8Xu0IfQ2OzAxIiMF4H04Jkz3/6e2FCpY=";
};
postPatch = ''
+2 -2
pkgs/development/tools/glamoroustoolkit/default.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "glamoroustoolkit";
-
version = "1.0.1";
+
version = "1.0.2";
src = fetchzip {
url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
stripRoot = false;
-
hash = "sha256-v63sV0HNHSU9H5rhtJcwZCuIXEGe1+BDyxV0/EqBk2E=";
+
hash = "sha256-a+B+uAxFXlWVn8b0M17TtP4WTKhMmR6//smV1nmZyxU=";
};
nativeBuildInputs = [ wrapGAppsHook ];
+3 -3
pkgs/development/tools/pscale/default.nix
···
buildGoModule rec {
pname = "pscale";
-
version = "0.156.0";
+
version = "0.161.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
-
sha256 = "sha256-1VlG+0jzx6Yho0bc3RypXgOFoM+NgOQ2RX4FB5ZllSw=";
+
sha256 = "sha256-7PzuFhlOlU5uGsJyGOY761JfzqaPkkkftRlYrvUKEoU=";
};
-
vendorHash = "sha256-T5UmaS7PPZdkPpFxJIqpF5pH24uFrHbrbsI5gfElUOY=";
+
vendorHash = "sha256-fhYd2C9xY0kQez6+MofimJP+brLvMDFXlW6kDSI4iqA=";
ldflags = [
"-s" "-w"
+70 -26
pkgs/servers/home-assistant/component-packages.nix
···
# Do not edit!
{
-
version = "2023.10.5";
+
version = "2023.11.0";
components = {
"3_day_blinds" = ps: with ps; [
];
···
"cpuspeed" = ps: with ps; [
py-cpuinfo
];
+
"cribl" = ps: with ps; [
+
];
"crownstone" = ps: with ps; [
aiohttp-cors
crownstone-cloud
···
]; # missing inputs: dynalite-panel
"eafm" = ps: with ps; [
aioeafm
+
];
+
"eastron" = ps: with ps; [
];
"easyenergy" = ps: with ps; [
easyenergy
···
pythonegardia
];
"eight_sleep" = ps: with ps; [
-
pyeight
];
"electrasmart" = ps: with ps; [
]; # missing inputs: pyElectra
···
"fitbit" = ps: with ps; [
aiohttp-cors
fitbit
+
fnv-hash-fast
+
psutil-home-assistant
+
sqlalchemy
];
"fivem" = ps: with ps; [
fivem-api
···
psutil-home-assistant
sqlalchemy
];
+
"google_tasks" = ps: with ps; [
+
aiohttp-cors
+
fnv-hash-fast
+
google-api-python-client
+
psutil-home-assistant
+
sqlalchemy
+
];
"google_translate" = ps: with ps; [
gtts
];
···
aiohttp-cors
aioimaplib
];
-
"imap_email_content" = ps: with ps; [
+
"improv_ble" = ps: with ps; [
+
aioesphomeapi
aiohttp-cors
-
aioimaplib
-
];
+
aioruuvigateway
+
aioshelly
+
async-interrupt
+
bleak
+
bleak-retry-connector
+
bluetooth-adapters
+
bluetooth-auto-recovery
+
bluetooth-data-tools
+
dbus-fast
+
esphome-dashboard-api
+
fnv-hash-fast
+
hassil
+
home-assistant-intents
+
ifaddr
+
mutagen
+
psutil-home-assistant
+
pyserial
+
pyudev
+
sqlalchemy
+
webrtc-noise-gain
+
zeroconf
+
]; # missing inputs: py-improv-ble-client
"incomfort" = ps: with ps; [
incomfort-client
];
···
ifaddr
psutil-home-assistant
sqlalchemy
+
];
+
"local_todo" = ps: with ps; [
+
ical
];
"locative" = ps: with ps; [
aiohttp-cors
···
"poolsense" = ps: with ps; [
poolsense
];
+
"portlandgeneral" = ps: with ps; [
+
];
"powerwall" = ps: with ps; [
tesla-powerwall
];
···
"pyload" = ps: with ps; [
];
"python_script" = ps: with ps; [
+
restrictedpython
restrictedpython
];
"qbittorrent" = ps: with ps; [
···
psutil-home-assistant
sqlalchemy
];
+
"recovery_mode" = ps: with ps; [
+
aiohttp-cors
+
fnv-hash-fast
+
hass-nabucasa
+
hassil
+
home-assistant-frontend
+
home-assistant-intents
+
janus
+
mutagen
+
pillow
+
psutil-home-assistant
+
pyturbojpeg
+
sqlalchemy
+
webrtc-noise-gain
+
];
"recswitch" = ps: with ps; [
]; # missing inputs: pyrecswitch
"reddit" = ps: with ps; [
···
"sabnzbd" = ps: with ps; [
pysabnzbd
];
-
"safe_mode" = ps: with ps; [
-
aiohttp-cors
-
fnv-hash-fast
-
hass-nabucasa
-
hassil
-
home-assistant-frontend
-
home-assistant-intents
-
janus
-
mutagen
-
pillow
-
psutil-home-assistant
-
pyturbojpeg
-
sqlalchemy
-
webrtc-noise-gain
-
];
"saj" = ps: with ps; [
pysaj
];
···
pyserial
pyudev
sqlalchemy
-
];
-
"shiftr" = ps: with ps; [
-
paho-mqtt
];
"shodan" = ps: with ps; [
shodan
···
"tailscale" = ps: with ps; [
tailscale
];
+
"tami4" = ps: with ps; [
+
]; # missing inputs: Tami4EdgeAPI
"tank_utility" = ps: with ps; [
tank-utility
];
···
tmb
];
"tod" = ps: with ps; [
+
];
+
"todo" = ps: with ps; [
+
aiohttp-cors
];
"todoist" = ps: with ps; [
todoist-api-python
···
]; # missing inputs: wirelesstagpy
"withings" = ps: with ps; [
aiohttp-cors
+
aiowithings
fnv-hash-fast
hass-nabucasa
hassil
···
pyturbojpeg
sqlalchemy
webrtc-noise-gain
-
withings-api
];
"wiz" = ps: with ps; [
aiohttp-cors
···
"google_mail"
"google_pubsub"
"google_sheets"
+
"google_tasks"
"google_translate"
"google_travel_time"
"google_wifi"
···
"image_processing"
"image_upload"
"imap"
-
"imap_email_content"
"influxdb"
"inkbird"
"input_boolean"
···
"local_calendar"
"local_file"
"local_ip"
+
"local_todo"
"locative"
"lock"
"logbook"
···
"rdw"
"recollect_waste"
"recorder"
+
"recovery_mode"
"reddit"
"remote"
"renault"
···
"ruuvi_gateway"
"ruuvitag_ble"
"sabnzbd"
-
"safe_mode"
"samsungtv"
"scene"
"schedule"
···
"time_date"
"timer"
"tod"
+
"todo"
"todoist"
"tolo"
"tomato"
+3 -23
pkgs/servers/home-assistant/default.nix
···
];
});
-
blinkpy = super.blinkpy.overridePythonAttrs (oldAttrs: rec {
-
version = "0.21.0";
-
src = fetchFromGitHub {
-
owner = "fronzbot";
-
repo = "blinkpy";
-
rev = "refs/tags/v${version}";
-
hash = "sha256-0sEZlnS6CJj8nMyjtSFZRALRKdmY0Uu5N6sozPiDG6w=";
-
};
-
});
-
-
dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec {
-
version = "0.33";
-
src = fetchFromGitHub {
-
owner = "ndokter";
-
repo = "dsmr_parser";
-
rev = "refs/tags/v${version}";
-
hash = "sha256-Phx8Yqx6beTzkQv0fU8Pfs2btPgKVARdO+nMcne1S+w=";
-
};
-
});
-
geojson = super.geojson.overridePythonAttrs (oldAttrs: rec {
version = "2.5.0";
src = fetchFromGitHub {
···
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
-
hassVersion = "2023.10.5";
+
hassVersion = "2023.11.0";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
···
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
-
hash = "sha256-jVw0Mudb/L4Lw3AodwcOTrNJZctSfEIcXUzxozo7saA=";
+
hash = "sha256-qLs098k/MUvmOl6/tB4SDU55V7KTZ0+T3RUoLH4AQ2Q=";
};
# Secondary source is git for tests
···
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
-
hash = "sha256-wKxAwa4t3JbS4puDAufjpzcVLcvEY9Bk73qmg3JeLPk=";
+
hash = "sha256-I5I/OcVE6nGO7LG3s2I1P/VUbPjPkUc7qj43z99tIRM=";
};
nativeBuildInputs = with python.pkgs; [
+2 -2
pkgs/servers/home-assistant/frontend.nix
···
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
-
version = "20231005.0";
+
version = "20231030.1";
format = "wheel";
src = fetchPypi {
···
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
-
hash = "sha256-p93bo5+VQykcuK5f0r848tMoANSexvHDVBm7f3IYOMM=";
+
hash = "sha256-S363j7HnOxLqCBaml1Kb9xfY0AaqBIgj09NutByn6Xo=";
};
# there is nothing to strip in this package
+2 -2
pkgs/servers/home-assistant/intents.nix
···
buildPythonPackage rec {
pname = "home-assistant-intents";
-
version = "2023.10.2";
+
version = "2023.10.16";
format = "pyproject";
disabled = pythonOlder "3.9";
···
owner = "home-assistant";
repo = "intents-package";
rev = "refs/tags/${version}";
-
hash = "sha256-4zaMDYHrUape+s9Z1nfGpud74pbkAeKBpJtmIyLdCjk=";
+
hash = "sha256-qW5KzABEEBw2tu5+fAoWd8nCxuvTzEU14M8iaSo2WzE=";
fetchSubmodules = true;
};
+3 -3
pkgs/servers/misc/gobgpd/default.nix
···
buildGoModule rec {
pname = "gobgpd";
-
version = "3.19.0";
+
version = "3.20.0";
src = fetchFromGitHub {
owner = "osrg";
repo = "gobgp";
rev = "refs/tags/v${version}";
-
hash = "sha256-zDLL+3k6/Jgq/pflpmjuLcfPzvDl0LQLQklW+kOvtQg=";
+
hash = "sha256-kdeDV8IWbfeC6KDgJtOl1NX6jwvxiaIdGAYtrDuYFdI=";
};
-
vendorHash = "sha256-8qEGp95y8iBIJXCTh2Pa/JwiruZVVIjHLwaZqwFZMl8=";
+
vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8=";
postConfigure = ''
export CGO_ENABLED=0
+3 -3
pkgs/servers/zigbee2mqtt/default.nix
···
buildNpmPackage rec {
pname = "zigbee2mqtt";
-
version = "1.33.1";
+
version = "1.33.2";
src = fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
-
hash = "sha256-Rd8PJWKPUriVf3BmHFvhmb+SQskVeqOFdJB8Gsopgnw=";
+
hash = "sha256-pRY4FOIJwsLSKYieN0D1esKdoUqx62NMFgiYXaXguJ0=";
};
-
npmDepsHash = "sha256-rEqbwdeIQg6YS7uLeoP2uMbJWsnovIHBVp9CPlTc2NY=";
+
npmDepsHash = "sha256-9bOFM8Ie0334H2L94ypgkMrB6zyVJ9YTvNnKeBJjOUI=";
nativeBuildInputs = [
python3
+4 -4
pkgs/shells/fish/plugins/bobthefisher.nix
···
, fetchFromGitHub
,
}:
-
buildFishPlugin rec {
+
buildFishPlugin {
pname = "bobthefisher";
-
version = "unstable-2023-03-09";
+
version = "unstable-2023-10-25";
src = fetchFromGitHub {
owner = "Scrumplex";
repo = "bobthefisher";
-
rev = "6528033a2c9ca90611d04b6a4afd2131b9495cdc";
-
sha256 = "sha256-UDoSMFKtd6ur10guqJlkpA0YSCBv45FR5QKJqdXZWgw=";
+
rev = "f4179a14b087c7fbfc2e892da429adad40a39e44";
+
sha256 = "sha256-l1DHSZa40BX2/4GCjm5E53UOeFEnMioWbZtCW14WX6k=";
};
meta = with lib; {
-32
pkgs/tools/audio/wyoming/piper-entrypoint.patch
···
-
diff --git a/setup.py b/setup.py
-
index 05e42c1..8347acb 100644
-
--- a/setup.py
-
+++ b/setup.py
-
@@ -41,4 +41,9 @@ setup(
-
"Programming Language :: Python :: 3.10",
-
],
-
keywords="rhasspy wyoming piper",
-
+ entry_points={
-
+ 'console_scripts': [
-
+ 'wyoming-piper = wyoming_piper:__main__.run'
-
+ ]
-
+ }
-
)
-
diff --git a/wyoming_piper/__main__.py b/wyoming_piper/__main__.py
-
index ab1580b..4c0a143 100755
-
--- a/wyoming_piper/__main__.py
-
+++ b/wyoming_piper/__main__.py
-
@@ -143,8 +143,12 @@ def get_description(voice_info: Dict[str, Any]):
-
-
# -----------------------------------------------------------------------------
-
-
+def run():
-
+ asyncio.run(main())
-
+
-
+
-
if __name__ == "__main__":
-
try:
-
- asyncio.run(main())
-
+ run()
-
except KeyboardInterrupt:
-
pass
+24 -12
pkgs/tools/audio/wyoming/piper.nix
···
{ lib
-
, python3
-
, fetchPypi
+
, python3Packages
+
, fetchFromGitHub
+
, fetchpatch
}:
-
python3.pkgs.buildPythonApplication rec {
+
python3Packages.buildPythonApplication rec {
pname = "wyoming-piper";
-
version = "1.3.2";
-
format = "setuptools";
+
version = "1.4.0";
+
pyproject = true;
-
src = fetchPypi {
-
pname = "wyoming_piper";
-
inherit version;
-
hash = "sha256-WyoHwIF3xC5nOa7iQ8/esfdwahbU6YJzK5G2Vi3mV4M=";
+
src = fetchFromGitHub {
+
owner = "rhasspy";
+
repo = "wyoming-piper";
+
# https://github.com/rhasspy/wyoming-piper/issues/3
+
rev = "560927437c72eca4d334ca503d15863f0b42980d";
+
hash = "sha256-Q4S96zs856zXVAGo4mB466an60naHiS2S/qxYxPE4sI=";
};
patches = [
-
./piper-entrypoint.patch
+
(fetchpatch {
+
# add console script
+
url = "https://github.com/rhasspy/wyoming-piper/commit/4c27fbd067fd543adede4626fc5868a3f2458734.patch";
+
hash = "sha256-YPjDjeY9RLsgCtbBZoNgPyQTv3rbCJGcqTNSSwiqqEE=";
+
})
];
-
propagatedBuildInputs = with python3.pkgs; [
+
nativeBuildInputs = with python3Packages; [
+
setuptools
+
];
+
+
propagatedBuildInputs = with python3Packages; [
wyoming
];
···
doCheck = false;
meta = with lib; {
+
changelog = "https://github.com/rhasspy/wyoming-openwakeword/v${version}/master/CHANGELOG.md";
description = "Wyoming Server for Piper";
-
homepage = "https://pypi.org/project/wyoming-piper/";
+
homepage = "https://github.com/rhasspy/wyoming-openwakeword";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
+2 -2
pkgs/tools/misc/esphome/default.nix
···
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
-
version = "2023.10.4";
+
version = "2023.10.5";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
-
hash = "sha256-rDq6uudT1kW97TiE9FswfgzLlNPTo8+YjD7HEvbrMn0=";
+
hash = "sha256-I/VA1/vw0WrTsLC1F3IrKYf8lmTJHLG/RYj3VcJx+Zc=";
};
postPatch = ''
+3 -3
pkgs/tools/networking/gobgp/default.nix
···
buildGoModule rec {
pname = "gobgp";
-
version = "3.19.0";
+
version = "3.20.0";
src = fetchFromGitHub {
owner = "osrg";
repo = "gobgp";
rev = "v${version}";
-
sha256 = "sha256-zDLL+3k6/Jgq/pflpmjuLcfPzvDl0LQLQklW+kOvtQg=";
+
sha256 = "sha256-kdeDV8IWbfeC6KDgJtOl1NX6jwvxiaIdGAYtrDuYFdI=";
};
-
vendorHash = "sha256-8qEGp95y8iBIJXCTh2Pa/JwiruZVVIjHLwaZqwFZMl8=";
+
vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8=";
postConfigure = ''
export CGO_ENABLED=0
+3 -3
pkgs/tools/virtualization/govc/default.nix
···
buildGoModule rec {
pname = "govc";
-
version = "0.32.0";
+
version = "0.33.0";
subPackages = [ "govc" ];
···
rev = "v${version}";
owner = "vmware";
repo = "govmomi";
-
sha256 = "sha256-GnMWgN6ZxxGU/tRAPIk2cvpsBiut97iPcU9920wepxM=";
+
sha256 = "sha256-YY/rTrL6zEhZkeaYz2yG/h2s81IefClou4abbmQuDiU=";
};
-
vendorHash = "sha256-mf9ZYZEmqB/47JLHn8N3VDr57SXbFLubXnwfXj682FA=";
+
vendorHash = "sha256-DBcovHOOfIy4dfi8U9zaCUzz5Zz8oIG44JCqMKtdxgg=";
ldflags = [
"-s"