From 4702290465abc438e8f8e4ee6a5fa5be8d530741 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Jan 2021 02:19:52 +0100 Subject: [PATCH 1/4] home-assistant: 2021.1.4 -> 2021.1.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7f1df3049b4a..22aafbb86a66 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 = "2021.1.4"; + version = "2021.1.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a54eca3952fb..3a6b5d353209 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -57,7 +57,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.1.4"; + hassVersion = "2021.1.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "03aa7kd216rnp8h80nv002ahafiy0031lxk1bkwcirrznphcw7sj"; + sha256 = "sha256-xi5rHZlhwgEHll3TFlRu7D963tdcQNMmWcoXVjEFLXo="; }; # leave this in, so users don't have to constantly update their downstream patch handling From fb1c27f9e9fe4e999b608c05438e40d3fe9dc2d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Jan 2021 02:37:01 +0100 Subject: [PATCH 2/4] python3Packages.pybotvac: 0.0.18 -> 0.0.20 --- .../python-modules/pybotvac/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 06ebf85ffe8c..ca093ba8e8bb 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -1,18 +1,33 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, requests_oauthlib +, voluptuous +}: buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.18"; + version = "0.0.20"; src = fetchPypi { inherit pname version; - sha256 = "e983c9ffc0734c2e5a7c2adf5d0d0dfe399d94157c590ef70fad765f882c341f"; + sha256 = "sha256-1NnTSO4vO3Ryt4vYD5ZTQGr241GqA2KsGRBVowSTCzM="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + requests_oauthlib + voluptuous + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "pybotvac" ]; meta = with lib; { - description = "Python package for controlling Neato pybotvac Connected vacuum robot"; + description = "Python module for interacting with Neato Botvac Connected vacuum robots"; homepage = "https://github.com/stianaske/pybotvac"; license = licenses.mit; maintainers = with maintainers; [ elseym ]; From c984bc100d6d64c638c075057f66eb6cbe96cf40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Jan 2021 02:50:04 +0100 Subject: [PATCH 3/4] python3Packages.pyatmo: 4.2.1 -> 4.2.2 --- pkgs/development/python-modules/pyatmo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 22acf8725260..6bea15df386f 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -12,20 +12,20 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "4.2.1"; + version = "4.2.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; - repo = "netatmo-api-python"; + repo = "pyatmo"; rev = "v${version}"; - sha256 = "12lmjhqjn71a358nkpzl3dwgiwmmz4lcv9f0qf69ngznpiirk28m"; + sha256 = "sha256-3IxDDLa8KMHVkHAeTmdNVRPc5aKzF3VwL2kKnG8Fp7I="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "oauthlib~=3.1.0" "oauthlib" \ - --replace "requests~=2.23.0" "requests" + --replace "oauthlib~=3.1" "oauthlib" \ + --replace "requests~=2.24" "requests" ''; propagatedBuildInputs = [ From bbc23a42dbd04e7ea1a17554cc7266ec408d82c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 24 Jan 2021 03:34:45 +0100 Subject: [PATCH 4/4] python3Packages.asgi-csrf: 0.7.1 -> 0.8 --- .../python-modules/asgi-csrf/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index eabb3d525cae..4988a04e8e44 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -1,8 +1,17 @@ -{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart -, pytestCheckHook, starlette, httpx, pytest-asyncio }: +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, itsdangerous +, python-multipart +, pytestCheckHook +, starlette +, httpx +, pytest-asyncio +}: buildPythonPackage rec { - version = "0.7.1"; + version = "0.8"; pname = "asgi-csrf"; disabled = isPy27; @@ -11,7 +20,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "1hhqrb9r46y6i3d3w6hc9zm6yyikdyd2k5pcbyw0r9fl959yi4hf"; + sha256 = "sha256-0I/p9SjVVZhJQeR7s1R3tooP9XMNLPlcxl0dBSzsVaw="; }; propagatedBuildInputs = [ @@ -26,10 +35,7 @@ buildPythonPackage rec { starlette ]; - # tests fail while importing a private module from httpx - # E ModuleNotFoundError: No module named 'httpx._content_streams' - # https://github.com/simonw/asgi-csrf/issues/18 - doCheck = false; + doCheck = false; # asgi-lifespan missing pythonImportsCheck = [ "asgi_csrf" ];