From c225f2cfeed59f4872e0ab28b5be05dfa9ee8cff Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 21 Jan 2024 13:49:55 +0800 Subject: [PATCH] Fix language-c on windows --- .github/workflows/release.yaml | 4 ++-- cabal.project | 4 ++++ cabal.project.release | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fa3259e..7297e1c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -178,7 +178,7 @@ jobs: ARCH: 64 - os: windows-latest ARTIFACT: "x86_64-mingw64-ghcup" - GHC_VER: 9.2.8 + GHC_VER: 9.4.8 ARCH: 64 steps: - name: Checkout code @@ -414,7 +414,7 @@ jobs: DISTRO: na - os: windows-latest ARTIFACT: "x86_64-mingw64-ghcup" - GHC_VER: 9.2.8 + GHC_VER: 9.4.8 ARCH: 64 DISTRO: na diff --git a/cabal.project b/cabal.project index 6568a2f..d78cd41 100644 --- a/cabal.project +++ b/cabal.project @@ -12,6 +12,10 @@ else constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0 +if os(mingw32) + if impl(ghc >= 9.4) + constraints: language-c >= 0.9.3 + source-repository-package type: git location: https://github.com/haskell/tar.git diff --git a/cabal.project.release b/cabal.project.release index 97328b7..b01bf49 100644 --- a/cabal.project.release +++ b/cabal.project.release @@ -18,7 +18,9 @@ elif os(mingw32) constraints: zlib +bundled-c-zlib, lzma +static, text -simdutf, - vty-windows >=0.1.0.3 + vty-windows >=0.1.0.3 + if impl(ghc >= 9.4) + constraints: language-c >= 0.9.3 elif os(freebsd) constraints: zlib +bundled-c-zlib, zip +disable-zstd