Merge pull request #110525 from dotlambda/pyyaml-5.4.1

[staging] pythonPackages.pyyaml: 5.3.1 -> 5.4.1

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 ];

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"'

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