Skip to content

Commit

Permalink
Drop support for GHC 8.4.*, update and fix dependencies (polysemy-res…
Browse files Browse the repository at this point in the history
…earch#405)

* Drop support for GHC 8.4.*, update and fix dependencies

* Remove 8.4.4 from CI

* Remove references to loopbreaker
  • Loading branch information
TheMatten authored Mar 20, 2021
1 parent 2dfcd30 commit dc16f08
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 20 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ matrix:
- ghc: "8.10.1"
- ghc: "8.8.1"
- ghc: "8.6.5"
- ghc: "8.4.4"

install:
- cabal --version
Expand All @@ -36,4 +35,3 @@ script:

- cabal v2-build polysemy-plugin
- cabal v2-test --enable-test polysemy-plugin

1 change: 0 additions & 1 deletion nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ let
polysemy-plugin = c2n "polysemy-plugin" ../polysemy-plugin;
first-class-families =
hackage "first-class-families" "0.8.0.1" "0h1rxbc7zsxrlhx5xcl58wjx3qi2wny8wb3sk7c1qnydf4ckcckz";
ghc-lib = hackage "ghc-lib" "0.20190204" "1i2zjlr30bxpabsm8f995x455v847gbpzczm2w4089fqmsnzpzfd";
dump-core = hackage "dump-core" "0.1.3.2" "1mi8p736yn00z549pwnjv4ydwbs8mwg6dla3ly447c027nq8py6g";
monadLib = hackage "monadLib" "3.10" "1v4ynjcb963s3lfw3v71qdzvld1mmz1faf8swhvicma5jbvwchy2";
};
Expand Down
11 changes: 0 additions & 11 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ when:
- MonadFailDesugaring
- TypeInType

# - condition: impl(ghc >= 8.7)
# dependencies:
# - loopbreaker >= 0.1 && < 0.2

flags:
dump-core:
description: Dump HTML for the core generated by GHC during compilation
Expand Down Expand Up @@ -92,13 +88,6 @@ library:
dependencies:
- unsupported-ghc-version > 1 && < 1

# We use this plugin to get to more agressive inlining without need for
# explicit "loopbreakers" in function definitions all over ther codebase
# --- sadly it can only work on newer versions of GHC currently
# - condition: impl(ghc >= 8.7)
# ghc-options:
# - -fplugin=Loopbreaker

- condition: flag(error-messages)
then:
# dummy value because cabal is stupid
Expand Down
2 changes: 1 addition & 1 deletion polysemy-plugin/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ description: Please see the README on GitHub at <https://github.com/isov

dependencies:
- base >= 4.9 && < 5
- ghc >= 8.4.4 && < 9
- ghc >= 8.6.5 && < 9
- ghc-tcplugins-extra >= 0.3 && < 0.5
- polysemy >= 1.3
- syb >= 0.7 && < 0.8
Expand Down
4 changes: 2 additions & 2 deletions polysemy-plugin/polysemy-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ library
build-depends:
base >=4.9 && <5
, containers >=0.5 && <0.7
, ghc >=8.4.4 && <9
, ghc >=8.6.5 && <9
, ghc-tcplugins-extra >=0.3 && <0.5
, polysemy >=1.3
, syb ==0.7.*
Expand Down Expand Up @@ -112,7 +112,7 @@ test-suite polysemy-plugin-test
base >=4.9 && <5
, containers >=0.5 && <0.7
, doctest >=0.16.0.1 && <0.17
, ghc >=8.4.4 && <9
, ghc >=8.6.5 && <9
, ghc-tcplugins-extra >=0.3 && <0.5
, hspec >=2.6.0 && <3
, inspection-testing >=0.4.2 && <0.5
Expand Down
5 changes: 2 additions & 3 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
resolver: lts-16.1
resolver: lts-16.31

packages:
- .
- polysemy-plugin

extra-deps:
- first-class-families-0.8.0.0
- ghc-lib-0.20190204
- dump-core-0.1.3.2 # used when the dump-core flag is toggled
- monadLib-3.10 # used by the dump-core library when the dump-core flag is toggled

0 comments on commit dc16f08

Please sign in to comment.