Merge branch 'staging-next' into staging

pkgs/development/python-modules/aiohttp/default.nix

@@ -34,6 +34,7 @@
   blockbuster,
   freezegun,
   gunicorn,
+  isa-l,
   isal,
   proxy-py,
   pytest-codspeed,
@@ -59,6 +60,10 @@ buildPythonPackage rec {
     hash = "sha256-/lzbGnF3+ufs+GPtm+avjQ+lGVCsiE2E64NkRHS3wCM=";
   };
 
+  patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [
+    ./remove-isal.patch
+  ];
+
   postPatch = ''
     rm -r vendor
     patchShebangs tools
@@ -105,7 +110,8 @@ buildPythonPackage rec {
     blockbuster
     freezegun
     gunicorn
-    isal
+    # broken on aarch64-darwin
+    (if lib.meta.availableOn stdenv.hostPlatform isa-l then isal else null)
     proxy-py
     pytest-codspeed
     pytest-cov-stub