diff options
Diffstat (limited to 'pkgs/servers/home-assistant')
| -rw-r--r-- | pkgs/servers/home-assistant/appdaemon.nix | 49 | ||||
| -rw-r--r-- | pkgs/servers/home-assistant/component-packages.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/home-assistant/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/home-assistant/frontend.nix | 4 |
4 files changed, 37 insertions, 39 deletions
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 2c0854d0a8b40..ef92ff9550ff7 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -4,34 +4,18 @@ let python = python3.override { packageOverrides = self: super: { bcrypt = super.bcrypt.overridePythonAttrs (oldAttrs: rec { - version = "3.1.4"; + version = "3.1.7"; src = oldAttrs.src.override { inherit version; - sha256 = "13cyrnqwkhc70rs6dg65z4yrrr3dc42fhk11804fqmci9hvimvb7"; + sha256 = "CwBpx1LsFBcsX3ggjxhj161nVab65v527CyA0TvkHkI="; }; }); yarl = super.yarl.overridePythonAttrs (oldAttrs: rec { - version = "1.1.0"; + version = "1.4.2"; src = oldAttrs.src.override { inherit version; - sha256 = "6af895b45bd49254cc309ac0fe6e1595636a024953d710e01114257736184698"; - }; - }); - - jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { - version = "2.10.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013"; - }; - }); - - aiohttp-jinja2 = super.aiohttp-jinja2.overridePythonAttrs (oldAttrs: rec { - version = "0.15.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0f390693f46173d8ffb95669acbb0e2a3ec54ecce676703510ad47f1a6d9dc83"; + sha256 = "WM2cRp7O1VjNgao/SEspJOiJcEngaIno/yUQQ1t+90s="; }; }); }; @@ -39,26 +23,43 @@ let in python.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "4.0.1"; + version = "4.0.5"; src = fetchFromGitHub { owner = "home-assistant"; repo = "appdaemon"; rev = version; - sha256 = "13qzjv11b0c7s1c66j70qmc222a78805n10lv2svj9yyk1v4xhjv"; + sha256 = "7o6DrTufAC+qK3dDfpkuQMQWuduCZ6Say/knI4Y07QM="; }; propagatedBuildInputs = with python.pkgs; [ daemonize astral requests websocket_client aiohttp yarl jinja2 aiohttp-jinja2 pyyaml voluptuous feedparser iso8601 bcrypt paho-mqtt setuptools - deepdiff dateutil bcrypt python-socketio pid + deepdiff dateutil bcrypt python-socketio pid pytz sockjs pygments + azure-mgmt-compute azure-mgmt-storage azure-mgmt-resource azure-keyvault-secrets azure-storage-blob ]; # no tests implemented doCheck = false; postPatch = '' - substituteInPlace requirements.txt --replace "pyyaml==5.1" "pyyaml" + substituteInPlace requirements.txt \ + --replace "pyyaml==5.3" "pyyaml" \ + --replace "pid==2.2.5" "pid" \ + --replace "Jinja2==2.11.1" "Jinja2" \ + --replace "pytz==2019.3" "pytz" \ + --replace "aiohttp==3.6.2" "aiohttp>=3.6" \ + --replace "iso8601==0.1.12" "iso8601>=0.1" \ + --replace "azure==4.0.0" "azure-mgmt-compute + azure-mgmt-storage + azure-mgmt-resource + azure-keyvault-secrets + azure-storage-blob" \ + --replace "sockjs==0.10.0" "sockjs" \ + --replace "deepdiff==4.3.1" "deepdiff" \ + --replace "voluptuous==0.11.7" "voluptuous" \ + --replace "astral==1.10.1" "astral" \ + --replace "python-socketio==4.4.0" "python-socketio" ''; meta = with lib; { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index fa54c2b5f265c..52f114bfe7f56 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.117.6"; + version = "0.118.0"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -85,6 +85,7 @@ "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ ]; + "blueprint" = ps: with ps; [ ]; "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez @@ -126,6 +127,7 @@ "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase "coinmarketcap" = ps: with ps; [ coinmarketcap ]; + "color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief "comed_hourly_pricing" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect "command_line" = ps: with ps; [ ]; @@ -367,7 +369,6 @@ "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser "hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py - "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink "icloud" = ps: with ps; [ pyicloud ]; @@ -528,7 +529,7 @@ "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient - "nest" = ps: with ps; [ aiohttp-cors python-nest ]; # missing inputs: google-nest-sdm + "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ ]; # missing inputs: netdata "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear @@ -623,7 +624,7 @@ "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall - "profiler" = ps: with ps; [ pyprof2calltree ]; + "profiler" = ps: with ps; [ objgraph pyprof2calltree ]; # missing inputs: guppy3 "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; @@ -659,7 +660,7 @@ "random" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client - "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste + "recollect_waste" = ps: with ps; [ ]; # missing inputs: aiorecollect "recorder" = ps: with ps; [ sqlalchemy ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch "reddit" = ps: with ps; [ praw ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8e5435350eee0..b7350a4efd27b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -24,11 +24,6 @@ let (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") - # Pinned due to an API change in pyowm>=3.0 - # Remove after https://github.com/home-assistant/core/pull/39839 gets merged - (mkOverride "pyowm" "2.10.0" - "1xvcv3sbcn9na8cwz21nnjlixysfk5lymnf65d1nqkbgacc1mm4g") - # Pinned, because v1.5.0 broke the google_translate integration # https://github.com/home-assistant/core/pull/38428 (mkOverride "yarl" "1.4.2" @@ -67,7 +62,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.117.6"; + hassVersion = "0.118.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1f9w7migwmdvnbiv4bi0b31zdfrsg87zgiz2l3gymn6w89f3h8y1"; + sha256 = "0q3kjsxp82r11gqsnwcw8rnqhgi46214hw84ibw8956w7h75ik5m"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -91,9 +86,10 @@ in with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \ + --replace "aiohttp==3.7.1" "aiohttp>=3.6.3" \ --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \ --replace "cryptography==3.2" "cryptography" \ + --replace "requests==2.25.0" "requests>=2.24.0" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index ce3403b8f537f..825576e92ad12 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ 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 = "20201021.4"; + version = "20201111.2"; src = fetchPypi { inherit pname version; - sha256 = "138h4cgvkn26xlr53ziz6d0zc00zw4wk40cpi4c4nia1lv6cqkxd"; + sha256 = "1pk4l78j72zn6gxc0yr3azdlcqwkvf7ki0khm176qpvs34scs1l8"; }; # no Python tests implemented |