Skip to content

Commit 76ae4be

Browse files
committed
Consolidate cabal.project and support GHC 9.14
Replace per-package listings with glob patterns and merge cabal.dependencies.project inline. Add allow-newer constraints for GHC 9.14 and guard older workarounds behind impl(ghc < 9.14).
1 parent b111fa4 commit 76ae4be

File tree

3 files changed

+40
-49
lines changed

3 files changed

+40
-49
lines changed

lib/cabal.dependencies.project

Lines changed: 0 additions & 16 deletions
This file was deleted.

lib/cabal.project

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,43 @@
11
packages:
2-
./executable-config/inject
3-
./executable-config/lookup
4-
./frontend
5-
./route
6-
./tabulation
2+
*
3+
asset/*
4+
executable-config/*
75

8-
if !arch(javascript) && !arch(wasm32)
9-
packages:
10-
./asset/manifest
11-
./asset/serve-snap
12-
./backend
13-
./command
14-
./run
15-
./selftest
16-
./snap-extras
6+
if arch(wasm32)
7+
allow-newer:
8+
*:*
9+
, *:time
10+
constraints:
11+
, time >= 1.15
1712

18-
import: cabal.dependencies.project
13+
if impl(ghc == 9.14.*)
14+
allow-newer:
15+
*:base
16+
, *:template-haskell
17+
, *:ghc-experimental
18+
, *:ghc-internal
19+
, patch:containers
20+
, parser-regex:ghc-bignum
21+
constraints:
22+
base < 4.23
23+
, template-haskell < 2.25
24+
, ghc-experimental < 9.1500
25+
, ghc-internal < 9.1500
26+
27+
if impl(ghc < 9.14)
28+
allow-newer: hnix:*, hnix-store-core:algebraic-graphs
29+
30+
constraints:
31+
hnix-store-core < 0.7
32+
, hnix-store-remote < 0.7
33+
34+
-- https://github.com/haskellari/splitmix/pull/73
35+
-- https://github.com/haskellari/splitmix/pull/75
36+
source-repository-package
37+
type: git
38+
location: https://github.com/alexfmpe/splitmix
39+
tag: bd53859c0f41d12f16c3f44fee52f5e9aae26243
40+
41+
-- https://github.com/haskell-cryptography/HsOpenSSL/issues/93#issuecomment-2311816896
42+
package HsOpenSSL
43+
ghc-options: -optc=-Wno-incompatible-pointer-types"

lib/cabal.project.ci

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)