From 27ae3b93e1b382b2e5bf3692d8a6908539c5d72d Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Mon, 11 Jul 2016 22:13:29 -0700 Subject: [PATCH] protolude: fix ambiguous occurrences Fixes regressions introduced by purescript/purescript@8063c4d0 Protolude.fromStrict vs. Data.ByteString.Lazy.fromStrict Protolude.decodeUtf8 vs. Data.Text.Lazy.Encoding.decodeUtf8 Protolude.encodeUtf8 vs. Data.Text.Lazy.Encoding.encodeUtf8 --- CONTRIBUTORS.md | 1 + src/Language/PureScript/Ide/Pursuit.hs | 2 +- src/Language/PureScript/Ide/Util.hs | 2 +- stack-ghc-8.0.yaml | 2 +- stack.yaml | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d6ec3ec2a7..51c350638f 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -27,6 +27,7 @@ This file lists the contributors to the PureScript compiler project, and the ter - [@faineance](https://github.com/faineance) My existing contributions and all future contributions until further notice are Copyright faineance, 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). - [@garyb](https://github.com/garyb) (Gary Burgess) My existing contributions and all future contributions until further notice are Copyright Gary Burgess, 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). - [@hdgarrood](https://github.com/hdgarrood) (Harry Garrood) My existing contributions and all future contributions until further notice are Copyright Harry Garrood, 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). +- [@ilovezfs](https://github.com/ilovezfs) - My existing contributions and all future contributions until further notice are Copyright ilovezfs, and are licensed to the owners and users of the PureScript compiler project under the terms of the MIT license - [@izgzhen](https://github.com/izgzhen) (Zhen Zhang) My existing contributions and all future contributions until further notice are Copyright Zhen Zhang, 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). - [@jacereda](https://github.com/jacereda) (Jorge Acereda) My existing contributions and all future contributions until further notice are Copyright Jorge Acereda, 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). - [@japesinator](https://github.com/japesinator) (JP Smith) My existing contributions and all future contributions until further notice are Copyright JP Smith, 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). diff --git a/src/Language/PureScript/Ide/Pursuit.hs b/src/Language/PureScript/Ide/Pursuit.hs index 9032a3457b..df48964b1b 100644 --- a/src/Language/PureScript/Ide/Pursuit.hs +++ b/src/Language/PureScript/Ide/Pursuit.hs @@ -19,7 +19,7 @@ module Language.PureScript.Ide.Pursuit , findPackagesForModuleIdent ) where -import Protolude +import Protolude hiding (fromStrict) import qualified Control.Exception as E import Data.Aeson diff --git a/src/Language/PureScript/Ide/Util.hs b/src/Language/PureScript/Ide/Util.hs index 4e4c235516..548e1f419d 100644 --- a/src/Language/PureScript/Ide/Util.hs +++ b/src/Language/PureScript/Ide/Util.hs @@ -27,7 +27,7 @@ module Language.PureScript.Ide.Util , module Language.PureScript.Ide.Conversions ) where -import Protolude +import Protolude hiding (decodeUtf8, encodeUtf8) import Data.Aeson import qualified Data.Text as T import Data.Text.Lazy.Encoding (decodeUtf8, encodeUtf8) diff --git a/stack-ghc-8.0.yaml b/stack-ghc-8.0.yaml index d56763ecc2..e5075cde59 100644 --- a/stack-ghc-8.0.yaml +++ b/stack-ghc-8.0.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2016-05-29 +resolver: nightly-2016-07-11 packages: - '.' extra-deps: diff --git a/stack.yaml b/stack.yaml index 304ee4c265..1990820fc7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-6.1 +resolver: lts-6.7 packages: - '.' extra-deps: []