Skip to content

Commit

Permalink
Support GHC-9.6 wrt #979
Browse files Browse the repository at this point in the history
  • Loading branch information
@hasufell
hasufell committed Apr 15, 2024
1 parent eebbc99 commit 1b60f1c
Show file tree
Hide file tree
Showing 25 changed files with 850 additions and 154 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions cabal.ghc8107.Unix.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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

30 changes: 15 additions & 15 deletions cabal.ghc8107.Unix.project.freeze
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -34,19 +34,18 @@ 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,
any.binary ==0.8.9.2,
any.binary-instances ==1.0.4,
any.binary-orphans ==1.0.4.1,
any.blaze-builder ==0.4.2.3,
any.brick ==2.1.1,
brick -demos,
any.bytestring ==0.11.5.3,
any.bz2 ==1.0.1.1,
any.bz2 ==1.0.1.2,
bz2 -cross +with-bzlib,
any.bzip2-clib ==1.0.8,
any.c2hs ==0.28.8,
c2hs +base3 -regression,
any.cabal-install-parsers ==0.6.1.1,
Expand Down Expand Up @@ -77,7 +76,7 @@ constraints: any.Cabal ==3.10.2.1,
any.data-clist ==0.2,
any.data-fix ==0.3.2,
any.deepseq ==1.4.4.0,
any.directory ==1.3.8.3,
any.directory ==1.3.8.4,
directory -os-string,
any.disk-free-space ==0.1.0.1,
any.distributive ==0.6.2.1,
Expand All @@ -86,7 +85,7 @@ constraints: any.Cabal ==3.10.2.1,
dlist -werror,
any.exceptions ==0.10.4,
any.file-uri ==0.1.0.0,
any.filepath ==1.4.101.0,
any.filepath ==1.4.300.1,
filepath -cpphs,
any.foldable1-classes-compat ==0.1,
foldable1-classes-compat +tagged,
Expand All @@ -98,14 +97,15 @@ constraints: any.Cabal ==3.10.2.1,
any.ghc-byteorder ==4.11.0.0.10,
any.ghc-prim ==0.6.1,
any.happy ==1.20.1.1,
any.hashable ==1.4.3.0,
any.hashable ==1.4.4.0,
hashable +integer-gmp -random-initial-seed,
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,
Expand Down Expand Up @@ -161,7 +161,7 @@ constraints: any.Cabal ==3.10.2.1,
any.pretty ==1.1.3.6,
any.pretty-terminal ==0.1.0.0,
any.primitive ==0.8.0.0,
any.process ==1.6.18.0,
any.process ==1.6.19.0,
any.profunctors ==5.6.2,
any.quickcheck-arbitrary-adt ==0.3.1.0,
any.quickcheck-io ==0.2.0,
Expand Down Expand Up @@ -213,7 +213,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,
Expand All @@ -227,7 +227,7 @@ constraints: any.Cabal ==3.10.2.1,
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
any.unicode-data ==0.3.1,
unicode-data -ucd2haskell,
any.unix ==2.8.5.0,
any.unix ==2.8.5.1,
unix -os-string,
any.unix-bytestring ==0.3.7.8,
any.unix-compat ==0.7.1,
Expand Down Expand Up @@ -257,4 +257,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-04-15T02:49:22Z
9 changes: 6 additions & 3 deletions cabal.ghc8107.Win32.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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

28 changes: 14 additions & 14 deletions cabal.ghc8107.Win32.project.freeze
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
active-repositories: hackage.haskell.org:merge
constraints: any.Cabal ==3.10.2.0 || ==3.10.2.1,
any.Cabal-syntax ==3.10.1.0 || ==3.10.2.0,
constraints: any.Cabal ==3.10.2.1 || ==3.10.3.0,
any.Cabal-syntax ==3.10.2.0 || ==3.10.3.0,
any.HUnit ==1.6.2.0,
any.OneTuple ==0.4.1.1,
any.QuickCheck ==2.14.3,
Expand Down Expand Up @@ -32,19 +32,18 @@ constraints: any.Cabal ==3.10.2.0 || ==3.10.2.1,
any.base-compat ==0.13.1,
any.base-orphans ==0.9.1,
any.base16-bytestring ==1.0.2.0,
any.bifunctors ==5.6.1,
any.bifunctors ==5.6.2,
bifunctors +tagged,
any.bimap ==0.5.0,
any.binary ==0.8.8.0 || ==0.8.9.1,
any.binary ==0.8.8.0 || ==0.8.9.2,
any.binary-instances ==1.0.4,
any.binary-orphans ==1.0.4.1,
any.blaze-builder ==0.4.2.3,
any.brick ==2.1.1,
brick -demos,
any.bytestring ==0.10.12.0 || ==0.11.5.3,
any.bz2 ==1.0.1.1,
any.bz2 ==1.0.1.2,
bz2 -cross +with-bzlib,
any.bzip2-clib ==1.0.8,
any.c2hs ==0.28.8,
c2hs +base3 -regression,
any.cabal-install-parsers ==0.6.1.1,
Expand Down Expand Up @@ -74,7 +73,7 @@ constraints: any.Cabal ==3.10.2.0 || ==3.10.2.1,
any.data-clist ==0.2,
any.data-fix ==0.3.2,
any.deepseq ==1.4.4.0,
any.directory ==1.3.6.0 || ==1.3.8.3,
any.directory ==1.3.6.0 || ==1.3.8.4,
directory -os-string,
any.disk-free-space ==0.1.0.1,
any.distributive ==0.6.2.1,
Expand All @@ -83,7 +82,7 @@ constraints: any.Cabal ==3.10.2.0 || ==3.10.2.1,
dlist -werror,
any.exceptions ==0.10.4,
any.file-uri ==0.1.0.0,
any.filepath ==1.4.2.1 || ==1.4.101.0,
any.filepath ==1.4.2.1 || ==1.4.300.1,
filepath -cpphs,
any.foldable1-classes-compat ==0.1,
foldable1-classes-compat +tagged,
Expand All @@ -94,14 +93,15 @@ constraints: any.Cabal ==3.10.2.0 || ==3.10.2.1,
any.ghc-boot-th ==8.10.7,
any.ghc-prim ==0.6.1,
any.happy ==1.20.1.1,
any.hashable ==1.4.3.0,
any.hashable ==1.4.4.0,
hashable +integer-gmp -random-initial-seed,
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,
Expand Down Expand Up @@ -153,7 +153,7 @@ constraints: any.Cabal ==3.10.2.0 || ==3.10.2.1,
any.pretty ==1.1.3.6,
any.pretty-terminal ==0.1.0.0,
any.primitive ==0.8.0.0,
any.process ==1.6.13.2 || ==1.6.18.0,
any.process ==1.6.13.2 || ==1.6.19.0,
any.profunctors ==5.6.2,
any.quickcheck-arbitrary-adt ==0.3.1.0,
any.quickcheck-io ==0.2.0,
Expand Down Expand Up @@ -203,7 +203,7 @@ constraints: any.Cabal ==3.10.2.0 || ==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,
Expand Down Expand Up @@ -242,4 +242,4 @@ constraints: any.Cabal ==3.10.2.0 || ==3.10.2.1,
yaml-streamly +no-examples +no-exe,
any.zlib ==0.6.3.0,
zlib +bundled-c-zlib -non-blocking-ffi -pkg-config
index-state: hackage.haskell.org 2024-03-15T23:51:46Z
index-state: hackage.haskell.org 2024-04-15T02:49:22Z
9 changes: 6 additions & 3 deletions cabal.ghc902.Unix.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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

Loading

0 comments on commit 1b60f1c

Please sign in to comment.