Skip to content

Commit

Permalink
Fixes for cabal-install + ghc 8.10 to build all subprojects
Browse files Browse the repository at this point in the history
  • Loading branch information
bezirg committed Sep 16, 2020
1 parent 584dfe2 commit ba21a0a
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 2 deletions.
32 changes: 32 additions & 0 deletions cabal.project
Expand Up @@ -57,6 +57,10 @@ source-repository-package
package eventful-sql-common
ghc-options: -XDerivingStrategies -XStandaloneDeriving -XUndecidableInstances

-- TODO: remove whenn inline-r version>0.10.3 is pushed to hackage
package inline-r
ghc-options: -XStandaloneKindSignatures

-- Node protocols

-- We need to relax the dependency on GHC 8.6 for the
Expand All @@ -68,6 +72,23 @@ allow-newer: Win32-network:base
, io-sim-classes:base
, network-mux:base
, ouroboros-network:base
-- restricts to ghc<8.10
, prometheus:base
-- restricts to ghc<8.10
, monoidal-containers:base

-- we make use of an older servant. this makes the older servant build for ghc-8.10
, servant:base
, servant-server:base
, servant-foreign:base
, servant-foreign:lens
, servant-client-core:base
, servant-client-core:template-haskell
, servant-client:base
, servant-swagger:base
, servant-swagger:swagger2
, servant-swagger:lens
, servant-swagger:Cabal
, ouroboros-network-framework:base
, cardano-binary:base
, ouroboros-network:hashable
Expand All @@ -76,9 +97,20 @@ allow-newer: Win32-network:base
, eventful-sql-common:persistent
, eventful-sql-common:persistent-template

-- size-based restricts TemplateHaskell to that of ghc<8.10
, size-based:template-haskell
constraints:
-- cardano-prelude currently redefines some instances that appear in 0.3.4
nonempty-containers < 0.3.4
-- cardano-binary, of the cardano-base repository, cannot build with 5.2 but Cabal picks that one
, recursion-schemes < 5.2
-- A bunch of onstraints to make our forked servant-purescript build using an older servant
, servant < 0.17
, servant-server < 0.17
, servant-foreign < 0.15.1
, servant-client-core < 0.17
, servant-client < 0.17
, servant-swagger < 1.1.8

package ouroboros-network
tests: False
Expand Down
2 changes: 1 addition & 1 deletion plutus-core/plutus-core.cabal
Expand Up @@ -219,7 +219,7 @@ library
containers -any,
cryptonite -any,
dependent-map -any,
dependent-sum -any,
dependent-sum <0.7,
dependent-sum-template -any,
deriving-aeson >= 0.2.3,
deriving-compat -any,
Expand Down
2 changes: 1 addition & 1 deletion web-ghc/web-ghc.cabal
Expand Up @@ -63,7 +63,7 @@ executable web-ghc-server
mtl,
optparse-applicative,
playground-common,
prometheus,
prometheus < 2.2,
servant-server,
servant,
text,
Expand Down

0 comments on commit ba21a0a

Please sign in to comment.