Skip to content

Commit 7766cb0

Browse files
pepeiborrasloorush
authored andcommitted
Consolidate all cabal.project files (haskell#2866)
1 parent b5822f1 commit 7766cb0

File tree

16 files changed

+56
-274
lines changed

16 files changed

+56
-274
lines changed

.github/actions/setup-build/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ runs:
121121

122122
- name: Form the package list ('cabal.project.freeze')
123123
run: |
124+
rm cabal.project.freeze || \
124125
cabal v2-freeze && \
125126
echo "" && \
126127
echo 'Output:' && \

.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ variables:
1616
- GHC_VERSION: 8.10.7
1717
CABAL_PROJECT: cabal.project
1818
- GHC_VERSION: 9.0.2
19-
CABAL_PROJECT: cabal-ghc90.project
19+
CABAL_PROJECT: cabal.project
2020
- GHC_VERSION: 9.2.2
21-
CABAL_PROJECT: cabal-ghc92.project
21+
CABAL_PROJECT: cabal.project
2222
- GHC_VERSION: 9.2.1
23-
CABAL_PROJECT: cabal-ghc92.project
23+
CABAL_PROJECT: cabal.project
2424

2525
workflow:
2626
rules:

bindist/ghcs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
8.6.5,cabal.project
22
8.8.4,cabal.project
33
8.10.7,cabal.project
4-
9.0.2,cabal-ghc90.project
5-
9.2.1,cabal-ghc92.project
6-
9.2.2,cabal-ghc92.project
4+
9.0.2,cabal.project
5+
9.2.1,cabal.project
6+
9.2.2,cabal.project

bindist/ghcs-FreeBSD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
8.10.7,cabal.project
2-
9.0.2,cabal-ghc90.project
2+
9.0.2,cabal.project

bindist/ghcs-Msys

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
8.10.7,cabal.project
2-
9.0.2,cabal-ghc90.project
3-
9.2.2,cabal-ghc92.project
4-
9.2.1,cabal-ghc92.project
2+
9.0.2,cabal.project
3+
9.2.2,cabal.project
4+
9.2.1,cabal.project

cabal-ghc90.project

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

cabal-ghc92.project

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

cabal.project

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,27 @@ write-ghc-environment-files: never
4646
index-state: 2022-04-27T09:22:49Z
4747

4848
constraints:
49-
hyphenation +embed,
50-
-- remove this when hlint sets ghc-lib to true by default
51-
-- https://github.com/ndmitchell/hlint/issues/1376
52-
hlint +ghc-lib
49+
hyphenation +embed,
50+
-- remove this when hlint sets ghc-lib to true by default
51+
-- https://github.com/ndmitchell/hlint/issues/1376
52+
hlint +ghc-lib,
53+
ghc-lib-parser-ex -auto,
54+
stylish-haskell +ghc-lib
5355

5456
allow-newer:
55-
-- for shake-bench
56-
Chart-diagrams:diagrams-core,
57-
SVGFonts:diagrams-core
57+
-- ghc-9.2
58+
----------
59+
hiedb:base,
60+
retrie:ghc-exactprint,
61+
62+
-- for brittany
63+
-- https://github.com/lspitzner/multistate/pull/8
64+
multistate:base,
65+
-- https://github.com/lspitzner/data-tree-print/pull/3
66+
data-tree-print:base,
67+
-- https://github.com/lspitzner/butcher/pull/8
68+
butcher:base,
69+
70+
-- for shake-bench
71+
Chart:lens,
72+
Chart-diagrams:lens,

configuration-ghc-901.nix

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

configuration-ghc-921.nix

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

0 commit comments

Comments
 (0)