Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support GHC 9.8.1 #1310

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+208 −99
Open

Support GHC 9.8.1 #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fea7014
support building with GHC-9.8.1 and aeson-2.2
larskuhtz Oct 16, 2023
a95e012
support webauthn 0.8
larskuhtz Oct 16, 2023
34d5b26
add GHC-9.8 CI build
larskuhtz Oct 16, 2023
17f5450
update github haskell setup action
larskuhtz Oct 17, 2023
0fb535e
Disable x-partial warning for GHC 9.8.1
larskuhtz Oct 17, 2023
12ec9a2
bump nixpkgs to the version used by haskellNix
imalsogreg Oct 18, 2023
b7f91c0
Merge branch 'master' into lars/ghc-9.8.1
larskuhtz Oct 19, 2023
c048f90
Revert "support webauthn 0.8"
larskuhtz Oct 19, 2023
99a3e06
Tell nix to ignore partial function warnings
imalsogreg Oct 19, 2023
7f26658
fix cabal.project
larskuhtz Oct 19, 2023
0dee20c
Remove partial functions
imalsogreg Oct 19, 2023
b889e82
whitespace to test CI rebuild time
imalsogreg Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/applications.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['9.6']
ghc: ['9.6', '9.8']
cabal: ['3.10']
os: ['ubuntu-20.04', 'ubuntu-22.04', 'macOS-latest']
cabalcache: ['true']
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
if: startsWith(matrix.os, 'ubuntu-')
run: sudo chown -R $USER /usr/local/.ghcup
- name: Install GHC and Cabal
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
Expand Down
25 changes: 18 additions & 7 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ constraints: hspec-golden <0.2,

source-repository-package
type: git
tag: e43073d0b8d89d9b300980913b842f4be339846d
location: https://github.com/kadena-io/pact-json
--sha256: sha256-ZWbAId0JBaxDsYhwcYUyw04sjYstXyosSCenzOvUxsQ=
tag: 2d75e5d9ee4ae6484f1f16218dd5e767ef97f593
--sha256: 0fzq4mzaszj5clvixx9mn1x6r4dcrnwvbl2znd0p5mmy5h2jr0hh

-- These packages are tightly bundled with GHC. The rules ensure that
-- our builds use the version that ships with the GHC version that is
Expand All @@ -19,13 +19,19 @@ source-repository-package
allow-newer: *:template-haskell
allow-newer: *:base
allow-newer: *:ghc-prim
allow-newer: *:deepseq
allow-newer: *:pretty
allow-newer: *:text
allow-newer: *:bytestring

-- Patch merged into master (upcoming verison 10.0). We are currently using 9.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/verison/version

-- Also contains a patch for 9.8.1 related to -Wx-partial
--
source-repository-package
type: git
tag: 3946a0e94470d7403a855dd60f8e54687ecc2b1d
location: https://github.com/larskuhtz/sbv
--sha256: 1msbz6525nmsywpm910jh23siil4qgn3rpsm52m8j6877r7v5zw3
tag: e42acfb5058cde37e0213a95af9f6732fac78f3d
--sha256: 0ajr196qp1vqdlscp65myjjs95pimmdsq07w0z83d89xild1bl85

-- Servant is notoriously forcing outdated upper bounds onto its users.
-- It is usually safe to just ignore those.
Expand All @@ -38,6 +44,11 @@ allow-newer: servant:*
-- Required by trifecta (e.g. to allow mtl >=2.3)
allow-newer: trifecta:*

-- servant-0.20 does not yet support aeson-2.2
--
constraints: aeson <2.2
-- disable webauthn's overly restrictive upper bounds
allow-newer: webauthn:*

-- head and tail are marked deprecated in recent base. We'll
-- yet have to fix that in the code base.
if impl(ghc >= 9.8.1)
package pact
ghc-options: -Wno-x-partial
205 changes: 143 additions & 62 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading