Skip to content

Commit 0f3a8d6

Browse files
committed
Updating Haskell dependency bounds
1 parent 1f29396 commit 0f3a8d6

File tree

9 files changed

+196
-27
lines changed

9 files changed

+196
-27
lines changed

.github/settings.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/hackage-publish.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cabal.project

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@ program-options
99
ghc-options:
1010
-Werror
1111

12+
constraints:
13+
-- Versions before this are missing dependency bounds
14+
pretty-simple >= 1.0.0.5,
15+
-- Versions before this use `-fpackage-trust`, which is a pain
16+
yaya >= 0.6.2.2,
17+
if arch(aarch64)
18+
constraints:
19+
-- Earlier versions fail to compile on aarch64
20+
cborg >= 0.2.9.0
21+
1222
tests: True
1323

1424
packages:

flake.nix

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
## dependencies that we override for reasons local to the project.
123123
haskellDependencies = final: prev: hfinal: hprev: {
124124
network = final.haskell.lib.dontCheck hprev.network;
125+
repline = final.haskell.lib.doJailbreak hprev.repline;
125126
warp = final.haskell.lib.dontCheck hprev.warp;
126127
};
127128
};
@@ -154,44 +155,32 @@
154155
## maps to in the nixpkgs we depend on.
155156
testedGhcVersions = system: [
156157
self.lib.defaultGhcVersion
157-
"8.10.7"
158-
"9.0.2"
159-
"9.2.8"
160-
"9.4.7"
161158
"9.6.3"
162-
# "9.8.1" # included dhall dependency versions fail
159+
"9.8.1"
163160
"9.10.1"
164-
"9.12.1"
161+
# "9.12.1" # Yaya doesn’t yet support GHC 9.12
165162
# "ghcHEAD" # doctest doesn’t work on current HEAD
166163
];
167164

168165
## The versions that are older than those supported by Nix that we
169166
## prefer to test against.
170167
nonNixTestedGhcVersions = [
171-
## Dhall 1.34+ doesn’t support GHC before 8.4.
172-
# "8.4.1" # dependencies of dhall fail to build
173-
# "8.6.1" # dependencies of dhall fail to build
174-
"8.8.1"
175-
"8.10.1"
176-
"9.0.1"
177-
"9.2.1"
178-
"9.4.1"
179168
"9.6.1"
180169
## since `cabal-plan-bounds` doesn’t work under Nix
181170
"9.8.1"
182171
"9.10.1"
183-
"9.12.1"
172+
# "9.12.1" # Yaya doesn’t yet support GHC 9.12
184173
];
185174

186175
## However, provide packages in the default overlay for _every_
187176
## supported version.
188177
supportedGhcVersions = system:
189178
self.lib.testedGhcVersions system
190179
++ [
191-
"9.4.8"
192180
"9.6.4"
193181
"9.6.5"
194182
"9.8.2"
183+
"9.8.3"
195184
"9.10.2"
196185
"9.12.2"
197186
];

0 commit comments

Comments
 (0)