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

Merge pull request #211210 from NixOS/home-assistant

Browse source 
home-assistant: 2023.1.4 -> 2023.1.5
This commit is contained in:
Martin Weinelt 2023-01-19 17:52:11 +00:00 committed by GitHub
parent ed8cab77e1 0ab7681f04
commit 00ae4c7fc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 144 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "dask-gateway";
# update dask-gateway lock step with dask-gateway-server
version = "2022.6.1";
version = "2023.1.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "dask";
repo = "dask-gateway";
rev = "refs/tags/${version}";
hash = "sha256-PsagZdEPpeuZH9hFL98xB5z6zOdd4Cx/skGQ0eOYkCA=";
hash = "sha256-+YCHIfNq8E2rXO8b91Q1D21dVzNWnJZIKZeY4AETa7s=";
};
sourceRoot = "source/dask-gateway";

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

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "dask";
version = "2022.10.2";
version = "2023.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -36,17 +36,9 @@ buildPythonPackage rec {
owner = "dask";
repo = pname;
rev = version;
hash = "sha256-zHJR2WjHigUMWtRJW25+gk1fKGKedU53BBjwx5zaodA=";
hash = "sha256-avyrKBAPyYZBNgItnkNCferqb6+4yeGpBAZhSkL/fFA=";
};
patches = [
(fetchpatch {
# Fix test_repartition_npartitions on platforms other than x86-64
url = "https://github.com/dask/dask/commit/65f40ad461c57065f981e6213e33b1d13cc9bc8f.patch";
hash = "sha256-KyTSms4ik1kYtL+I/huAxD+zK2AAuPkwmHA9FYk601Y=";
})
];
propagatedBuildInputs = [
click
cloudpickle

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

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "dateparser";
version = "1.1.5";
version = "1.1.6";
disabled = pythonOlder "3.7";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "scrapinghub";
repo = "dateparser";
rev = "refs/tags/v${version}";
sha256 = "sha256-uA49pRlmSWWIOjXa1QDjjuTGMKi25GfokQo4VQsBMlc=";
sha256 = "sha256-rn8RD1nnUi4MhK6QKLaP5eG6UAFrhlecimvn8sAsu6k=";
};
propagatedBuildInputs = [

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

@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "distributed";
version = "2022.12.1";
version = "2023.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-h/7c+/ISbRTDhlyORFxB7Mq9Kwfq/4dSivKv2eIM7Ww=";
hash = "sha256-xV3HQmmDtSIn+DM3Rcoyp3dqY9qSjB+8Con6+o6a/y0=";
};
postPatch = ''

36
pkgs/development/python-modules/fastparquet/default.nix
View file

@ -2,6 +2,9 @@
, buildPythonPackage
, fetchFromGitHub
, python
, cython
, setuptools
, substituteAll
, numba
, numpy
, pandas
@ -15,8 +18,8 @@
buildPythonPackage rec {
pname = "fastparquet";
version = "0.8.1";
format = "setuptools";
version = "2022.12.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,9 +27,29 @@ buildPythonPackage rec {
owner = "dask";
repo = pname;
rev = version;
hash = "sha256-rWrbHHcJMahaUV8+YuKkZUhdboNFUK9btjvdg74lCxc=";
hash = "sha256-/DSe2vZwrHHTuAXWJh9M1wCes5c4/QAVUnJVEI4Evyw=";
};
nativeBuildInputs = [
cython
setuptools
];
patches = [
(substituteAll {
src = ./version.patch;
inherit version;
})
];
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner'," "" \
--replace "oldest-supported-numpy" "numpy"
sed -i '/"git", "status"/d' setup.py
'';
propagatedBuildInputs = [
cramjam
fsspec
@ -46,13 +69,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest-runner'," "" \
--replace "oldest-supported-numpy" "numpy"
'';
# Workaround https://github.com/NixOS/nixpkgs/issues/123561
preCheck = ''
mv fastparquet/test .

7
pkgs/development/python-modules/fastparquet/version.patch Normal file
View file

@ -0,0 +1,7 @@
diff --git a/fastparquet/_version.py b/fastparquet/_version.py
new file mode 100644
index 0000000..eb2c9c9
--- /dev/null
+++ b/fastparquet/_version.py
@@ -0,0 +1 @@
+__version__ = "@version@"

4
pkgs/development/python-modules/google-nest-sdm/default.nix
View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-nest-sdm";
version = "2.1.2";
version = "2.2.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = "refs/tags/${version}";
hash = "sha256-TuAqd9r/iExBa9uxU3386C12ZD+LEJai7DkJtcoupEs=";
hash = "sha256-QeT4S8UlJQ0rCYG8+hc4cP1mM3KZlu/afFqz+LPIuVA=";
};
propagatedBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.36.3";
version = "0.36.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-X4Ym+UmAY/O6UB26CVrqLPD03WP/3uzOJdKW/aUCwrc=";
hash = "sha256-3n3TtyzosWsdnzT2m2s55hnY45Yjj7kJS3rv/5LTSSg=";
};
propagatedBuildInputs = [

19
pkgs/development/python-modules/python-miio/default.nix
View file

@ -9,10 +9,12 @@
, cryptography
, defusedxml
, fetchPypi
, fetchpatch
, importlib-metadata
, micloud
, netifaces
, poetry-core
, pytest-asyncio
, pytest-mock
, pytestCheckHook
, pythonOlder
@ -39,6 +41,14 @@ buildPythonPackage rec {
poetry-core
];
patches = [
(fetchpatch {
# Fix pytest 7.2 compat
url = "https://github.com/rytilahti/python-miio/commit/67d9d771d04d51f5bd97f361ca1c15ae4a18c274.patch";
hash = "sha256-Os9vCSKyieCqHs63oX6gcLrtv1N7hbX5WvEurelEp8w=";
})
];
propagatedBuildInputs = [
android-backup
appdirs
@ -59,18 +69,11 @@ buildPythonPackage rec {
];
checkInputs = [
pytest-asyncio
pytest-mock
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'defusedxml = "^0"' 'defusedxml = "*"'
# Will be fixed with the next release, https://github.com/rytilahti/python-miio/pull/1378
substituteInPlace miio/integrations/vacuum/roborock/vacuum_cli.py \
--replace "resultcallback" "result_callback"
'';
pythonImportsCheck = [
"miio"
];

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

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.1.4";
version = "2023.1.5";
components = {
"3_day_blinds" = ps: with ps; [
];

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

@ -33,6 +33,15 @@ let
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
(self: super: {
advantage-air = super.advantage-air.overridePythonAttrs (oldAttrs: rec {
version = "0.4.1";
src = super.fetchPypi {
pname = "advantage_air";
inherit version;
hash = "sha256-I9HMDLZX9xKDJuYSAweM2r4v3ZKevHTn5dHTYxN3EuE=";
};
});
# https://github.com/postlund/pyatv/issues/1879
aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
pname = "aiohttp";
@ -43,6 +52,16 @@ let
};
});
aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec {
version = "0.1.1";
src = fetchFromGitHub {
owner = "bachya";
repo = "aiowatttime";
rev = "refs/tags/${version}";
hash = "sha256-tWnxGLJT+CRFvkhxFamHxnLXBvoR8tfOvzH1o1i5JJg=";
};
});
astral = super.astral.overridePythonAttrs (oldAttrs: rec {
pname = "astral";
version = "2.2";
@ -75,6 +94,16 @@ let
checkInputs = old.checkInputs ++ [ self.nose ];
});
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=";
};
});
gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec {
version = "4.0.0";
src = fetchFromGitHub {
@ -94,6 +123,28 @@ let
};
});
# Pinned due to API changes in 10.0
mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec {
version = "9.3.0";
src = fetchFromGitHub {
owner = "py-mine";
repo = "mcstatus";
rev = "refs/tags/v${version}";
hash = "sha256-kNThVElEDqhbCitktBv5tQkjMaU4IsX0dJk63hvLhb0=";
};
});
# Pinned due to API changes in 1.3.0
ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec {
version = "1.2.0";
src = fetchFromGitHub {
owner = "timmo001";
repo = "ovoenergy";
rev = "refs/tags/v${version}";
hash = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI=";
};
});
# Pinned due to API changes in 0.1.0
poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec {
version = "0.0.8";
@ -115,6 +166,16 @@ let
};
});
# https://github.com/home-assistant/core/pull/80931
pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
version = "2.5.0";
src = super.fetchPypi {
pname = "PyJWT";
inherit version;
hash = "sha256-53q4lICQXYaZhEKsV4jzUzP6hfZQR6U0rcOO3zyI/Ds=";
};
});
pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec {
version = "2.5.3";
src = fetchFromGitHub {
@ -125,6 +186,17 @@ let
};
});
# Pinned due to API changes in 1.0.24
pysensibo = super.pysensibo.overridePythonAttrs (oldAttrs: rec {
version = "1.0.22";
src = fetchFromGitHub {
owner = "andrey-git";
repo = "pysensibo";
rev = "refs/tags/${version}";
hash = "sha256-AUcdKcdoYCg8OgUcFoLLpNK5GQMTg89XCR5CkTfNkcc=";
};
});
python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
pname = "python-slugify";
version = "4.0.1";
@ -204,6 +276,16 @@ let
};
});
# Pinned due to API changes in 2.0
vsure = super.vsure.overridePythonAttrs (oldAttrs: rec {
version = "1.8.1";
src = super.fetchPypi {
pname = "vsure";
inherit version;
hash = "sha256-Zh83t7yjZU2NjOgCkqPUHbqvEyEWXGITRgr5d2fLtRI=";
};
});
# Pinned due to API changes ~1.0
vultr = super.vultr.overridePythonAttrs (oldAttrs: rec {
version = "0.1.2";
@ -243,7 +325,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 = "2023.1.4";
hassVersion = "2023.1.5";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -261,7 +343,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-up6AKdrbiLuVf58yDUGlNME7qVFbegnnb3zoTF4Gj3s=";
hash = "sha256-gqWkj90Vw+Pne0Iseet1Jz0Eh3YpUiqspGltvU5Pxro=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

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

@ -121,6 +121,9 @@ in lib.listToAttrs (map (component: lib.nameValuePair component (
meta = old.meta // {
broken = lib.elem component [
# all tests are skipped
# https://github.com/home-assistant/core/blob/dev/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py#L23
"homeassistant_hardware"
];
# upstream only tests on Linux, so do we.
platforms = lib.platforms.linux;