Support GHC-9.6 wrt #979

haskell · Apr 15, 2024 · b795f6c · b795f6c
1 parent eebbc99
commit b795f6c
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 59 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -36,7 +36,7 @@ jobs:
             ARCH: 32
           - os: ubuntu-latest
             ARTIFACT: "x86_64-linux-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: 64
     steps:
       - name: Checkout code
@@ -100,7 +100,7 @@ jobs:
             ARCH: ARM
           - os: [self-hosted, Linux, ARM64, maerwald]
             ARTIFACT: "aarch64-linux-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: ARM64
     steps:
       - name: git config
@@ -166,15 +166,15 @@ jobs:
         include:
           - os: [self-hosted, macOS, ARM64]
             ARTIFACT: "aarch64-apple-darwin-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: ARM64
           - os: macOS-11
             ARTIFACT: "x86_64-apple-darwin-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: 64
           - os: windows-latest
             ARTIFACT: "x86_64-mingw64-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: 64
     steps:
       - name: Checkout code
@@ -253,7 +253,7 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       S3_HOST: ${{ secrets.S3_HOST }}
       ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-      GHC_VER: 9.4.8
+      GHC_VER: 9.6.4
       ARCH: 64
       DISTRO: na
       RUNNER_OS: FreeBSD
@@ -295,12 +295,12 @@ jobs:
             DISTRO: Alpine
           - os: ubuntu-latest
             ARTIFACT: "x86_64-linux-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: 64
             DISTRO: Alpine
           - os: ubuntu-latest
             ARTIFACT: "x86_64-linux-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: 64
             DISTRO: Ubuntu
 
@@ -373,7 +373,7 @@ jobs:
             DISTRO: Ubuntu
           - os: [self-hosted, Linux, ARM64, maerwald]
             ARTIFACT: "aarch64-linux-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: ARM64
             DISTRO: Ubuntu
 
@@ -432,17 +432,17 @@ jobs:
         include:
           - os: [self-hosted, macOS, ARM64]
             ARTIFACT: "aarch64-apple-darwin-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: ARM64
             DISTRO: na
           - os: macOS-11
             ARTIFACT: "x86_64-apple-darwin-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: 64
             DISTRO: na
           - os: windows-latest
             ARTIFACT: "x86_64-mingw64-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.4
             ARCH: 64
             DISTRO: na
 
@@ -504,7 +504,7 @@ jobs:
       MACOSX_DEPLOYMENT_TARGET: 10.13
       JSON_VERSION: "0.0.8"
       ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-      GHC_VER: 9.4.8
+      GHC_VER: 9.6.4
       ARCH: 64
       DISTRO: na
       RUNNER_OS: FreeBSD

diff --git a/cabal.ghc8107.Unix.project b/cabal.ghc8107.Unix.project
@@ -11,7 +11,7 @@ else
 
 constraints: http-io-streams -brotli,
              any.aeson >= 2.0.1.0,
-             any.hsc2hs ==0.68.8,
+             any.hsc2hs >=0.68.10,
              bzlib-conduit >= 0.3.0.3,
              bz2 >= 1.0.1.1,
              bzlib >= 0.5.2.0,
@@ -51,10 +51,13 @@ package aeson
   flags: +ordered-keymap
 
 package streamly
-  flags: +use-unliftio
+  flags: +use-unliftio -streamly-core
 
 package *
   test-show-details: direct
 
-allow-newer: cabal-install-parsers:tar, streamly:Win32
+if impl(ghc >= 9.6)
+  allow-newer: streamly:Win32, streamly:ghc-prim, streamly:unicode-data, streamly:base, semigroupoids:base
+else
+  allow-newer: streamly:Win32
 
diff --git a/cabal.ghc8107.Unix.project.freeze b/cabal.ghc8107.Unix.project.freeze
@@ -1,6 +1,6 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.10.2.1,
-             any.Cabal-syntax ==3.10.2.0,
+constraints: any.Cabal ==3.10.3.0,
+             any.Cabal-syntax ==3.10.3.0,
              any.HUnit ==1.6.2.0,
              any.HsOpenSSL ==0.11.7.6,
              HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
@@ -34,7 +34,7 @@ constraints: any.Cabal ==3.10.2.1,
              any.base-orphans ==0.9.1,
              any.base16-bytestring ==1.0.2.0,
              any.base64-bytestring ==1.2.1.0,
-             any.bifunctors ==5.6.1,
+             any.bifunctors ==5.6.2,
              bifunctors +tagged,
              any.bimap ==0.5.0,
              any.binary ==0.8.9.1,
@@ -103,9 +103,10 @@ constraints: any.Cabal ==3.10.2.1,
              any.haskell-lexer ==1.1.1,
              any.haskus-utils-data ==1.4,
              any.haskus-utils-types ==1.5.1,
-             any.haskus-utils-variant ==3.3,
+             any.haskus-utils-variant ==3.4,
+             haskus-utils-variant +unliftio,
              any.heaps ==0.4,
-             any.hsc2hs ==0.68.8,
+             any.hsc2hs ==0.68.10,
              hsc2hs -in-ghc-tree,
              any.hspec ==2.10.10,
              any.hspec-core ==2.10.10,
@@ -213,7 +214,7 @@ constraints: any.Cabal ==3.10.2.1,
              any.text-zipper ==0.13,
              any.tf-random ==0.5,
              any.th-abstraction ==0.6.0.0,
-             any.th-compat ==0.1.4,
+             any.th-compat ==0.1.5,
              any.th-lift ==0.8.4,
              any.th-lift-instances ==0.1.20,
              any.these ==1.2,
@@ -257,4 +258,4 @@ constraints: any.Cabal ==3.10.2.1,
              any.zlib ==0.6.3.0,
              zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
              any.zlib-bindings ==0.1.1.5
-index-state: hackage.haskell.org 2024-03-13T09:43:35Z
+index-state: hackage.haskell.org 2024-03-31T04:30:41Z
diff --git a/cabal.ghc902.Unix.project b/cabal.ghc902.Unix.project
@@ -11,7 +11,7 @@ else
 
 constraints: http-io-streams -brotli,
              any.aeson >= 2.0.1.0,
-             any.hsc2hs ==0.68.8,
+             any.hsc2hs >=0.68.10,
              bzlib-conduit >= 0.3.0.3,
              bz2 >= 1.0.1.1,
              bzlib >= 0.5.2.0,
@@ -51,10 +51,13 @@ package aeson
   flags: +ordered-keymap
 
 package streamly
-  flags: +use-unliftio
+  flags: +use-unliftio -streamly-core
 
 package *
   test-show-details: direct
 
-allow-newer: cabal-install-parsers:tar, streamly:Win32
+if impl(ghc >= 9.6)
+  allow-newer: streamly:Win32, streamly:ghc-prim, streamly:unicode-data, streamly:base, semigroupoids:base
+else
+  allow-newer: streamly:Win32
 
diff --git a/cabal.ghc902.Unix.project.freeze b/cabal.ghc902.Unix.project.freeze
@@ -1,6 +1,6 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.10.2.1,
-             any.Cabal-syntax ==3.10.2.0,
+constraints: any.Cabal ==3.10.3.0,
+             any.Cabal-syntax ==3.10.3.0,
              any.HUnit ==1.6.2.0,
              any.HsOpenSSL ==0.11.7.6,
              HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
@@ -34,7 +34,7 @@ constraints: any.Cabal ==3.10.2.1,
              any.base-orphans ==0.9.1,
              any.base16-bytestring ==1.0.2.0,
              any.base64-bytestring ==1.2.1.0,
-             any.bifunctors ==5.6.1,
+             any.bifunctors ==5.6.2,
              bifunctors +tagged,
              any.bimap ==0.5.0,
              any.binary ==0.8.9.1,
@@ -109,9 +109,10 @@ constraints: any.Cabal ==3.10.2.1,
              any.haskell-lexer ==1.1.1,
              any.haskus-utils-data ==1.4,
              any.haskus-utils-types ==1.5.1,
-             any.haskus-utils-variant ==3.3,
+             any.haskus-utils-variant ==3.4,
+             haskus-utils-variant +unliftio,
              any.heaps ==0.4,
-             any.hsc2hs ==0.68.8,
+             any.hsc2hs ==0.68.10,
              hsc2hs -in-ghc-tree,
              any.hspec ==2.10.10,
              any.hspec-core ==2.10.10,
@@ -219,7 +220,7 @@ constraints: any.Cabal ==3.10.2.1,
              any.text-zipper ==0.13,
              any.tf-random ==0.5,
              any.th-abstraction ==0.6.0.0,
-             any.th-compat ==0.1.4,
+             any.th-compat ==0.1.5,
              any.th-lift ==0.8.4,
              any.th-lift-instances ==0.1.20,
              any.these ==1.2,
@@ -270,4 +271,4 @@ constraints: any.Cabal ==3.10.2.1,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-03-13T09:43:35Z
+index-state: hackage.haskell.org 2024-03-31T04:30:41Z
diff --git a/cabal.ghc928.Unix.project b/cabal.ghc928.Unix.project
@@ -11,7 +11,7 @@ else
 
 constraints: http-io-streams -brotli,
              any.aeson >= 2.0.1.0,
-             any.hsc2hs ==0.68.8,
+             any.hsc2hs >=0.68.10,
              bzlib-conduit >= 0.3.0.3,
              bz2 >= 1.0.1.1,
              bzlib >= 0.5.2.0,
@@ -51,10 +51,13 @@ package aeson
   flags: +ordered-keymap
 
 package streamly
-  flags: +use-unliftio
+  flags: +use-unliftio -streamly-core
 
 package *
   test-show-details: direct
 
-allow-newer: cabal-install-parsers:tar, streamly:Win32
+if impl(ghc >= 9.6)
+  allow-newer: streamly:Win32, streamly:ghc-prim, streamly:unicode-data, streamly:base, semigroupoids:base
+else
+  allow-newer: streamly:Win32
 
diff --git a/cabal.ghc928.Unix.project.freeze b/cabal.ghc928.Unix.project.freeze
@@ -1,6 +1,6 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.10.2.1,
-             any.Cabal-syntax ==3.10.2.0,
+constraints: any.Cabal ==3.10.3.0,
+             any.Cabal-syntax ==3.10.3.0,
              any.HUnit ==1.6.2.0,
              any.HsOpenSSL ==0.11.7.6,
              HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
@@ -34,7 +34,7 @@ constraints: any.Cabal ==3.10.2.1,
              any.base-orphans ==0.9.1,
              any.base16-bytestring ==1.0.2.0,
              any.base64-bytestring ==1.2.1.0,
-             any.bifunctors ==5.6.1,
+             any.bifunctors ==5.6.2,
              bifunctors +tagged,
              any.bimap ==0.5.0,
              any.binary ==0.8.9.0,
@@ -109,9 +109,10 @@ constraints: any.Cabal ==3.10.2.1,
              any.haskell-lexer ==1.1.1,
              any.haskus-utils-data ==1.4,
              any.haskus-utils-types ==1.5.1,
-             any.haskus-utils-variant ==3.3,
+             any.haskus-utils-variant ==3.4,
+             haskus-utils-variant +unliftio,
              any.heaps ==0.4,
-             any.hsc2hs ==0.68.8,
+             any.hsc2hs ==0.68.10,
              hsc2hs -in-ghc-tree,
              any.hspec ==2.10.10,
              any.hspec-core ==2.10.10,
@@ -219,7 +220,7 @@ constraints: any.Cabal ==3.10.2.1,
              any.text-zipper ==0.13,
              any.tf-random ==0.5,
              any.th-abstraction ==0.6.0.0,
-             any.th-compat ==0.1.4,
+             any.th-compat ==0.1.5,
              any.th-lift ==0.8.4,
              any.th-lift-instances ==0.1.20,
              any.these ==1.2,
@@ -270,4 +271,4 @@ constraints: any.Cabal ==3.10.2.1,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-03-13T09:43:35Z
+index-state: hackage.haskell.org 2024-03-31T04:30:41Z
diff --git a/cabal.ghc948.Unix.project b/cabal.ghc948.Unix.project
@@ -11,7 +11,7 @@ else
 
 constraints: http-io-streams -brotli,
              any.aeson >= 2.0.1.0,
-             any.hsc2hs ==0.68.8,
+             any.hsc2hs >=0.68.10,
              bzlib-conduit >= 0.3.0.3,
              bz2 >= 1.0.1.1,
              bzlib >= 0.5.2.0,
@@ -51,10 +51,13 @@ package aeson
   flags: +ordered-keymap
 
 package streamly
-  flags: +use-unliftio
+  flags: +use-unliftio -streamly-core
 
 package *
   test-show-details: direct
 
-allow-newer: cabal-install-parsers:tar, streamly:Win32
+if impl(ghc >= 9.6)
+  allow-newer: streamly:Win32, streamly:ghc-prim, streamly:unicode-data, streamly:base, semigroupoids:base
+else
+  allow-newer: streamly:Win32
 
diff --git a/cabal.ghc948.Unix.project.freeze b/cabal.ghc948.Unix.project.freeze
@@ -1,6 +1,6 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.10.2.1,
-             any.Cabal-syntax ==3.10.2.0,
+constraints: any.Cabal ==3.10.3.0,
+             any.Cabal-syntax ==3.10.3.0,
              any.HUnit ==1.6.2.0,
              any.HsOpenSSL ==0.11.7.6,
              HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
@@ -34,7 +34,7 @@ constraints: any.Cabal ==3.10.2.1,
              any.base-orphans ==0.9.1,
              any.base16-bytestring ==1.0.2.0,
              any.base64-bytestring ==1.2.1.0,
-             any.bifunctors ==5.6.1,
+             any.bifunctors ==5.6.2,
              bifunctors +tagged,
              any.bimap ==0.5.0,
              any.binary ==0.8.9.1,
@@ -108,9 +108,10 @@ constraints: any.Cabal ==3.10.2.1,
              any.haskell-lexer ==1.1.1,
              any.haskus-utils-data ==1.4,
              any.haskus-utils-types ==1.5.1,
-             any.haskus-utils-variant ==3.3,
+             any.haskus-utils-variant ==3.4,
+             haskus-utils-variant +unliftio,
              any.heaps ==0.4,
-             any.hsc2hs ==0.68.8,
+             any.hsc2hs ==0.68.10,
              hsc2hs -in-ghc-tree,
              any.hspec ==2.10.10,
              any.hspec-core ==2.10.10,
@@ -217,7 +218,7 @@ constraints: any.Cabal ==3.10.2.1,
              any.text-zipper ==0.13,
              any.tf-random ==0.5,
              any.th-abstraction ==0.6.0.0,
-             any.th-compat ==0.1.4,
+             any.th-compat ==0.1.5,
              any.th-lift ==0.8.4,
              any.th-lift-instances ==0.1.20,
              any.these ==1.2,
@@ -268,4 +269,4 @@ constraints: any.Cabal ==3.10.2.1,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-03-13T09:43:35Z
+index-state: hackage.haskell.org 2024-03-31T04:30:41Z