git.iko.soy/gogol
on develop help sign in
Updating to Stackage LTS 5.4
commit74848f589d06188d7fe439fcaec57cf8f8ae8f04 authorBrendan Hay <brendan.g.hay@gmail.com> dateThu 17 Mar 2016, 06:58 (11 years ago) parentf829c0f
7 files changed+15−14
compare with develop
unifiedsplit
gen/gogol-gen.cabal+4−3 gen/src/Gen/AST/Flatten.hs+3−4 gen/src/Gen/IO.hs+3−1 gen/src/Gen/Syntax.hs+1−1 gen/stack.yaml+1−1 stack-7.10.2.yaml → stack-7.10.3.yaml+2−3 stack.yaml+1−1
gen/gogol-gen.cabal+4−3
@@ -46,16 +46,16 @@ executable gogol-gen
4646 build-depends:
4747 aeson
4848 , attoparsec
49− , base == 4.8.*
49+ , base >= 4.8
5050 , bifunctors
5151 , bytestring
5252 , case-insensitive
5353 , directory-tree
5454 , ede
55− , errors
55+ , errors >= 2.1.2
5656 , formatting
5757 , hashable
58− , haskell-src-exts
58+ , haskell-src-exts >= 1.17.1
5959 , hindent
6060 , lens
6161 , mtl
@@ -69,4 +69,5 @@ executable gogol-gen
6969 , text-icu
7070 , text-manipulate
7171 , text-regex-replace
72+ , unexceptionalio
7273 , unordered-containers
gen/src/Gen/AST/Flatten.hs+3−4
@@ -30,7 +30,6 @@ import qualified Data.HashMap.Strict as Map
3030import qualified Data.HashSet as Set
3131import Data.Maybe
3232import Data.Semigroup ((<>))
33−import qualified Data.Text as Text
3433import Gen.Formatting
3534import Gen.Types
3635import Prelude hiding (sum)
@@ -157,10 +156,10 @@ method qs suf m@Method {..} = do
157156 typ <- reserveType typ'
158157 b <- body typ
159158
160− let params = ps <> qs
161− fields = Map.delete "alt" $ b (Map.map _pParam params)
159+ let params = ps <> qs
160+ fields' = Map.delete "alt" $ b (Map.map _pParam params)
162161
163− void $ insert typ (SObj schemaInfo (Obj Nothing fields))
162+ void $ insert typ (SObj schemaInfo (Obj Nothing fields'))
164163 pure $! m { _mParameters = params }
165164 where
166165 schemaInfo = emptyInfo { _iDescription = _mDescription }
gen/src/Gen/IO.hs+3−1
@@ -13,6 +13,7 @@ module Gen.IO where
1313
1414import Control.Error
1515import Control.Monad.Except
16+import Data.Bifunctor (first)
1617import Data.ByteString (ByteString)
1718import qualified Data.Text.Lazy as LText
1819import Data.Text.Lazy.Builder (toLazyText)
@@ -23,12 +24,13 @@ import Gen.Formatting
2324import Gen.Types
2425import System.IO
2526import qualified Text.EDE as EDE
27+import UnexceptionalIO (Unexceptional, fromIO, runUIO)
2628
2729run :: ExceptT Error IO a -> IO a
2830run = runScript . fmapLT LText.unpack
2931
3032io :: MonadIO m => IO a -> ExceptT Error m a
31−io = fmapLT (LText.pack . show) . syncIO
33+io = ExceptT . fmap (first (LText.pack . show)) . liftIO . runUIO . fromIO
3234
3335title :: MonadIO m => Format (ExceptT Error m ()) a -> a
3436title m = runFormat m (io . LText.putStrLn . toLazyText)
gen/src/Gen/Syntax.hs+1−1
@@ -308,7 +308,7 @@ googleRequestDecl g n assoc extras p api url fields m pat prec =
308308 where
309309 request = InsDecl (FunBind [match])
310310 where
311− match = Match noLoc (name "requestClient") [prec] Nothing rhs decls
311+ match = Match noLoc (name "requestClient") [prec] Nothing rhs (Just decls)
312312
313313 decls = BDecls
314314 [ patBind noLoc pat $
gen/stack.yaml+1−1
@@ -1,4 +1,4 @@
1−resolver: nightly-2015-10-18
1+resolver: lts-5.4
22flags: {}
33extra-deps:
44 - text-regex-replace-0.1.1.1
stack-7.10.2.yaml → stack-7.10.3.yamlrenamed+2−3
@@ -1,7 +1,6 @@
1−resolver: lts-3.10
1+resolver: 5.4
22flags: {}
3−extra-deps:
4− - memory-0.10
3+extra-deps: []
54packages:
65 - core
76 - gogol
stack.yaml+1−1
@@ -1 +1 @@
1−stack-7.10.2.yaml
1+stack-7.10.3.yaml