Disable shell-for for armv7

hamishmack · hamishmack · commit 3321fca5844e · 2025-03-04T12:01:12.000+13:00
diff --git a/test/plugin/default.nix b/test/plugin/default.nix
@@ -24,7 +24,6 @@ in recurseIntoAttrs {
     || stdenv.hostPlatform.isMusl
     || stdenv.hostPlatform.isGhcjs
     || stdenv.hostPlatform.isWindows
-    || (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64)
-    || (haskellLib.isCrossHost && stdenv.hostPlatform.isArmv7);
+    || (haskellLib.isCrossHost && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32));
   build = packages.test.components.library;
 }
diff --git a/test/shell-for/default.nix b/test/shell-for/default.nix
@@ -56,7 +56,7 @@ in recurseIntoAttrs {
   meta.disabled = stdenv.hostPlatform.isMusl
     || stdenv.hostPlatform.isGhcjs
     || stdenv.hostPlatform.isWindows
-    || (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64);
+    || (haskellLib.isCrossHost && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32));
   inherit env envPkga envDefault;
   run = stdenv.mkDerivation {
     name = "shell-for-test";

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ in recurseIntoAttrs {`
`24`	`24`	`\|\| stdenv.hostPlatform.isMusl`
`25`	`25`	`\|\| stdenv.hostPlatform.isGhcjs`
`26`	`26`	`\|\| stdenv.hostPlatform.isWindows`
`27`		`- \|\| (haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64)`
`28`		`- \|\| (haskellLib.isCrossHost && stdenv.hostPlatform.isArmv7);`
	`27`	`+ \|\| (haskellLib.isCrossHost && (stdenv.hostPlatform.isAarch64 \|\| stdenv.hostPlatform.isAarch32));`
`29`	`28`	`build = packages.test.components.library;`
`30`	`29`	`}`