Skip to content

Commit

Permalink
Make it build with ghc 9.10
Browse files Browse the repository at this point in the history
  • Loading branch information
erikd committed May 22, 2024
1 parent acdaeb2 commit 3e8e554
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 5 deletions.
101 changes: 99 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ repository cardano-haskell-packages
-- update either of these.
index-state:
-- Bump both the following dates if you need newer packages from Hackage
, hackage.haskell.org 2024-01-08T22:38:30Z
, hackage.haskell.org 2024-05-22T01:03:24Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2024-01-16T11:00:00Z
, cardano-haskell-packages 2024-05-21T10:43:27Z

packages: doc/read-the-docs-site
plutus-benchmark
Expand Down Expand Up @@ -81,3 +81,100 @@ allow-newer:
, inline-r:bytestring
, inline-r:containers
, inline-r:primitive


-- -------------------------------------------------------------------------------------------------

source-repository-package
type: git
location: https://github.com/erikd/vec
tag: ea9cab710146df3daf429b96b1c625544808e236
subdir:
bin
fin
ral

source-repository-package
type: git
location: https://github.com/erikd/haskell-hedgehog
tag: f1d861421d0a125fa63e9c3c38e25dc013c5f333
subdir:
hedgehog

source-repository-package
type: git
location: https://github.com/erikd/tasty-hedgehog
tag: 78fd68b53424175a0cb6af22483595b80be2f873

source-repository-package
type: git
location: https://github.com/erikd/haskeline
tag: 6758c914603b072aba26d2bc6ed59d0919fbd516

source-repository-package
type: git
location: https://github.com/erikd/constraints-extras
tag: b7da9d4648b26ebef1fe613e2e04bf96e66acf81

source-repository-package
type: git
location: https://github.com/erikd/size-based
tag: 7e91b0af49e1a02b9ee25fc2356a9f526b3f9331

source-repository-package
type: git
location: https://github.com/erikd/cborg
tag: 01f32360e2a3945a76e36ed9989e586f55675286
subdir:
cborg
cbor-tool
serialise
binary-serialise-cbor
cborg-json

source-repository-package
type: git
location: https://github.com/erikd/monoidal-containers
tag: 83410cc534af6b58ccff7ed2253447a40cea7e95

source-repository-package
type: git
location: https://github.com/erikd/tree-diff
tag: 3f1ce0cc48eaebb36ef17e9154615e569c7db0a8

source-repository-package
type: git
location: https://github.com/erikd/recursion-schemes
tag: 8cc1fe6a8bb33746e76a867978fb5afebe099d14

source-repository-package
type: git
location: https://github.com/erikd/dependent-map
tag: 9df16b82fd9e167ba084fe49b39e3d3e3a5f2f34

source-repository-package
type: git
location: https://github.com/erikd/dom-lt
tag: 61b86816ca13bc3e60852b693691440ab7fa4564

source-repository-package
type: git
location: https://github.com/erikd/dictionary-sharing
tag: d55c7546f31d6a1d4081cc6aa61183ed66b7aa74

source-repository-package
type: git
location: https://github.com/sol/doctest
tag: 0ba7365c0be403c0e8c1ea4ce4d456fd25f2c453

source-repository-package
type: git
location: https://github.com/erikd/test-framework
tag: 505ea9c56fe81b33e73ea87992ff2b2afbce9fe5
subdir:
quickcheck2

source-repository-package
type: git
location: https://github.com/erikd/turtle
tag: 41a4e41ccec89607b13b2d5c774f300dd330b51e
2 changes: 1 addition & 1 deletion plutus-core/plutus-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ library
, monoidal-containers
, mtl
, multiset
, nothunks ^>=0.1.5
, nothunks ^>=0.2
, parser-combinators >=0.4.0
, prettyprinter >=1.1.0.1
, prettyprinter-configurable ^>=1.28
Expand Down
5 changes: 4 additions & 1 deletion plutus-core/plutus-core/src/PlutusCore/Name/UniqueMap.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{- | A type for maps (key-value associations), where the key type can be
identified by 'Unique's. In practice, these types are usually names.
This approach is preferred when it is more efficient to compare the associated
Expand All @@ -23,7 +24,9 @@ module PlutusCore.Name.UniqueMap (
import Control.Lens (view)
import Control.Lens.Getter ((^.))
import Data.Coerce (Coercible, coerce)
import Data.Foldable (foldl')
#if ! MIN_VERSION_base(4,20,0)
import Data.List (foldl')
#endif
import Data.IntMap.Strict qualified as IM
import PlutusCore.Name.Unique (HasText (..), HasUnique (..), Named (Named), Unique (Unique))
import PlutusCore.Name.UniqueSet (UniqueSet (UniqueSet))
Expand Down
5 changes: 4 additions & 1 deletion plutus-core/plutus-core/src/PlutusCore/Name/UniqueSet.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{- | A type for sets of things identified by 'Unique's, usually names.
This approach is preferred when it is more efficient to compare the associated
'Unique's instead of the underlying type.
Expand All @@ -23,7 +24,9 @@ module PlutusCore.Name.UniqueSet (
import Control.Lens (Getting, view)
import Control.Lens.Getter (views)
import Data.Coerce (Coercible, coerce)
import Data.Foldable (foldl')
#if ! MIN_VERSION_base(4,20,0)
import Data.List (foldl')
#endif
import Data.IntSet qualified as IS
import Data.IntSet.Lens qualified as IS
import PlutusCore.Name.Unique (HasUnique (..), Unique (Unique))
Expand Down
2 changes: 2 additions & 0 deletions plutus-core/prelude/PlutusPrelude.hs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ import Data.Either (fromRight, isLeft, isRight)
import Data.Foldable (fold, toList)
import Data.Function (on)
import Data.Functor (($>))
#if ! MIN_VERSION_base(4,20,0)
import Data.List (foldl')
#endif
import Data.List.Extra (enumerate)
import Data.List.NonEmpty (NonEmpty (..))
import Data.Maybe (fromMaybe, isJust, isNothing)
Expand Down

0 comments on commit 3e8e554

Please sign in to comment.