From b71417e791dcf9d48a42a3c052fe572a4f420c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 29 Jun 2026 15:18:48 +0200
Subject: [PATCH 1/4] isa-l: mark unbroken for aarch64-darwin

Tested with a gzip encoded test file and works without errors.
---
 pkgs/by-name/is/isa-l/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/is/isa-l/package.nix b/pkgs/by-name/is/isa-l/package.nix
index 22bdfce4ef02..ae3af26a13b4 100644
--- a/pkgs/by-name/is/isa-l/package.nix
+++ b/pkgs/by-name/is/isa-l/package.nix
@@ -97,9 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ jbedo ];
     platforms = lib.platforms.all;
     badPlatforms = [
-      # <instantiation>:4:26: error: unexpected token in argument list
-      #  movk x7, p4_low_b1, lsl 16
-      "aarch64-darwin"
       # https://github.com/intel/isa-l/issues/188
       "i686-linux"
     ];

From a74c47e5d1cdbcf8e0a3be7ed83ce567bf497ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 30 Jun 2026 08:41:58 +0200
Subject: [PATCH 2/4] isa-l: mark unbroken for i686-linux

---
 pkgs/by-name/is/isa-l/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/is/isa-l/package.nix b/pkgs/by-name/is/isa-l/package.nix
index ae3af26a13b4..6aa81650728e 100644
--- a/pkgs/by-name/is/isa-l/package.nix
+++ b/pkgs/by-name/is/isa-l/package.nix
@@ -96,9 +96,5 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/intel/isa-l/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ jbedo ];
     platforms = lib.platforms.all;
-    badPlatforms = [
-      # https://github.com/intel/isa-l/issues/188
-      "i686-linux"
-    ];
   };
 })

From 8ee90271bed9a9ab63e1b18b6ba32b4a04cbd8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 30 Jun 2026 08:39:03 +0200
Subject: [PATCH 3/4] python314Packages.aiohttp: drop unused inputs

---
 pkgs/development/python-modules/aiohttp/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 9b76c5565090..e6fe548878bc 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  replaceVars,
   isPyPy,
   pythonOlder,
 
@@ -18,7 +17,6 @@
   # dependencies
   aiohappyeyeballs,
   aiosignal,
-  async-timeout,
   attrs,
   backports-zstd,
   frozenlist,

From f1921ed9229bfb199dfda3aa397e3defa3fc0a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 30 Jun 2026 08:44:48 +0200
Subject: [PATCH 4/4] python314Packages.aiohttp: remove now unused isal
 condition

---
 pkgs/development/python-modules/aiohttp/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index e6fe548878bc..15ef808fcecf 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -33,7 +33,6 @@
   blockbuster,
   freezegun,
   gunicorn,
-  isa-l,
   isal,
   proxy-py,
   pytest-codspeed,
@@ -107,8 +106,7 @@ buildPythonPackage rec {
     blockbuster
     freezegun
     gunicorn
-    # broken on aarch64-darwin
-    (if lib.meta.availableOn stdenv.hostPlatform isa-l then isal else null)
+    isal
     proxy-py
     pytest-codspeed
     pytest-cov-stub