From fef69cb5b8de60d520a2a406d20a55a57afe2825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 22 Jan 2021 19:40:31 +0100 Subject: [PATCH 1/3] pythonPackages.pyyaml: 5.3.1 -> 5.4.1 --- pkgs/development/python-modules/pyyaml/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 95ceeab3a04..93cfad78d50 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -2,18 +2,13 @@ buildPythonPackage rec { pname = "PyYAML"; - version = "5.3.1"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0pb4zvkfxfijkpgd1b86xjsqql97ssf1knbd1v53wkg1qm9cgsmq"; + sha256 = "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"; }; - # force regeneration using Cython - postPatch = '' - rm ext/_yaml.c - ''; - nativeBuildInputs = [ cython buildPackages.stdenv.cc ]; buildInputs = [ libyaml ]; From 0f8ab41b390eab0945d9f96819c0175448f568c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Jan 2021 10:16:52 +0100 Subject: [PATCH 2/3] awscli: don't pin PyYAML --- pkgs/tools/admin/awscli/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 5b437e06afc..a945e3eedd5 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -35,8 +35,12 @@ in with py.pkgs; buildPythonApplication rec { sha256 = "sha256-G8HonN02eFcfMRhj9+cporugVsF7nDeHEopuHnbS1Is="; }; + # https://github.com/aws/aws-cli/issues/4837 + # https://github.com/aws/aws-cli/pull/5887 postPatch = '' - substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" + substituteInPlace setup.py \ + --replace "docutils>=0.10,<0.16" "docutils>=0.10" \ + --replace "PyYAML>=3.10,<5.4" "PyYAML>=3.10" ''; # No tests included From c65a1caf2f2c3d7335e3c50094d7719d93082f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 25 Jan 2021 11:46:02 +0100 Subject: [PATCH 3/3] home-assistant: unpin PyYAML Also remove a substitution that no longer applies. --- pkgs/servers/home-assistant/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3a6b5d35320..84c5038b041 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -84,11 +84,11 @@ in with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "aiohttp==3.7.1" "aiohttp>=3.6.3" \ --replace "attrs==19.3.0" "attrs>=19.3.0" \ --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \ --replace "cryptography==3.2" "cryptography" \ --replace "pip>=8.0.3,<20.3" "pip" \ + --replace "pyyaml==5.3.1" "pyyaml>=5.3.1" \ --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"'