Skip to content

Commit

Permalink
Merge pull request #509 from well-typed/ghc-9.10-support-b
Browse files Browse the repository at this point in the history
Drop now unneeded allow-newer fields
  • Loading branch information
phadej authored May 16, 2024
2 parents 93eccbf + 0b80c95 commit 3417826
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.19.20240513
# version: 0.19.20240514
#
# REGENDATA ("0.19.20240513",["github","--config=cabal.haskell-ci","cabal.project"])
# REGENDATA ("0.19.20240514",["github","--config=cabal.haskell-ci","cabal.project"])
#
name: Haskell-CI
on:
Expand Down Expand Up @@ -304,12 +304,8 @@ jobs:
echo "package metametapost" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
allow-newer: indexed-traversable:base
allow-newer: indexed-traversable:containers
allow-newer: indexed-traversable-instances:base
allow-newer: unordered-containers:template-haskell
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(indexed-profunctors|metametapost|optics|optics-core|optics-extra|optics-sop|optics-th|optics-vl|template-haskell-optics)$/; }' >> cabal.project.local
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(indexed-profunctors|metametapost|optics|optics-core|optics-extra|optics-sop|optics-th|optics-vl|template-haskell-optics)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
- name: dump install plan
Expand Down
7 changes: 0 additions & 7 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,3 @@ packages:
metametapost/*.cabal

tests: true

-- TODO for GHC-9.10.1
allow-newer: indexed-traversable:base
allow-newer: indexed-traversable:containers
allow-newer: indexed-traversable-instances:base
-- https://github.com/haskell-unordered-containers/unordered-containers/issues/489
allow-newer: unordered-containers:template-haskell

0 comments on commit 3417826

Please sign in to comment.