From 5329be61d71dc50e4c54eed42ebea8851af9f259 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Feb 2022 09:39:38 +0100 Subject: [PATCH 1/4] python3Packages.python-slugify: 5.0.2 -> 6.1.0 --- .../python-modules/python-slugify/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 5b7af8ad7360..16c4dc0f2308 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -9,12 +9,14 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "5.0.2"; + version = "6.1.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8TODoLn8vmSaGJK5yOtPjqsdbYS4S7emJDF6+pgVnKs="; + hash = "sha256-7/GQ5N+sl9L4wYkO5oJwns0jZQdCNhaH24LZXh5eJfU="; }; propagatedBuildInputs = [ @@ -26,9 +28,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + pytestFlagsArray = [ + "test.py" + ]; - pythonImportsCheck = [ "slugify" ]; + pythonImportsCheck = [ + "slugify" + ]; meta = with lib; { description = "Python Slugify application that handles Unicode"; From a81f54aeac2233203b56703156f07ddfdbc849c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Feb 2022 09:39:56 +0100 Subject: [PATCH 2/4] python3Packages.python-benedict: 0.24.3 -> 0.25.0 --- .../python-modules/python-benedict/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 9cf5ffc63abf..bf386d6d62dc 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -2,16 +2,15 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, pythonOlder - +, ftfy , mailchecker , phonenumbers +, pytestCheckHook , python-dateutil , python-fsutil +, pythonOlder , python-slugify , pyyaml -, ftfy , requests , six , toml @@ -20,7 +19,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.24.3"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = version; - hash = "sha256-06n8MNoGQRSrBK2XeEBBoQ2NIXWf0qXPVBeP9ERMEj0="; + hash = "sha256-G7pTbxNcESMUiKpQxjiF0gwN5mBhmuwIDlzauN5JCB4="; }; propagatedBuildInputs = [ From 6c8a4643a2704a23fc9b82c6cc6530235a626876 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 25 Feb 2022 11:50:32 +0100 Subject: [PATCH 3/4] python3Packages.poolsense: migrate to hash option in fetcher --- pkgs/development/python-modules/poolsense/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix index 10e50804ef58..53d142299707 100644 --- a/pkgs/development/python-modules/poolsense/default.nix +++ b/pkgs/development/python-modules/poolsense/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; + hash = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; }; propagatedBuildInputs = [ aiohttp ]; From da5eb638f33b5021ca44b8d0161284c0c6432bb0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 25 Feb 2022 11:51:03 +0100 Subject: [PATCH 4/4] home-assistant: migrate mkOverride to use hash --- pkgs/servers/home-assistant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 920343de67b6..45dd9b58c8cd 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -29,7 +29,7 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt - (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") + (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=") (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { @@ -58,7 +58,7 @@ let }) # Pinned due to API changes in 0.1.0 - (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") + (mkOverride "poolsense" "0.0.8" "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=") # Pinned due to API changes >0.3.5.3 (self: super: { @@ -105,12 +105,12 @@ let }) ]; - mkOverride = attrName: version: sha256: + mkOverride = attrName: version: hash: self: super: { ${attrName} = super.${attrName}.overridePythonAttrs (oldAttrs: { inherit version; src = oldAttrs.src.override { - inherit version sha256; + inherit version hash; }; }); };