Skip to content

Commit

Permalink
Jberryman/ghc 9.6.4
Browse files Browse the repository at this point in the history
PR-URL: hasura/graphql-engine-mono#10615
GitOrigin-RevId: 8a45c92bec8444d5ec0aed125f4aa96d9c684728
  • Loading branch information
kodiakhq[bot] authored and hasura-bot committed Jan 23, 2024
1 parent cc588a1 commit dd3bbef
Show file tree
Hide file tree
Showing 69 changed files with 483 additions and 321 deletions.
2 changes: 1 addition & 1 deletion .ghcversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.4.5
9.6.4
74 changes: 64 additions & 10 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,7 @@
--
-- See: https://www.haskell.org/cabal/users-guide/nix-local-build.html#configuring-builds-with-cabal-project

with-compiler: ghc-9.4.5
-- Work around bugs not yet fixed in 9.4.5. These are only enabled with O2
-- which we don't currently use, but disable these defensively
-- https://gitlab.haskell.org/ghc/ghc/-/merge_requests/10282
package *
ghc-options:
-fno-dicts-strict
-fno-spec-constr

with-compiler: ghc-9.6.4

-- package-level parallelism:
jobs: $ncpus
Expand All @@ -34,6 +26,7 @@ packages: server/lib/*/*.cabal
packages: server/forks/*/*.cabal

-- TODO remove these when we are able:
allow-newer: req:template-haskell
allow-newer: ekg-core:base
allow-newer: ekg-core:ghc-prim
allow-newer: ekg-core:inspection-testing
Expand All @@ -45,14 +38,55 @@ allow-newer: ekg-prometheus:text
allow-newer: ekg-prometheus:bytestring
-- Migrating to 0.25+ looks like it will be a real pain... :(
-- https://github.com/morpheusgraphql/morpheus-graphql/pull/766
allow-newer: relude:base
allow-newer: relude:ghc-prim
allow-newer: morpheus-graphql:text
allow-newer: morpheus-graphql:relude
allow-newer: morpheus-graphql:vector
allow-newer: morpheus-graphql:transformers
allow-newer: morpheus-graphql-app:text
allow-newer: morpheus-graphql-app:vector
allow-newer: morpheus-graphql-app:transformers
allow-newer: morpheus-graphql-code-gen:text
allow-newer: morpheus-graphql-code-gen:optparse-applicative
allow-newer: morpheus-graphql-code-gen-utils:text
allow-newer: morpheus-graphql-core:text
allow-newer: morpheus-graphql-core:transformers
allow-newer: morpheus-graphql-core:vector
allow-newer: morpheus-graphql-server:text
allow-newer: morpheus-graphql-server:transformers
allow-newer: morpheus-graphql-server:vector
allow-newer: morpheus-graphql-client:text
allow-newer: morpheus-graphql-client:req
allow-newer: morpheus-graphql-client:transformers
allow-newer: morpheus-graphql-client:vector
allow-newer: morpheus-graphql-subscriptions:text
allow-newer: morpheus-graphql-subscriptions:transformers
allow-newer: servant-openapi3:base
allow-newer: openapi3:base
allow-newer: servant-client:base
allow-newer: servant-client:transformers
allow-newer: servant-client:mtl
allow-newer: servant-client-core:base
allow-newer: servant-client-core:free
allow-newer: servant-client-core:template-haskell
allow-newer: servant-client-core:transformers
allow-newer: servant-server:base
allow-newer: servant-server:template-haskell
allow-newer: servant-server:transformers
allow-newer: servant-server:mtl
allow-newer: servant:base
allow-newer: servant:mtl
allow-newer: ghc-heap-view:base
allow-newer: ghc-heap-view:Cabal
allow-newer: servant:transformers
allow-newer: singleton-bool:base
allow-newer: semigroupoids:base
allow-newer: http-api-data:base
allow-newer: validation:assoc
allow-newer: aeson:th-abstraction
allow-newer: optics-th:th-abstraction
allow-newer: generics-sop:th-abstraction

-- https://gitlab.haskell.org/ghc/ghc-debug/-/merge_requests/27
allow-newer: ghc-debug-stub:ghc-prim
Expand All @@ -67,7 +101,7 @@ package *
-- For tooling support, e.g. HLS:
ghc-options: -fwrite-ide-info

-- we statically link malloc from mimalloc. Out of an abundance of caution,
-- we statically link malloc from mimalloc. Out of an abundance of caution,
-- disable special treatment of these in all the foreign code we build. The
-- only risk is potential for some missed optimizations.
-- See: https://github.com/microsoft/mimalloc/issues/785
Expand Down Expand Up @@ -95,6 +129,25 @@ package graphql-engine
allow-newer: hedgehog-generic:base
allow-newer: hedgehog-generic:hedgehog

-- 9.6 support. Awaiting release I guess...
source-repository-package
type: git
location: https://github.com/agrafix/Spock
tag: 40d028bfea0e94ca7096c719cd024ca47a46e559
subdir: Spock-core

-- 9.6 support: https://github.com/jfischoff/postgres-options/pull/7
source-repository-package
type: git
location: https://github.com/jfischoff/postgres-options.git
tag: 3100f7ca4319748a07a46e2838f4c80f8e3f076a

-- 9.6 support: https://github.com/MichaelXavier/cron/pull/51
source-repository-package
type: git
location: https://github.com/TristanCacqueray/cron.git
tag: 5f5b662a1d7abc3951ea5a2a625bbf3e83f7a11a

source-repository-package
type: git
location: https://github.com/hasura/kriti-lang.git
Expand All @@ -121,6 +174,7 @@ source-repository-package
location: https://github.com/hasura/ekg-core.git
tag: df610859603b504494ad770bdbb7053a7f0b9a6c

-- because we need 27d87f01, not yet released
source-repository-package
type: git
location: https://github.com/snoyberg/yaml.git
Expand Down
Loading

0 comments on commit dd3bbef

Please sign in to comment.