diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 10:28:52 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 10:28:52 +0100 |
commit | 76a439239eb310d9ad76d998b34d5d3bc0e37acb (patch) | |
tree | 69e2f87d4a1ec8f8962d35e330188afcf8f88dcb /pkgs/servers/home-assistant/appdaemon.nix | |
parent | 080f1e7f5c94a171d070d1990104e06880589ca0 (diff) | |
parent | 2b3d2dbaf9f76519082126074b3aae26d2ced67f (diff) | |
download | nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar.gz nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar.bz2 nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar.lz nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar.xz nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar.zst nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/home-assistant/appdaemon.nix')
-rw-r--r-- | pkgs/servers/home-assistant/appdaemon.nix | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 47d9e88999af..258e46db1990 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -1,18 +1,14 @@ -{ lib, python3 }: +{ lib, python3, fetchFromGitHub }: let python = python3.override { packageOverrides = self: super: { - - aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "2.3.10"; + bcrypt = super.bcrypt.overridePythonAttrs (oldAttrs: rec { + version = "3.1.4"; src = oldAttrs.src.override { inherit version; - sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; + sha256 = "13cyrnqwkhc70rs6dg65z4yrrr3dc42fhk11804fqmci9hvimvb7"; }; - # TODO: remove after pinning aiohttp to a newer version - propagatedBuildInputs = with self; [ chardet multidict async-timeout yarl idna-ssl ]; - doCheck = false; }); yarl = super.yarl.overridePythonAttrs (oldAttrs: rec { @@ -43,23 +39,26 @@ let in python.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "3.0.5"; + version = "4.0.1"; - src = python.pkgs.fetchPypi { - inherit pname version; - sha256 = "623897ce08dc2efe24d04380df36e4b7fb35c0e4007e882857d4047f0b60349d"; + src = fetchFromGitHub { + owner = "home-assistant"; + repo = "appdaemon"; + rev = version; + sha256 = "13qzjv11b0c7s1c66j70qmc222a78805n10lv2svj9yyk1v4xhjv"; }; propagatedBuildInputs = with python.pkgs; [ - daemonize astral requests sseclient websocket_client aiohttp yarl jinja2 + daemonize astral requests websocket_client aiohttp yarl jinja2 aiohttp-jinja2 pyyaml voluptuous feedparser iso8601 bcrypt paho-mqtt setuptools + deepdiff dateutil bcrypt python-socketio pid ]; # no tests implemented doCheck = false; postPatch = '' - substituteInPlace setup.py --replace "pyyaml==5.1" "pyyaml" + substituteInPlace requirements.txt --replace "pyyaml==5.1" "pyyaml" ''; meta = with lib; { |