Skip to content

Commit e184fca

Browse files
kritzcreekkritzcreek
authored
Changes necessary to build on GHC 8.4.3 (purescript#3372)
* changes necessary to build on GHC 8.4.2 * remove redundant Monoid imports * bumps to a 8.4.3 resolver * Updates for LTS-12 * Work around cabal/stack bug * Update node and stack versions on appveyor * removes spdx dependent code * Revert "removes spdx dependent code" This reverts commit 9432705. * use Cabal's SPDX parsing * use Cabal's Parsec class to parse licenses
1 parent f8ca834 commit e184fca

63 files changed

Lines changed: 165 additions & 200 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/Command/Bundle.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
module Command.Bundle (command) where
88

99
import Data.Traversable (for)
10-
import Data.Monoid ((<>))
1110
import Data.Aeson (encode)
1211
import Data.Maybe (isNothing)
1312
import Control.Applicative

‎app/Command/Compile.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module Command.Compile (command) where
88

99
import Control.Applicative
1010
import Control.Monad
11-
import Control.Monad.Writer.Strict
1211
import qualified Data.Aeson as A
1312
import Data.Bool (bool)
1413
import qualified Data.ByteString.Lazy as B

‎app/Command/Hierarchy.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import Protolude (catMaybes)
2222

2323
import Control.Applicative (optional)
2424
import Data.Foldable (for_)
25-
import Data.Monoid ((<>))
2625
import qualified Data.Text as T
2726
import qualified Data.Text.IO as T
2827
import Options.Applicative (Parser)

‎app/Command/Publish.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ module Command.Publish (command) where
55
import Control.Monad.IO.Class (liftIO)
66
import qualified Data.Aeson as A
77
import qualified Data.ByteString.Lazy.Char8 as BL
8-
import Data.Monoid ((<>))
98
import Data.Time.Clock (getCurrentTime)
109
import Data.Version (Version(..))
1110
import Language.PureScript.Publish

‎app/Command/REPL.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import Control.Monad.Trans.State.Strict (StateT, evalStateT)
3131
import Control.Monad.Trans.Reader (ReaderT, runReaderT)
3232
import Data.FileEmbed (embedStringFile)
3333
import Data.Foldable (for_)
34-
import Data.Monoid ((<>))
3534
import Data.String (IsString(..))
3635
import Data.Text (Text, unpack)
3736
import Data.Traversable (for)

‎app/Main.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import qualified Command.Ide as Ide
1515
import qualified Command.Publish as Publish
1616
import qualified Command.REPL as REPL
1717
import Data.Foldable (fold)
18-
import Data.Monoid ((<>))
1918
import qualified Options.Applicative as Opts
2019
import System.Environment (getArgs)
2120
import qualified System.IO as IO

‎appveyor.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ version: '{build}'
33
environment:
44
# Keep the path as short as possible, just in case.
55
STACK_ROOT: c:\s
6-
STACK_VER: 1.6.3
6+
STACK_VER: 1.7.1
77
RELEASE_USER: purescript
88
RELEASE_REPO: purescript
9+
# See https://github.com/commercialhaskell/stack/issues/3944, might no
10+
# longer be necessary after we've moved to a snapshot with network >= 0.2.7.1
11+
TMP: "c:\\tmp"
912
branches:
1013
# Only build master and tagged versions, i.e. not feature branches; feature
1114
# branches already get built after opening a pull request.
@@ -19,7 +22,7 @@ cache:
1922
- c:\s -> appveyor/cache-buster.txt
2023
install:
2124
- git submodule update --init
22-
- ps: Install-Product node 6
25+
- ps: Install-Product node 8
2326
- npm install -g bower
2427

2528
- ps: |

‎package.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@ extra-source-files:
3232
- CONTRIBUTORS.md
3333
- CONTRIBUTING.md
3434
dependencies:
35-
- aeson >=1.0 && <1.3
35+
- aeson >=1.0 && <1.4
3636
- aeson-better-errors >=0.8
3737
- ansi-terminal >=0.7.1 && <0.9
38-
- base >=4.8 && <4.11
38+
- base >=4.8 && <4.12
3939
- base-compat >=0.6.0
4040
- blaze-html >=0.8.1 && <0.10
4141
- bower-json >=1.0.0.1 && <1.1
4242
- boxes >=0.1.4 && <0.2.0
4343
- bytestring
44+
- Cabal >= 2.2
4445
- cheapskate >=0.1 && <0.2
4546
- clock
4647
- containers
@@ -70,7 +71,6 @@ dependencies:
7071
- scientific >=0.3.4.9 && <0.4
7172
- semigroups >=0.16.2 && <0.19
7273
- sourcemap >=0.1.6
73-
- spdx ==0.2.*
7474
- split
7575
- stm >=0.2.4.0
7676
- stringsearch

‎src/Language/PureScript/AST/Binders.hs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ module Language.PureScript.AST.Binders where
55

66
import Prelude.Compat
77

8-
import Data.Semigroup
9-
108
import Language.PureScript.AST.SourcePos
119
import Language.PureScript.AST.Literals
1210
import Language.PureScript.Names

‎src/Language/PureScript/AST/SourcePos.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import Prelude.Compat
88

99
import Control.DeepSeq (NFData)
1010
import Data.Aeson ((.=), (.:))
11-
import Data.Monoid
1211
import Data.Text (Text)
1312
import GHC.Generics (Generic)
1413
import Language.PureScript.Comments

0 commit comments

Comments
 (0)