From d2b91307e0bc83b93fba083fd4ba015e92e64820 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Mon, 9 Jun 2025 10:13:11 +1200 Subject: [PATCH 1/3] Use `-threaded` for iserv-proxy Fixes #2361 @luite tracked the failure down: > It's an async IO call that fails, async and fdwait have some limitations on Windows. the threaded runtime doesn't use them --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2ee0580d5d..174d2e4696 100644 --- a/flake.lock +++ b/flake.lock @@ -372,11 +372,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1749176681, - "narHash": "sha256-RLoo84PBSeGKbqMETsU0lEJDnc/oTx0l/TYzCaWqlgc=", + "lastModified": 1749420179, + "narHash": "sha256-ML6d2UJBNonKMVnsvM3mtS1mva8yUpJksKjwoeweQe8=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "6972fbc49574108cb48723bb94260e3ce17898f7", + "rev": "aff8850fa9fa363a0eebc87dba95b2e25c8dd9bc", "type": "github" }, "original": { From a9b1e52c2eba05aeddfbbaa26774fe9f3ee2cb56 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Mon, 9 Jun 2025 16:43:30 +1200 Subject: [PATCH 2/3] Disable threaded for aarch64 cross GHC 9.6.7 --- flake.lock | 6 +++--- overlays/haskell.nix | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 174d2e4696..062f6383e6 100644 --- a/flake.lock +++ b/flake.lock @@ -372,11 +372,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1749420179, - "narHash": "sha256-ML6d2UJBNonKMVnsvM3mtS1mva8yUpJksKjwoeweQe8=", + "lastModified": 1749443511, + "narHash": "sha256-asfdanBoIUcJ9XQWB3a/5wQGFG/6Uq6l2s9r8OuamkY=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "aff8850fa9fa363a0eebc87dba95b2e25c8dd9bc", + "rev": "e40eddb1ca1e3e906e018c7e6b0d1e51c930ec9d", "type": "github" }, "original": { diff --git a/overlays/haskell.nix b/overlays/haskell.nix index 3e6b6ac8d0..203b10db95 100644 --- a/overlays/haskell.nix +++ b/overlays/haskell.nix @@ -1053,6 +1053,14 @@ final: prev: { setupBuildFlags = final.lib.mkForce []; }; }]; + } // final.lib.optionalAttrs ( + final.stdenv.hostPlatform.isAarch64 + && buildins.compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8" < 0) { + # The th-dlls test fails for aarch64 cross GHC 9.6.7 when the threaded rts is used + cabalProjectLocal = '' + package iserv-proxy + flags: -threaded + ''; } // final.lib.optionalAttrs (__compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.10" > 0) { cabalProjectLocal = '' allow-newer: *:base, *:bytestring From 17a543e2928d82e5e4b20de1d5b99a57ba8efd79 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Mon, 9 Jun 2025 17:32:27 +1200 Subject: [PATCH 3/3] Fix typo --- overlays/haskell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlays/haskell.nix b/overlays/haskell.nix index 203b10db95..7671866b76 100644 --- a/overlays/haskell.nix +++ b/overlays/haskell.nix @@ -1055,7 +1055,7 @@ final: prev: { }]; } // final.lib.optionalAttrs ( final.stdenv.hostPlatform.isAarch64 - && buildins.compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8" < 0) { + && builtins.compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8" < 0) { # The th-dlls test fails for aarch64 cross GHC 9.6.7 when the threaded rts is used cabalProjectLocal = '' package iserv-proxy