Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into armv7a
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Jan 11, 2025
2 parents df4a234 + b5dbe29 commit 589b45f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions flake.lock

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

2 changes: 1 addition & 1 deletion test/cabal.project.local
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if impl(ghc>=9.12.1)
-- being shipped with a newer compiler. If you extend this
-- be very careful to only extend it for absolutely necessary packages
-- otherwise we risk running into broken build-plans down the line.
allow-newer: *:base, *:template-haskell, *:ghc-prim
allow-newer: *:base, *:template-haskell, *:ghc-prim, uuid-types:random, QuickCheck:random, cabal-install:random

if impl(ghc > 9.13)
allow-newer: *:containers, *:time, *:ghc-bignum
Expand Down

0 comments on commit 589b45f

Please sign in to comment.