git.iko.soy/gogol
on develop help sign in
Adding doccker by default
commit0e58f57595fa2595ce8b679fe70dd28e580e3c76 authorBrendan Hay <brendan.g.hay@gmail.com> dateTue 6 Oct 2015, 19:48 (11 years ago) parent0ee2aac
4 files changed+6−3
compare with develop
unifiedsplit
Makefile+1−1 core/src/Network/Google/Prelude.hs+1−1 core/src/Network/Google/Types.hs+3 stack-7.10.2.yaml+1−1
Makefile+1−1
@@ -3,7 +3,7 @@ LIBRARIES ?= core gogol $(SERVICES)
33FORWARD := sdist upload candidate
44
55build:
6− stack build
6+ stack --docker --docker-run-args '--memory=3G --cpuset-cpus=0,1' build
77
88clean:
99 stack clean
core/src/Network/Google/Prelude.hs+1−1
@@ -20,7 +20,7 @@ import Data.Maybe as Export
2020import Data.Monoid as Export (mempty, (<>))
2121import Data.Proxy as Export
2222import Data.Text as Export (Text)
23−import Data.Time as Export
23+import Data.Time as Export (UTCTime)
2424import Data.Word as Export (Word32, Word64, Word8)
2525import GHC.Generics as Export (Generic)
2626import Network.Google.Data.JSON as Export
core/src/Network/Google/Types.hs+3
@@ -235,6 +235,9 @@ clientEmpty = clientRequest go Nothing
235235class Accept c => ToStream c a where
236236 toStream :: Proxy c -> a -> Stream
237237
238+instance ToStream OctetStream Stream where
239+ toStream Proxy = id
240+
238241instance ToJSON a => ToStream JSON a where
239242 toStream Proxy = newResumableSource . CL.sourceList . LBS.toChunks . encode
240243
stack-7.10.2.yaml+1−1
@@ -1,4 +1,4 @@
1−resolver: nightly-2015-09-10
1+resolver: lts-3.8
22flags: {}
33extra-deps: []
44packages: