Skip to content

Commit 61fe468

Browse files
kodiakhq[bot]hasura-bot
authored andcommitted
GHC 9.10.1
PR-URL: hasura/graphql-engine-mono#10944 GitOrigin-RevId: f7e98c510a0f866f98fd43b7b1c10e5fe730e61f
1 parent e3dc896 commit 61fe468

File tree

122 files changed

+1432
-1176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+1432
-1176
lines changed

cabal.project

+82-9
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,18 @@
1616
--
1717
-- See: https://www.haskell.org/cabal/users-guide/nix-local-build.html#configuring-builds-with-cabal-project
1818

19-
with-compiler: ghc-9.6.5
19+
20+
-- NOTE: we want to be using 9.10.1 with this patch applied for now:
21+
-- https://gitlab.haskell.org/ghc/ghc/-/issues/25074
22+
--
23+
-- which we do on CI. Hope this makes it into 9.10.2
24+
--
25+
-- You can run this locally by installing the bindist I've created
26+
--
27+
-- curl 'https://drive.usercontent.google.com/download?id=1ZYKOwmwINRNzo9M2PkdpDX7htgQ98oMG&export=download&confirm=t' --output 9.10.1-fork-bindist.tar.xz
28+
-- ghcup install ghc -u file:///9.10.1-fork-bindist.tar.xz
29+
--
30+
with-compiler: ghc-9.10.1
2031

2132
-- package-level parallelism:
2233
jobs: $ncpus
@@ -28,14 +39,20 @@ packages: server/forks/*/*.cabal
2839
-- TODO remove these when we are able:
2940
allow-newer: req:template-haskell
3041
allow-newer: ekg-core:base
42+
allow-newer: ekg-core:primitive
3143
allow-newer: ekg-core:ghc-prim
44+
allow-newer: ekg-core:containers
3245
allow-newer: ekg-core:inspection-testing
3346
allow-newer: ekg-core:text
3447
allow-newer: ekg-json:base
3548
allow-newer: ekg-json:text
49+
allow-newer: ekg-json:aeson
50+
allow-newer: ekg-json:vector
3651
allow-newer: ekg-prometheus:base
3752
allow-newer: ekg-prometheus:text
3853
allow-newer: ekg-prometheus:bytestring
54+
allow-newer: ekg-prometheus:primitive
55+
allow-newer: ekg-prometheus:containers
3956
-- Migrating to 0.25+ looks like it will be a real pain... :(
4057
-- https://github.com/morpheusgraphql/morpheus-graphql/pull/766
4158
allow-newer: relude:base
@@ -58,20 +75,27 @@ allow-newer: morpheus-graphql-server:transformers
5875
allow-newer: morpheus-graphql-server:vector
5976
allow-newer: morpheus-graphql-client:text
6077
allow-newer: morpheus-graphql-client:req
78+
allow-newer: req:containers
6179
allow-newer: morpheus-graphql-client:transformers
6280
allow-newer: morpheus-graphql-client:vector
6381
allow-newer: morpheus-graphql-subscriptions:text
6482
allow-newer: morpheus-graphql-subscriptions:transformers
6583
allow-newer: servant-openapi3:base
6684
allow-newer: openapi3:base
6785
allow-newer: servant-client:base
86+
allow-newer: servant-client:containers
6887
allow-newer: servant-client:transformers
6988
allow-newer: servant-client:mtl
7089
allow-newer: servant-client-core:base
90+
allow-newer: servant-client-core:containers
7191
allow-newer: servant-client-core:free
7292
allow-newer: servant-client-core:template-haskell
7393
allow-newer: servant-client-core:transformers
7494
allow-newer: servant-server:base
95+
allow-newer: servant-server:containers
96+
allow-newer: servant-server:either
97+
allow-newer: servant-server:bytestring
98+
allow-newer: servant-server:filepath
7599
allow-newer: servant-server:template-haskell
76100
allow-newer: servant-server:transformers
77101
allow-newer: servant-server:mtl
@@ -87,9 +111,51 @@ allow-newer: validation:assoc
87111
allow-newer: aeson:th-abstraction
88112
allow-newer: optics-th:th-abstraction
89113
allow-newer: generics-sop:th-abstraction
114+
allow-newer: insert-ordered-containers:base
115+
allow-newer: lucid2:base
116+
allow-newer: insert-ordered-containers:lens
117+
allow-newer: uuid-types:text
118+
allow-newer: uuid-types:template-haskell
119+
allow-newer: string-interpolate:template-haskell
120+
allow-newer: postgresql-simple:time
121+
allow-newer: postgresql-simple:base
122+
allow-newer: postgresql-simple:template-haskell
123+
allow-newer: postgresql-simple:bytestring
124+
allow-newer: postgresql-simple:text
125+
allow-newer: postgresql-simple:containers
126+
allow-newer: postgresql-simple:postgresql-libpq
127+
allow-newer: openapi3:template-haskell
128+
allow-newer: superbuffer:bytestring
129+
allow-newer: websockets:containers
130+
allow-newer: http-api-data:containers
131+
allow-newer: stm-hamt:primitive
132+
allow-newer: stm-hamt:primitive-extras
133+
allow-newer: quickcheck-instances:base
134+
allow-newer: quickcheck-instances:bytestring
135+
allow-newer: uuid:uuid-types
136+
allow-newer: connection:tls
137+
allow-newer: proto-lens:base
138+
allow-newer: proto-lens-runtime:base
139+
allow-newer: launchdarkly-server-sdk:lens
140+
allow-newer: launchdarkly-server-sdk:bytestring
141+
allow-newer: launchdarkly-server-sdk:text
142+
allow-newer: launchdarkly-server-sdk:containers
143+
allow-newer: lrucache:containers
144+
allow-newer: kriti-lang:aeson
145+
allow-newer: generic-monoid:base
146+
allow-newer: aeson-optics:base
147+
allow-newer: testcontainers:bytestring
148+
allow-newer: postgresql-libpq:base
149+
allow-newer: xml-lens:text
150+
allow-newer: xml-lens:containers
151+
allow-newer: config-ini:text
152+
allow-newer: hsc2hs:base
153+
allow-newer: xml-conduit:Cabal
154+
allow-newer: cabal-doctest:Cabal
155+
allow-newer: postgresql-libpq:Cabal
156+
allow-newer: hsc2hs:filepath
157+
allow-newer: hsc2hs:containers
90158

91-
-- https://gitlab.haskell.org/ghc/ghc-debug/-/merge_requests/27
92-
allow-newer: ghc-debug-stub:ghc-prim
93159
-- https://github.com/mokus0/th-extras/pull/20
94160
allow-newer: th-extras:template-haskell
95161

@@ -174,15 +240,22 @@ source-repository-package
174240
location: https://github.com/hasura/ekg-core.git
175241
tag: df610859603b504494ad770bdbb7053a7f0b9a6c
176242

177-
-- because we need 27d87f01, not yet released
178243
source-repository-package
179244
type: git
180-
location: https://github.com/snoyberg/yaml.git
181-
tag: c1aa7b3991e669e4c6a977712b495d40a54cf819
182-
subdir: yaml
245+
location: https://github.com/hasura/libdeflate-hs.git
246+
tag: e6f020a1a24d07516d753fbb6f30758774f76372
183247

248+
-- waiting on release:
184249
source-repository-package
185250
type: git
186-
location: https://github.com/hasura/libdeflate-hs.git
187-
tag: e6f020a1a24d07516d753fbb6f30758774f76372
251+
location: https://github.com/testcontainers/testcontainers-hs
252+
tag: fe0d6bbce6ce74d5843a964ac231929ea37025e8
253+
254+
-- while we wait for 9.10 support to be released, see:
255+
-- https://gitlab.haskell.org/ghc/ghc-debug/-/merge_requests/60
256+
source-repository-package
257+
type: git
258+
location: https://gitlab.haskell.org/ghc/ghc-debug.git
259+
tag: 2541e77d2687b8b3b0c1a52bb4790a602ce17d7d
260+
subdir: stub
188261

0 commit comments

Comments
 (0)