Skip to content

Commit 729af7f

Browse files
authored
Merge pull request #3 from haskell-streaming/update
update dependencies and ensure build for ghc >= 7.10.3
2 parents 507ebc6 + 40f998b commit 729af7f

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
dist
2+
dist-newstyle
3+
*.ghc*
24
cabal-dev
35
*.o
46
*.hi

Data/ByteString/Streaming/HTTP.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{-#LANGUAGE OverloadedStrings #-}
1+
{-# LANGUAGE OverloadedStrings #-}
22
-- | This module replicates `pipes-http` as closely as will type-check, adding a
33
-- conduit-like @http@ in @ResourceT@ and a primitive @simpleHTTP@ that emits
44
-- a streaming bytestring rather than a lazy one.
@@ -38,7 +38,7 @@
3838
-- > import Data.ByteString.Streaming.HTTP
3939
-- >
4040
-- > main = do
41-
-- > req <- parseUrl "https://www.example.com"
41+
-- > req <- parseUrlThrow "https://www.example.com"
4242
-- > m <- newManager tlsManagerSettings
4343
-- > runResourceT $ do
4444
-- > resp <- http request manager
@@ -205,7 +205,7 @@ import Data.ByteString.Streaming.HTTP
205205
simpleHTTP :: MonadResource m => String -> ByteString m ()
206206
simpleHTTP url = do
207207
man <- liftIO (newManager tlsManagerSettings)
208-
req <- liftIO (parseUrl url)
208+
req <- liftIO (parseUrlThrow url)
209209
bracketByteString
210210
(responseOpen req man)
211211
responseClose

nix-ci-ish.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
nix-shell -I nixpkgs=https://github.com/nixos/nixpkgs-channels/archive/nixos-17.09.tar.gz -p haskell.compiler.ghc7103 --run "cabal new-build"
2+
nix-shell -I nixpkgs=https://github.com/nixos/nixpkgs-channels/archive/nixos-17.09.tar.gz -p haskell.compiler.ghc802 --run "cabal new-build"
3+
nix-shell -I nixpkgs=https://github.com/nixos/nixpkgs-channels/archive/nixos-18.09.tar.gz -p haskell.compiler.ghc822 --run "cabal new-build"
4+
nix-shell -I nixpkgs=https://github.com/nixos/nixpkgs-channels/archive/nixos-18.09.tar.gz -p haskell.compiler.ghc844 --run "cabal new-build"
5+
nix-shell -I nixpkgs=https://github.com/nixos/nixpkgs-channels/archive/nixos-18.09.tar.gz -p haskell.compiler.ghc862 --run "cabal new-build"
6+

streaming-utils.cabal

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,15 @@ description: This package includes http-client, aeson, attoparsec, zlib
3939
license: BSD3
4040
license-file: LICENSE
4141
author: michaelt
42-
maintainer: what_is_it_to_do_anything@yahoo.com
42+
maintainer: chessai1996@gmail.com
4343
-- copyright:
44-
category: Data
4544
build-type: Simple
45+
category: Data, Pipes, Streaming
4646
-- extra-source-files:
4747
cabal-version: >=1.10
4848
stability: Experimental
4949
homepage: https://github.com/michaelt/streaming-utils
5050
bug-reports: https://github.com/michaelt/streaming-utils/issues
51-
category: Data, Pipes, Streaming
5251
source-repository head
5352
type: git
5453
location: https://github.com/michaelt/streaming-utils
@@ -64,22 +63,22 @@ library
6463
-- other-modules:
6564
other-extensions: CPP, Trustworthy
6665

67-
build-depends: base >=4.7 && <5.0,
68-
transformers >=0.4 && <0.5.3,
66+
build-depends: base >=4.8 && <5.0,
67+
transformers >=0.4 && <0.6,
6968
mtl >=2.2 && <2.3,
7069
attoparsec > 0.13.0.0 && < 0.14,
71-
streaming >= 0.1.4.0 && < 0.3,
72-
streaming-bytestring >= 0.1.4.0 && < 0.2,
73-
bytestring > 0.10.0 && < 0.11.0,
70+
streaming >= 0.2 && < 0.3,
71+
streaming-bytestring >= 0.1 && < 0.2,
72+
bytestring > 0.10 && < 0.11,
7473
pipes >= 4.0 && < 4.4,
7574
network-simple,
7675
network,
77-
http-client >=0.2 && <0.6,
76+
http-client >=0.2 && <0.7,
7877
http-client-tls,
79-
aeson > 0.8 && <1.3,
80-
json-stream > 0.4.0 && < 0.4.2,
81-
resourcet > 1.0 && < 1.2,
82-
streaming-commons > 0.1.0 && < 0.2
78+
aeson > 0.8 && <1.5,
79+
json-stream > 0.4 && < 0.5,
80+
resourcet > 1.0 && < 1.3,
81+
streaming-commons > 0.2 && < 0.3
8382

8483
-- hs-source-dirs:
8584
default-language: Haskell2010

0 commit comments

Comments
 (0)