Skip to content

Commit d55d7f0

Browse files
Hyunje Junpaf31
authored andcommitted
Add stack-ghc-8.0.2.yaml (purescript#2611)
* Add @noraesae to CONTRIBUTORS.md * Add stack-ghc-8.0.2.yaml It currently uses nightly-2017-01-31. It will be updated to use LTS when a new LTS using GHC 8.0.2 is coming. * Build fix for nightly-2017-01-31 'Ambiguous occurrence ‘<|>’' occurs because the new version of aeson-better-errors exports ‘<|>’ too. Also modified other stack.yaml's to use the new aeson-better-errors. * Replace stack-ghc-8.0.yaml with one of 8.0.2 * Make Data.Aeson.BetterErrors imports explicit
1 parent 0eb180c commit d55d7f0

7 files changed

Lines changed: 18 additions & 8 deletions

File tree

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ This file lists the contributors to the PureScript compiler project, and the ter
9090
- [@seungha-kim](https://github.com/seungha-kim) (Seungha Kim) My existing contributions and all future contributions until further notice are Copyright Seungha Kim, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
9191
- [@matthewleon](https://github.com/matthewleon) (Matthew Leon) My existing contributions and all future contributions until further notice are Copyright Matthew Leon, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
9292
- [@alexbiehl](https://github.com/alexbiehl) (Alexander Biehl) My existing contributions and all future contributions until further notice are Copyright Alexander Biehl, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
93+
- [@noraesae](https://github.com/noraesae) (Hyunje Jun) My existing contributions and all future contributions until further notice are Copyright Hyunje Jun, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
9394

9495
### Companies
9596

src/Language/PureScript/Docs/RenderedCode/Types.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import Control.DeepSeq (NFData)
5050
import Control.Monad.Error.Class (MonadError(..))
5151

5252
import Data.Monoid ((<>))
53-
import Data.Aeson.BetterErrors
53+
import Data.Aeson.BetterErrors (Parse, nth, withText, withValue, toAesonParser, perhaps, asText, eachInArray)
5454
import qualified Data.Aeson as A
5555
import Data.Text (Text)
5656
import qualified Data.Text as T

src/Language/PureScript/Docs/Types.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ import Control.Arrow ((***))
1111

1212
import Data.Aeson ((.=))
1313
import Data.Aeson.BetterErrors
14+
(Parse, ParseError, parse, keyOrDefault, throwCustomError, key, asText,
15+
keyMay, withString, eachInArray, asNull, (.!), toAesonParser, toAesonParser',
16+
fromAesonParser, perhaps, withText, asIntegral, nth, eachInObjectWithKey,
17+
asString)
1418
import qualified Data.Map as Map
1519
import Data.Time.Clock (UTCTime)
1620
import qualified Data.Time.Format as TimeFormat

src/Language/PureScript/Publish.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import Control.Category ((>>>))
2727
import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)
2828
import Control.Monad.Writer.Strict (MonadWriter, WriterT, runWriterT, tell)
2929

30-
import Data.Aeson.BetterErrors
30+
import Data.Aeson.BetterErrors (Parse, parse, keyMay, eachInObjectWithKey, eachInObject, key, keyOrDefault, asBool, asText)
3131
import Data.Char (isSpace)
3232
import Data.String (String, lines)
3333
import Data.List (stripPrefix, (\\), nubBy)

src/Language/PureScript/Publish/ErrorsWarnings.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Prelude.Compat
1717

1818
import Control.Exception (IOException)
1919

20-
import Data.Aeson.BetterErrors
20+
import Data.Aeson.BetterErrors (ParseError, displayError)
2121
import Data.List (intersperse, intercalate)
2222
import Data.List.NonEmpty (NonEmpty(..))
2323
import Data.Maybe

stack-ghc-8.0.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
resolver: lts-7.9
1+
resolver: nightly-2017-01-31
22
packages:
33
- '.'
44
extra-deps:
5+
- aeson-0.11.3.0
6+
- bower-json-1.0.0.1
7+
- http-client-0.4.31.2
8+
- http-client-tls-0.2.4.1
9+
- optparse-applicative-0.13.0.0
10+
- pipes-4.1.9
511
- pipes-http-1.0.2
12+
- turtle-1.3.1
613
- wai-websockets-3.0.0.9
714
- websockets-0.9.6.2
8-
- bower-json-1.0.0.1
9-
- turtle-1.3.1
10-
- optparse-applicative-0.13.0.0

stack.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ resolver: lts-6.25
22
packages:
33
- '.'
44
extra-deps:
5+
- aeson-better-errors-0.9.1.0
56
- bower-json-1.0.0.1
7+
- optparse-applicative-0.13.0.0
68
- turtle-1.3.1
7-
- optparse-applicative-0.13.0.0

0 commit comments

Comments
 (0)