Skip to content

Commit

Permalink
Support GHC 9.2.8.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonathanknowles
jonathanknowles committed Oct 20, 2023
1 parent bf69969 commit 8369856
Show file tree
Hide file tree
Showing 11 changed files with 92 additions and 88 deletions.
2 changes: 1 addition & 1 deletion lib/application-extras/cardano-wallet-application-extras.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ library

hs-source-dirs: lib
build-depends:
, base ^>=4.14.3.0
, base >=4.14.3.0
, contra-tracer ^>=0.1.0.2
, iohk-monitoring ^>=0.1.11.3
, iohk-monitoring-extra ^>=0.1
Expand Down
8 changes: 4 additions & 4 deletions lib/crypto-hash-extra/crypto-hash-extra.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ library
hs-source-dirs: src
exposed-modules: Crypto.Hash.Extra
build-depends:
, base ^>=4.14.3
, bytestring ^>=0.10.12
, cryptonite ^>=0.30
, memory ^>=0.18
, base >=4.14.3
, bytestring >=0.10.12
, cryptonite >=0.30
, memory >=0.18
30 changes: 15 additions & 15 deletions lib/iohk-monitoring-extra/iohk-monitoring-extra.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ library
hs-source-dirs: src
exposed-modules: Cardano.BM.Extra
build-depends:
, aeson ^>=2.1.2.1
, base ^>=4.14.3
, bytestring ^>=0.10.12
, contra-tracer ^>=0.1.0.2
, deepseq ^>=1.4.4
, exceptions ^>=0.10.4
, fmt ^>=0.6.3
, iohk-monitoring ^>=0.1.11.3
, text ^>=1.2.4.1
, text-class ^>=2023.7.18
, time ^>=1.9.3
, tracer-transformers ^>=0.1.0.4
, transformers ^>=0.5.6.2
, unliftio ^>=0.2.24
, unliftio-core ^>=0.2.1
, aeson >=2.1.2.1
, base >=4.14.3
, bytestring >=0.10.12
, contra-tracer >=0.1.0.2
, deepseq >=1.4.4
, exceptions >=0.10.4
, fmt >=0.6.3
, iohk-monitoring >=0.1.11.3
, text >=1.2.4.1
, text-class >=2023.7.18
, time >=1.9.3
, tracer-transformers >=0.1.0.4
, transformers >=0.5.6.2
, unliftio >=0.2.24
, unliftio-core >=0.2.1
64 changes: 32 additions & 32 deletions lib/local-cluster/local-cluster.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,19 @@ library

hs-source-dirs: lib
build-depends:
, aeson ^>=2.1.2.1
, aeson-qq ^>=0.8.4
, aeson >=2.1.2.1
, aeson-qq >=0.8.4
, base
, base58-bytestring ^>=0.1
, bech32 ^>=1.1.2
, base58-bytestring >=0.1
, bech32 >=1.1.2
, bech32-th
, binary ^>=0.8.8
, bytestring ^>=0.10.12
, binary >=0.8.8
, bytestring >=0.10.12
, cardano-addresses
, cardano-api
, cardano-binary ^>=1.7.0.1
, cardano-binary >=1.7.0.1
, cardano-cli
, cardano-crypto ^>=1.1.2
, cardano-crypto >=1.1.2
, cardano-data
, cardano-ledger-api
, cardano-ledger-core
Expand All @@ -74,39 +74,39 @@ library
, cardano-wallet-launcher
, cardano-wallet-primitive
, cardano-wallet-test-utils
, cborg ^>=0.2.9
, containers ^>=0.6.5
, cborg >=0.2.9
, containers >=0.6.5
, contra-tracer
, crypto-hash-extra ^>=0.1
, cryptonite ^>=0.30
, crypto-hash-extra >=0.1
, cryptonite >=0.30
, directory
, extra ^>=1.7
, extra >=1.7
, filepath
, generic-lens ^>=2.2.2
, int-cast ^>=0.2
, generic-lens >=2.2.2
, int-cast >=0.2
, iohk-monitoring
, iohk-monitoring-extra
, lens ^>=5.1.1
, lens >=5.1.1
, lobemo-backend-ekg
, memory ^>=0.18
, network-uri ^>=2.6.4.2
, OddWord ^>=1.0.1
, ouroboros-network ^>=0.8.1
, ouroboros-network-api ^>=0.5
, path ^>=0.9.2
, path-io ^>=1.7.0
, resourcet ^>=1.3
, retry ^>=0.9.3.1
, tagged ^>=0.8.7
, temporary ^>=1.3
, memory >=0.18
, network-uri >=2.6.4.2
, OddWord >=1.0.1
, ouroboros-network >=0.8.1
, ouroboros-network-api >=0.5
, path >=0.9.2
, path-io >=1.7.0
, resourcet >=1.3
, retry >=0.9.3.1
, tagged >=0.8.7
, temporary >=1.3
, temporary-extra
, text
, text-class
, time ^>=1.9.3
, typed-process ^>=0.2.11
, unliftio ^>=0.2
, with-utf8 ^>=1.0.2.4
, yaml ^>=0.11.11
, time >=1.9.3
, typed-process >=0.2.11
, unliftio >=0.2
, with-utf8 >=1.0.2.4
, yaml >=0.11.11

executable local-cluster
import: language, opts-exe
Expand Down
2 changes: 1 addition & 1 deletion lib/temporary-extra/temporary-extra.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ library
hs-source-dirs: src
exposed-modules: System.IO.Temp.Extra
build-depends:
, base ^>=4.14.3.0
, base >=4.14.3.0
, iohk-monitoring ^>=0.1.11.3
, iohk-monitoring-extra ^>=0.1
, temporary ^>=1.3
Expand Down
58 changes: 29 additions & 29 deletions lib/wallet-e2e/cardano-wallet-e2e.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,36 +54,36 @@ common options

common dependencies
build-depends:
, base ^>=4.14.3.0
, path ^>=0.9.2
, path-io ^>=1.7.0
, relude ^>=1.2.0.0
, sydtest ^>=0.15
, text ^>=1.2.4.1
, base >=4.14.3.0
, path >=0.9.2
, path-io >=1.7.0
, relude >=1.2.0.0
, sydtest >=0.15
, text >=1.2.4.1

library
import: options, dependencies
hs-source-dirs: src
build-depends:
, aeson ^>=2.1.2.1
, base58-bytestring ^>=0.1
, cardano-addresses ^>=3.12
, cardano-crypto ^>=1.1.2
, cardano-wallet-client ^>=0.1
, effectful ^>=2.2.2.0
, effectful-th ^>=1.0.0.1
, http-client ^>=0.7.13.1
, http-types ^>=0.12.3
, local-cluster ^>=0.1
, memory ^>=0.18
, random ^>=1.2.1.1
, resourcet ^>=1.3
, retry ^>=0.9.3.1
, scientific ^>=0.3.7
, tagged ^>=0.8.7
, time ^>=1.9.3
, timespan ^>=0.4
, typed-process ^>=0.2.11
, aeson >=2.1.2.1
, base58-bytestring >=0.1
, cardano-addresses >=3.12
, cardano-crypto >=1.1.2
, cardano-wallet-client >=0.1
, effectful >=2.2.2.0
, effectful-th >=1.0.0.1
, http-client >=0.7.13.1
, http-types >=0.12.3
, local-cluster >=0.1
, memory >=0.18
, random >=1.2.1.1
, resourcet >=1.3
, retry >=0.9.3.1
, scientific >=0.3.7
, tagged >=0.8.7
, time >=1.9.3
, timespan >=0.4
, typed-process >=0.2.11

exposed-modules:
Cardano.Wallet.Spec
Expand Down Expand Up @@ -120,7 +120,7 @@ executable wallet-e2e
ghc-options: -threaded -rtsopts -with-rtsopts=-N
build-depends:
, cardano-wallet-e2e
, optparse-applicative ^>=0.17.1
, prettyprinter ^>=1.7.1
, prettyprinter-ansi-terminal ^>=1.1.3
, with-utf8 ^>=1.0.2.4
, optparse-applicative >=0.17.1
, prettyprinter >=1.7.1
, prettyprinter-ansi-terminal >=1.1.3
, with-utf8 >=1.0.2.4
1 change: 1 addition & 0 deletions lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Trace.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import Path.IO
import Prelude hiding
( modify
, runState
, trace
)

data FxTrace :: Effect where
Expand Down
1 change: 1 addition & 0 deletions lib/wallet/bench/db-bench.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
{-# OPTIONS_GHC -fno-warn-orphans #-}
-- {-# OPTIONS_GHC -Wno-ambiguous-fields #-}
{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
{-# OPTIONS_GHC -Wno-ambiguous-fields #-}

-- |
-- Copyright: © 2018-2020 IOHK
Expand Down
1 change: 1 addition & 0 deletions lib/wallet/integration/src/Test/Integration/Scenario/API/Shelley/StakePools.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeFamilies #-}
{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}

module Test.Integration.Scenario.API.Shelley.StakePools (spec) where

Expand Down
1 change: 1 addition & 0 deletions lib/wallet/integration/src/Test/Integration/Scenario/API/Shelley/TransactionsNew.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
{-# LANGUAGE TypeFamilies #-}

{-# OPTIONS_GHC -Wno-unused-imports #-} -- temportary, until addRequiredSigners is fixed
{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}

module Test.Integration.Scenario.API.Shelley.TransactionsNew (spec) where

Expand Down
12 changes: 6 additions & 6 deletions nix/haskell.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
localClusterConfigs = config.src + /lib/local-cluster/test/data/cluster-configs;
in {
name = "cardano-wallet";
compiler-nix-name = "ghc8107";
compiler-nix-name = "ghc928";

src = haskellLib.cleanSourceWith {
name = "cardano-wallet-src";
Expand All @@ -122,7 +122,7 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
lentil = { index-state = indexState; };
weeder = {
index-state = indexState;
version = "2.2.0";
version = "2.4.0";
};
};
nativeBuildInputs = with buildProject.hsPkgs; [
Expand All @@ -145,11 +145,11 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [
yq
nixWrapped
mdbook
(haskell-nix.tool "ghc8107" "hp2pretty" "latest")
(haskell-nix.tool "ghc8107" "stylish-haskell" "0.11.0.3")
(haskell-nix.tool "ghc8107" "hlint" "3.3")
(haskell-nix.tool "ghc928" "hp2pretty" "latest")
(haskell-nix.tool "ghc928" "stylish-haskell" "0.14.5.0")
(haskell-nix.tool "ghc928" "hlint" "3.6.1")
(haskell-nix.tool "ghc928" "fourmolu" "0.13.1.0")
(haskell-nix.tool "ghc8107" "haskell-language-server" ({pkgs, ...}: rec {
(haskell-nix.tool "ghc928" "haskell-language-server" ({pkgs, ...}: rec {
# Use the github source of HLS that is tested with haskell.nix CI
src = pkgs.haskell-nix.sources."hls-2.0";
# `tool` normally ignores the `cabal.project` (if there is one in the hackage source).
Expand Down

0 comments on commit 8369856

Please sign in to comment.