Skip to content

Commit

Permalink
Add several constraints and allow-newer to please the cabal gods
Browse files Browse the repository at this point in the history
  • Loading branch information
ch1bo committed Jul 20, 2021
1 parent d063201 commit 1305f37
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 10 deletions.
21 changes: 15 additions & 6 deletions cabal.project
Expand Up @@ -20,9 +20,22 @@ package hydra-plutus
-- Always show detailed output for tests
test-show-details: direct

-- This is the incantation which seems to be pleasing the cabal gods, given the
-- current 'index-state' and versions of 'plutus' and 'cardano-node'. Possible
-- explanation why this is necessary: we need a more recent 'index-state'
-- (because of plutus) than cardano-node et al and some of their dependencies do
-- not have behave well.
constraints:
attoparsec == 0.13.2.5,
cryptonite == 0.27,
dlist == 0.8.0.8,
dns == 3.0.4,
semialign == 1.1.0.1,
lens == 4.19.2,
dependent-sum == 0.7.1.0

allow-newer:
-- 'iohk-monitoring' -> 'ekg' -> 'snap-server' which has a < 0.14 upper bound for attoparsec
attoparsec
some

-- NOTE: The following is taken from plutus master at 2021-07-19

Expand Down Expand Up @@ -77,10 +90,6 @@ constraints:
singletons < 3.0
-- breaks eventful even more than it already was
, persistent-template < 2.12
-- bizarre issue: in earlier versions they define their own 'GEq', in newer
-- ones they reuse the one from 'some', but there isn't e.g. a proper version
-- constraint from dependent-sum-template (which is the library we actually use).
, dependent-sum > 0.6.2.0

-- Drops an instance breaking our code. Should be released to Hackage eventually.
source-repository-package
Expand Down
2 changes: 1 addition & 1 deletion default.nix
Expand Up @@ -2,7 +2,7 @@
, system ? builtins.currentSystem
, haskellNix ? import
(builtins.fetchTarball
"https://github.com/input-output-hk/haskell.nix/archive/3856d2d24dca0ecc71fcfc314253a2a2d07a3c4f.tar.gz")
"https://github.com/input-output-hk/haskell.nix/archive/f9d261d6d90d4aebd97f7ae60c951fc9e1d98493.tar.gz")
{ }
, iohkNix ? import
(builtins.fetchTarball
Expand Down
1 change: 0 additions & 1 deletion hydra-node/hydra-node.cabal
Expand Up @@ -110,7 +110,6 @@ library
, cardano-ledger-core
, cardano-ledger-shelley-ma
, cardano-ledger-shelley-ma-test
, cardano-node
, cardano-prelude
, cardano-slotting
, cborg
Expand Down
2 changes: 1 addition & 1 deletion hydra-plutus/exe/hydra-pab/Main.hs
Expand Up @@ -8,6 +8,7 @@ import Cardano.Prelude hiding (log)
import Control.Monad.Freer (Eff, Member, interpret, type (~>))
import Control.Monad.Freer.Error (Error)
import Control.Monad.Freer.Extras.Log (LogMsg)
import Data.Default (def)
import qualified Hydra.Contract.OnChain as OnChain
import Hydra.Contract.PAB (PABContract (..))
import qualified Hydra.ContractSM as ContractSM
Expand All @@ -25,7 +26,6 @@ import Plutus.PAB.Types (PABError (..))
import qualified Plutus.PAB.Webserver.Server as PAB.Server
import Schema (FormSchema (..), ToSchema (..))
import Wallet.Emulator.Types (Wallet (..))
import Data.Default (def)

main :: IO ()
main = void $
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Expand Up @@ -5,7 +5,7 @@
# Latest haskell.nix for more likely cache hits
, haskellNix ? import
(builtins.fetchTarball
"https://github.com/input-output-hk/haskell.nix/archive/3856d2d24dca0ecc71fcfc314253a2a2d07a3c4f.tar.gz")
"https://github.com/input-output-hk/haskell.nix/archive/f9d261d6d90d4aebd97f7ae60c951fc9e1d98493.tar.gz")
{ }
# Use same pkgs as haskell.nix for more likely cache hits
, nixpkgsSrc ? haskellNix.sources.nixpkgs-2009
Expand Down

0 comments on commit 1305f37

Please sign in to comment.