Skip to content

Commit 874a5cf

Browse files
committed
Fix for gi-gtk test
1 parent cb886fd commit 874a5cf

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

test/cabal.project.local

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ if impl(ghc > 9.13)
1515
-- This prevents hsc2hs from causing old versions of packages from being added to plan.json
1616
allow-newer: hsc2hs:*
1717

18-
if impl(ghc >=9.10.1)
19-
extra-packages: process
20-
2118
repository head.hackage.ghc.haskell.org
2219
url: https://ghc.gitlab.haskell.org/head.hackage/
2320
secure: True

test/gi-gtk/default.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ in recurseIntoAttrs rec {
2525
# error: incompatible pointer to integer conversion assigning to 'ffi_arg' (aka 'unsigned long') from 'HsPtr' (aka 'void *') [-Wint-conversion]
2626
|| builtins.elem compiler-nix-name ["ghc8107" "ghc902" "ghc928" "ghc948"] && stdenv.hostPlatform.isAarch64
2727
# Cross compilation to aarch64 is also broken
28-
|| stdenv.hostPlatform.isAarch64 && !stdenv.buildPlatform.isAarch64
29-
# Building profiled version of Cabal for haskell-gi is currently broken for GHC head
30-
|| compiler-nix-name == "ghc91320241230";
28+
|| stdenv.hostPlatform.isAarch64 && !stdenv.buildPlatform.isAarch64;
3129

3230
ifdInputs = {
3331
inherit (project) plan-nix;

0 commit comments

Comments
 (0)