b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #175759 from mweinelt/home-assistant

Browse source
This commit is contained in:
Martin Weinelt 2022-06-01 22:44:47 +02:00 committed by GitHub
parent d8246f98cb 654ae85a58
commit f1b44dde82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 124 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/async-upnp-client/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "async-upnp-client";
version = "0.29.0";
version = "0.31.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
sha256 = "sha256-IzT48ABfk/v8VZJRJEMU/Rsi6mJG4IvtF7HNRv6TLeA=";
sha256 = "sha256-jxipSHSsipnKJF+d7tez9M6bBlwV4r8XGQ2elI0jsVc=";
};
propagatedBuildInputs = [

12
pkgs/development/python-modules/bimmer-connected/default.nix
View file

@ -3,17 +3,17 @@
, pythonOlder
, fetchFromGitHub
, pbr
, requests
, httpx
, pycryptodome
, pyjwt
, pytestCheckHook
, requests-mock
, respx
, time-machine
}:
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.8.12";
version = "0.9.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = version;
hash = "sha256-0yXEm8cjzw1ClSP8a5TB9RrugzgHSu40tTtyNQU4dfY=";
hash = "sha256-ylhvUX5af248KIT54SIe26WP8tysqjZd2y/+Fi+VqHM=";
};
nativeBuildInputs = [
@ -32,14 +32,14 @@ buildPythonPackage rec {
PBR_VERSION = version;
propagatedBuildInputs = [
requests
httpx
pycryptodome
pyjwt
];
checkInputs = [
pytestCheckHook
requests-mock
respx
time-machine
];

46
pkgs/development/python-modules/bond-async/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, aioresponses
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "bond-async";
version = "0.1.20";
disabled = pythonOlder "3.7";
format = "setuptools";
src = fetchFromGitHub {
owner = "bondhome";
repo = "bond-async";
rev = "v${version}";
hash = "sha256-iBtbHS3VzSB6wfWDFq5UVd3++x3HtQbWQ6soPYfcHiM=";
};
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aioresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"bond_async"
];
meta = {
description = "Asynchronous Python wrapper library over Bond Local API";
homepage = "https://github.com/bondhome/bond-async";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

4
pkgs/development/python-modules/dsmr-parser/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dsmr-parser";
version = "0.32";
version = "0.33";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "ndokter";
repo = "dsmr_parser";
rev = "v${version}";
sha256 = "0hi69gdcmsp5yaspsfbpc3x76iybg20cylxyaxm131fpd5wwan9l";
sha256 = "sha256-Phx8Yqx6beTzkQv0fU8Pfs2btPgKVARdO+nMcne1S+w=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/plexapi/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "plexapi";
version = "4.10.1";
version = "4.11.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "sha256-0j3uf3wSDFSyDGo3oRi99KNKfhuGP2puSi0KgVjsXnQ=";
sha256 = "sha256-N4ic1DDMAHnHYYoD59ZHFqlgLlvFZV8Nn7V47NDXE5U=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zwave-js-server-python/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zwave-js-server-python";
version = "0.37.0";
version = "0.37.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
hash = "sha256-321voxogSkeHMsMdLnrjwG3vQOgGDcMjDen0EUKYE1U=";
hash = "sha256-ciIodpa1ekOqC6wa4r3qxJKW1gzTdoRqeLLaTW/yJQs=";
};
propagatedBuildInputs = [

62
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.5.5";
version = "2022.6.0";
components = {
"abode" = ps: with ps; [
abodepy
@ -140,6 +140,9 @@
pyatv
zeroconf
];
"application_credentials" = ps: with ps; [
aiohttp-cors
];
"apprise" = ps: with ps; [
apprise
];
@ -236,6 +239,8 @@
aiohttp-cors
securetar
];
"baf" = ps: with ps; [
]; # missing inputs: aiobafi6
"baidu" = ps: with ps; [
]; # missing inputs: baidu-aip
"balboa" = ps: with ps; [
@ -288,7 +293,7 @@
bimmer-connected
];
"bond" = ps: with ps; [
bond-api
bond-async
];
"bosch_shc" = ps: with ps; [
aiohttp-cors
@ -952,6 +957,10 @@
"geo_rss_events" = ps: with ps; [
georss-generic-client
];
"geocaching" = ps: with ps; [
aiohttp-cors
geocachingapi
];
"geofency" = ps: with ps; [
aiohttp-cors
];
@ -1049,6 +1058,16 @@
"hangouts" = ps: with ps; [
hangups
];
"hardkernel" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
"hardware" = ps: with ps; [
];
"harman_kardon_avr" = ps: with ps; [
hkavr
];
@ -1139,7 +1158,7 @@
homematicip
];
"homewizard" = ps: with ps; [
aiohwenergy
python-homewizard-energy
];
"homeworks" = ps: with ps; [
pyhomeworks
@ -1187,6 +1206,9 @@
"ialarm" = ps: with ps; [
pyialarm
];
"ialarm_xr" = ps: with ps; [
pyialarmxr
];
"iammeter" = ps: with ps; [
]; # missing inputs: iammeter
"iaqualink" = ps: with ps; [
@ -1379,6 +1401,9 @@
"launch_library" = ps: with ps; [
pylaunches
];
"laundrify" = ps: with ps; [
laundrify-aio
];
"lcn" = ps: with ps; [
pypck
];
@ -1863,7 +1888,6 @@
ondilo
];
"onewire" = ps: with ps; [
pi1wire
pyownet
];
"onkyo" = ps: with ps; [
@ -2138,13 +2162,21 @@
];
"rainforest_eagle" = ps: with ps; [
aioeagle
ueagle
eagle100
];
"rainmachine" = ps: with ps; [
regenmaschine
];
"random" = ps: with ps; [
];
"raspberry_pi" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
"raspyrfm" = ps: with ps; [
]; # missing inputs: raspyrfm-client
"rdw" = ps: with ps; [
@ -2227,8 +2259,6 @@
];
"rpi_camera" = ps: with ps; [
];
"rpi_gpio" = ps: with ps; [
]; # missing inputs: RPi.GPIO
"rpi_power" = ps: with ps; [
rpi-bad-power
];
@ -2287,6 +2317,7 @@
"scrape" = ps: with ps; [
beautifulsoup4
jsonpath
lxml
xmltodict
];
"screenlogic" = ps: with ps; [
@ -3035,6 +3066,9 @@
];
"worxlandroid" = ps: with ps; [
];
"ws66i" = ps: with ps; [
pyws66i
];
"wsdot" = ps: with ps; [
];
"x10" = ps: with ps; [
@ -3103,6 +3137,10 @@
aioftp
ha-ffmpeg
];
"yolink" = ps: with ps; [
aiohttp-cors
yolink-api
];
"youless" = ps: with ps; [
youless-api
];
@ -3182,6 +3220,7 @@
"airtouch4"
"airvisual"
"airzone"
"aladdin_connect"
"alarm_control_panel"
"alarmdecoder"
"alert"
@ -3196,6 +3235,7 @@
"apache_kafka"
"api"
"apple_tv"
"application_credentials"
"apprise"
"aprs"
"arcam_fmj"
@ -3353,6 +3393,7 @@
"geo_json_events"
"geo_location"
"geo_rss_events"
"geocaching"
"geofency"
"geonetnz_quakes"
"geonetnz_volcano"
@ -3378,6 +3419,8 @@
"guardian"
"habitica"
"hangouts"
"hardkernel"
"hardware"
"harmony"
"hassio"
"hddtemp"
@ -3407,6 +3450,7 @@
"hvv_departures"
"hyperion"
"ialarm"
"ialarm_xr"
"iaqualink"
"icloud"
"ifttt"
@ -3447,6 +3491,7 @@
"kulersky"
"lastfm"
"launch_library"
"laundrify"
"lcn"
"light"
"litterrobot"
@ -3586,6 +3631,7 @@
"rainforest_eagle"
"rainmachine"
"random"
"raspberry_pi"
"rdw"
"recollect_waste"
"recorder"
@ -3778,6 +3824,7 @@
"wled"
"workday"
"worldclock"
"ws66i"
"wsdot"
"xbox"
"xiaomi"
@ -3789,6 +3836,7 @@
"yandex_transport"
"yandextts"
"yeelight"
"yolink"
"youless"
"zeroconf"
"zerproc"

27
pkgs/servers/home-assistant/default.nix
View file

@ -72,19 +72,6 @@ let
});
})
(self: super: {
huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec {
version = "1.4.18";
src = fetchFromGitHub {
owner = "Salamek";
repo = "huawei-lte-api";
rev = version;
sha256 = "1qaqxmh03j10wa9wqbwgc5r3ays8wfr7bldvsm45fycr3qfyn5fg";
};
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.dicttoxml ];
});
})
# Pinned due to API changes in pyruckus>0.12
(self: super: {
pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {
@ -179,7 +166,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.5.5";
hassVersion = "2022.6.0";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -197,7 +184,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-uVB3Yg3f0fNkq2rav7hmbJ9IAMg0UIrdMshJVgOharA=";
hash = "sha256-8s6CyTNA61UgrflpQ/RZnAPa/xI4VFdEQJnN25k3vuc=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@ -210,24 +197,18 @@ in python.pkgs.buildPythonApplication rec {
postPatch = let
relaxedConstraints = [
"aiohttp"
"async_timeout"
"attrs"
"awesomeversion"
"bcrypt"
"cryptography"
"httpx"
"jinja2"
"pip"
"requests"
"yarl"
"PyJWT"
];
in ''
sed -r -i \
${lib.concatStringsSep "\n" (map (package:
''-e 's@${package}[<>=]+.*@${package}@g' \''
) relaxedConstraints)}
setup.cfg
setup.cfg
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
'';

4
pkgs/servers/home-assistant/frontend.nix
View file

@ -4,7 +4,7 @@ buildPythonPackage rec {
# 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 = "20220504.1";
version = "20220531.0";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-EU9I/0+EmcNr7eYq3Z5J5/KiWu+Qz0+wn7UZMJFBxp0=";
sha256 = "sha256-NySYrHmU1OV11WZSqe6GURPKnwcLukXF0QUxxlPXUG4=";
};
# there is nothing to strip in this package

1
pkgs/servers/home-assistant/tests.nix
View file

@ -14,6 +14,7 @@ let
lovelace = [ PyChromecast ];
nest = [ av ];
onboarding = [ pymetno radios rpi-bad-power ];
raspberry_pi = [ rpi-bad-power ];
tomorrowio = [ pyclimacell ];
version = [ aioaseko ];
voicerss = [ mutagen ];

2
pkgs/top-level/python-packages.nix
View file

@ -1325,6 +1325,8 @@ in {
bond-api = callPackage ../development/python-modules/bond-api { };
bond-async = callPackage ../development/python-modules/bond-async { };
booleanoperations = callPackage ../development/python-modules/booleanoperations { };
boolean-py = callPackage ../development/python-modules/boolean-py { };