wip

IntersectMBO · Nov 22, 2022 · 5d2a908 · 5d2a908
1 parent 6897739
commit 5d2a908
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 54 deletions.
diff --git a/cabal.project b/cabal.project
@@ -86,64 +86,64 @@ constraints:
   , protolude >= 0.3.2
 
   -- TODO: these should be set in cabal files, but avoiding setting them in lower dependencies for initial CHaP release
-  , cardano-prelude == 0.1.0.1
-  , base-deriving-via == 0.1.0.0
-  , cardano-binary  == 1.5.0
-  , cardano-binary-test == 1.3.0
-  , cardano-crypto-class  == 2.0.0.1
-  , cardano-crypto-praos  == 2.0.0.0.1
-  , cardano-crypto-tests  == 2.0.0.0.1
-  , cardano-slotting  == 0.1.0.0
-  , measures == 0.1.0.0
-  , orphans-deriving-via == 0.1.0.0
-  , cardano-strict-containers == 0.1.0.1
+  , cardano-prelude >= 0.1.0.1
+  , base-deriving-via >= 0.1.0.0
+  , cardano-binary  >= 1.5.0
+  , cardano-binary-test >= 1.3.0
+  , cardano-crypto-class  >= 2.0.0.1
+  , cardano-crypto-praos  >= 2.0.0.0.1
+  , cardano-crypto-tests  >= 2.0.0.0.1
+  , cardano-slotting  >= 0.1.0.0
+  , measures >= 0.1.0.0
+  , orphans-deriving-via >= 0.1.0.0
+  , cardano-strict-containers >= 0.1.0.1
   , plutus-core^>= 1.1
   , plutus-ledger-api^>= 1.1
-  , plutus-tx == 1.0.0.0
-  , plutus-tx-plugin == 1.0.0.0
-  , prettyprinter-configurable == 0.1.0.0
-  , plutus-ghc-stub == 8.6.5
+  , plutus-tx >= 1.0.0.0
+  , plutus-tx-plugin >= 1.0.0.0
+  , prettyprinter-configurable >= 0.1.0.0
+  , plutus-ghc-stub >= 8.6.5
   , word-array^>= 1.1
   , io-classes >= 0.2.0.0
   , typed-protocols >= 0.1.0.1
   , typed-protocols-examples >= 0.1.0.1
   , ekg-forward >= 0.2
-  , cardano-ledger-conway == 0.1.1.2
-  , cardano-ledger-conway-test == 0.1.1.2
-  , cardano-ledger-shelley == 0.1.1.2
-  , cardano-ledger-shelley-test == 0.1.1.2
-  , cardano-ledger-alonzo == 0.1.1.2
-  , cardano-ledger-alonzo-test == 0.1.1.2
-  , cardano-crypto-test == 1.4.2
-  , cardano-crypto-wrapper == 1.4.2
-  , cardano-ledger-byron-test == 1.4.2
-  , cardano-ledger-byron == 0.1.1.2
-  , byron-spec-ledger == 0.1.1.2
-  , byron-spec-chain == 0.1.1.2
-  , cardano-ledger-babbage == 0.1.1.2
-  , cardano-ledger-babbage-test == 0.1.1.2
-  , cardano-ledger-shelley-ma == 0.1.1.2
-  , cardano-ledger-shelley-ma-test == 0.1.1.2
-  , cardano-ledger-pretty == 0.1.1.2
-  , small-steps-test == 0.1.1.2
-  , non-integral == 0.1.1.2
-  , cardano-data == 0.1.1.2
-  , set-algebra == 0.1.1.2
-  , cardano-protocol-tpraos == 0.1.1.2
-  , vector-map == 0.1.1.2
-  , small-steps == 0.1.1.2
-  , cardano-ledger-core == 0.1.1.2
-  , cardano-ledger-test == 0.1.1.2
-  , ledger-state == 0.1.1.2
-  , plutus-preprocessor == 0.1.1.2
-  , cardano-ledger-conway == 0.1.1.2
-  , cardano-data == 0.1.1.1
-  , cardano-ledger-core == 0.1.1.2
-  , cardano-ledger-pretty == 0.1.1.2
-  , hashable == 1.4.0.0
-  , text-short == 0.1.5
+  , cardano-ledger-conway >= 0.1.1.2
+  , cardano-ledger-conway-test >= 0.1.1.2
+  , cardano-ledger-shelley >= 0.1.1.2
+  , cardano-ledger-shelley-test >= 0.1.1.2
+  , cardano-ledger-alonzo >= 0.1.1.2
+  , cardano-ledger-alonzo-test >= 0.1.1.2
+  , cardano-crypto-test >= 1.4.2
+  , cardano-crypto-wrapper >= 1.4.2
+  , cardano-ledger-byron-test >= 1.4.2
+  , cardano-ledger-byron >= 0.1.1.2
+  , byron-spec-ledger >= 0.1.1.2
+  , byron-spec-chain >= 0.1.1.2
+  , cardano-ledger-babbage >= 0.1.1.2
+  , cardano-ledger-babbage-test >= 0.1.1.2
+  , cardano-ledger-shelley-ma >= 0.1.1.2
+  , cardano-ledger-shelley-ma-test >= 0.1.1.2
+  , cardano-ledger-pretty >= 0.1.1.2
+  , small-steps-test >= 0.1.1.2
+  , non-integral >= 0.1.1.2
+  , cardano-data >= 0.1.1.2
+  , set-algebra >= 0.1.1.2
+  , cardano-protocol-tpraos >= 0.1.1.2
+  , vector-map >= 0.1.1.2
+  , small-steps >= 0.1.1.2
+  , cardano-ledger-core >= 0.1.1.2
+  , cardano-ledger-test >= 0.1.1.2
+  , ledger-state >= 0.1.1.2
+  , plutus-preprocessor >= 0.1.1.2
+  , cardano-ledger-conway >= 0.1.1.2
+  , cardano-data >= 0.1.1.1
+  , cardano-ledger-core >= 0.1.1.2
+  , cardano-ledger-pretty >= 0.1.1.2
+  , hashable >= 1.4.0.0
+  , text-short >= 0.1.5
   , Unique >= 0.4.7.8
-  , tree-diff == 0.2.2
+  , tree-diff >= 0.2.2
 
 -- We'll need this once ouroboros has been pushed into CHaP
 -- extra-packages:
@@ -162,6 +162,9 @@ allow-newer:
   monoidal-containers:aeson,
   size-based:template-haskell,
   snap-server:attoparsec,
+  tree-diff:hashable,
+  Unique:hashable,
+  ouroboros-network:hashable,
 
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly

diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
@@ -46,7 +46,7 @@ common yaml                         { build-depends: yaml
 
 common project-config
   default-language:     Haskell2010
-  
+
   ghc-options:          -Wall
                         -Wcompat
                         -Werror
@@ -58,12 +58,11 @@ common project-config
                         -Wno-safe
                         -Wno-unsafe
                         -Wunused-packages
-
-                        -XNoImplicitPrelude
-
                         -fwarn-incomplete-patterns
                         -fwarn-redundant-constraints
 
+  default-extensions:   NoImplicitPrelude
+
 library
   import:               base, project-config
                       , aeson