Skip to content

Commit

Permalink
Drop support for ghc-8.6.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@newhoggy
newhoggy committed Mar 18, 2021
1 parent a16adc7 commit c6c5f99
Show file tree
Hide file tree
Showing 13 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.6.5", "8.10.3"]
ghc: ["8.10.3"]
os: [ubuntu-latest, macos-latest, windows-latest]

steps:
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
index-state: 2021-02-24T00:00:00Z
index-state: 2021-03-15T00:00:00Z

packages:
cardano-api
Expand Down
2 changes: 1 addition & 1 deletion cardano-api/cardano-api.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license-files: LICENSE
build-type: Simple
extra-source-files: README.md, ChangeLog.md

common base { build-depends: base >= 4.12 && < 4.15 }
common base { build-depends: base >= 4.14 && < 4.15 }

common project-config
default-language: Haskell2010
Expand Down
5 changes: 2 additions & 3 deletions cardano-api/test/cardano-api-test.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license-files: LICENSE
NOTICE
build-type: Simple

common base { build-depends: base >= 4.12 && < 4.15 }
common base { build-depends: base >= 4.14 && < 4.15 }

common project-config
default-language: Haskell2010
Expand Down Expand Up @@ -38,8 +38,7 @@ library
other-modules: Test.Cardano.Api.Metadata
Test.Tasty.Hedgehog.Group

build-depends: base >= 4.12 && < 5
, aeson >= 1.5.6.0
build-depends: aeson >= 1.5.6.0
, base16-bytestring
, bytestring
, cardano-api
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/cardano-cli.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Flag unexpected_thunks
Description: Turn on unexpected thunks checks
Default: False

common base { build-depends: base >= 4.12 && < 4.15 }
common base { build-depends: base >= 4.14 && < 4.15 }

common project-config
default-language: Haskell2010
Expand Down
29 changes: 15 additions & 14 deletions cardano-client-demo/cardano-client-demo.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,23 @@ license-files:
NOTICE
extra-source-files: CHANGELOG.md

common base { build-depends: base >= 4.14 && < 4.15 }

common project-config
default-language: Haskell2010

executable scan-blocks
main-is: ScanBlocks.hs
other-modules:
build-depends: base >= 4.12 && < 5
, cardano-api
import: base, project-config
main-is: ScanBlocks.hs
build-depends: cardano-api
, filepath
, time
default-language: Haskell2010

executable scan-blocks-pipelined
main-is: ScanBlocksPipelined.hs
other-modules:
build-depends: base,
cardano-api,
cardano-ledger-byron,
cardano-slotting,
filepath,
time,
default-language: Haskell2010
import: base, project-config
main-is: ScanBlocksPipelined.hs
build-depends: cardano-api
, cardano-ledger-byron
, cardano-slotting
, filepath
, time
2 changes: 1 addition & 1 deletion cardano-config/cardano-config.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ flag systemd
default: True
manual: False

common base { build-depends: base >= 4.12 && < 4.15 }
common base { build-depends: base >= 4.14 && < 4.15 }

common project-config
default-language: Haskell2010
Expand Down
11 changes: 4 additions & 7 deletions cardano-node-chairman/cardano-node-chairman.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license-files: LICENSE
NOTICE
build-type: Simple

common base { build-depends: base >= 4.12 && < 4.15 }
common base { build-depends: base >= 4.14 && < 4.15 }

common project-config
default-language: Haskell2010
Expand Down Expand Up @@ -64,8 +64,7 @@ executable cardano-node-chairman
ghc-options: -threaded
-rtsopts
"-with-rtsopts=-T"
build-depends: base >= 4.12 && < 5
, aeson >= 1.5.6.0
build-depends: aeson >= 1.5.6.0
, bytestring
, cardano-api
, cardano-config
Expand Down Expand Up @@ -104,8 +103,7 @@ test-suite chairman-tests

type: exitcode-stdio-1.0

build-depends: base >= 4.12 && < 5
, aeson >= 1.5.6.0
build-depends: aeson >= 1.5.6.0
, containers
, directory
, exceptions
Expand Down Expand Up @@ -144,8 +142,7 @@ executable cardano-testnet

main-is: Main.hs

build-depends: base >= 4.12 && < 5
, aeson >= 1.5.6.0
build-depends: aeson >= 1.5.6.0
, ansi-terminal
, cardano-config
, containers
Expand Down
2 changes: 1 addition & 1 deletion cardano-node/cardano-node.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ flag systemd
default: True
manual: False

common base { build-depends: base >= 4.12 && < 4.15 }
common base { build-depends: base >= 4.14 && < 4.15 }

common project-config
default-language: Haskell2010
Expand Down
2 changes: 1 addition & 1 deletion cardano-submit-api/cardano-submit-api.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ category: Language
build-type: Simple
extra-source-files: CHANGELOG.md

common base { build-depends: base >= 4.12 && < 4.15 }
common base { build-depends: base >= 4.14 && < 4.15 }

common cardano-api { build-depends: cardano-api }
common cardano-submit-api { build-depends: cardano-submit-api }
Expand Down
5 changes: 2 additions & 3 deletions hedgehog-extras/hedgehog-extras.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license-files: LICENSE
NOTICE
build-type: Simple

common base { build-depends: base >= 4.12 && < 4.15 }
common base { build-depends: base >= 4.14 && < 4.15 }

common maybe-Win32-network
if os(windows)
Expand All @@ -33,8 +33,7 @@ library
import: base, project-config
, maybe-Win32-network
hs-source-dirs: src
build-depends: base >= 4.12 && < 5
, aeson >= 1.5.6.0
build-depends: aeson >= 1.5.6.0
, aeson-pretty >= 0.8.5
, async
, bytestring
Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"homepage": "https://input-output-hk.github.io/haskell.nix",
"owner": "input-output-hk",
"repo": "haskell.nix",
"rev": "a49ad889850c0b4e98f629651153e17f0a5e4f59",
"sha256": "12r5pl3ri6ijxvwrxaavca2hxg34hy6s3grlv7pz75xp9vh43lwl",
"rev": "962ecfed3a4fb656b5a91d89159291e00ed766bc",
"sha256": "1avhrr9yp6wx586358602dghghi6w4phl94n1nikjlz22i2fqr3c",
"type": "tarball",
"url": "https://github.com/input-output-hk/haskell.nix/archive/a49ad889850c0b4e98f629651153e17f0a5e4f59.tar.gz",
"url": "https://github.com/input-output-hk/haskell.nix/archive/962ecfed3a4fb656b5a91d89159291e00ed766bc.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"iohk-nix": {
Expand Down
10 changes: 7 additions & 3 deletions nix/supervisord-cluster/topology/cardano-topology.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,15 @@ license-files: LICENSE
NOTICE
build-type: Simple

common base { build-depends: base >= 4.14 && < 4.15 }

common project-config
default-language: Haskell2010

executable cardano-topology
import: base, project-config
hs-source-dirs: .
main-is: cardano-topology.hs
default-language: Haskell2010
ghc-options: -threaded
-Wall
-Wincomplete-record-updates
Expand All @@ -24,8 +29,7 @@ executable cardano-topology
-rtsopts
"-with-rtsopts=-T"
-Wno-unticked-promoted-constructors
build-depends: base >=4.12 && <5
, aeson
build-depends: aeson
, bytestring
, containers
, graphviz
Expand Down

0 comments on commit c6c5f99

Please sign in to comment.