Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ This file lists the contributors to the PureScript compiler project, and the ter
- [@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).
- [@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).
- [@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).
- [@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).

### Companies

Expand Down
2 changes: 1 addition & 1 deletion src/Language/PureScript/Docs/RenderedCode/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import Control.DeepSeq (NFData)
import Control.Monad.Error.Class (MonadError(..))

import Data.Monoid ((<>))
import Data.Aeson.BetterErrors
import Data.Aeson.BetterErrors (Parse, nth, withText, withValue, toAesonParser, perhaps, asText, eachInArray)
import qualified Data.Aeson as A
import Data.Text (Text)
import qualified Data.Text as T
Expand Down
4 changes: 4 additions & 0 deletions src/Language/PureScript/Docs/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ import Control.Arrow ((***))

import Data.Aeson ((.=))
import Data.Aeson.BetterErrors
(Parse, ParseError, parse, keyOrDefault, throwCustomError, key, asText,
keyMay, withString, eachInArray, asNull, (.!), toAesonParser, toAesonParser',
fromAesonParser, perhaps, withText, asIntegral, nth, eachInObjectWithKey,
asString)
import qualified Data.Map as Map
import Data.Time.Clock (UTCTime)
import qualified Data.Time.Format as TimeFormat
Expand Down
2 changes: 1 addition & 1 deletion src/Language/PureScript/Publish.hs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import Control.Category ((>>>))
import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)
import Control.Monad.Writer.Strict (MonadWriter, WriterT, runWriterT, tell)

import Data.Aeson.BetterErrors
import Data.Aeson.BetterErrors (Parse, parse, keyMay, eachInObjectWithKey, eachInObject, key, keyOrDefault, asBool, asText)
import Data.Char (isSpace)
import Data.String (String, lines)
import Data.List (stripPrefix, (\\), nubBy)
Expand Down
2 changes: 1 addition & 1 deletion src/Language/PureScript/Publish/ErrorsWarnings.hs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Prelude.Compat

import Control.Exception (IOException)

import Data.Aeson.BetterErrors
import Data.Aeson.BetterErrors (ParseError, displayError)
import Data.List (intersperse, intercalate)
import Data.List.NonEmpty (NonEmpty(..))
import Data.Maybe
Expand Down
12 changes: 8 additions & 4 deletions stack-ghc-8.0.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
resolver: lts-7.9
resolver: nightly-2017-01-31
packages:
- '.'
extra-deps:
- aeson-0.11.3.0
- bower-json-1.0.0.1
- http-client-0.4.31.2
- http-client-tls-0.2.4.1
- optparse-applicative-0.13.0.0
- pipes-4.1.9
- pipes-http-1.0.2
- turtle-1.3.1
- wai-websockets-3.0.0.9
- websockets-0.9.6.2
- bower-json-1.0.0.1
- turtle-1.3.1
- optparse-applicative-0.13.0.0
3 changes: 2 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ resolver: lts-6.25
packages:
- '.'
extra-deps:
- aeson-better-errors-0.9.1.0
- bower-json-1.0.0.1
- optparse-applicative-0.13.0.0
- turtle-1.3.1
- optparse-applicative-0.13.0.0