Skip to content

Commit e336bba

Browse files
Hyunje Junpaf31
authored andcommitted
Remove extra-deps from stack-ghc-8.0.yaml (purescript#2636)
To use the packages in the resolver, version constraints in the cabal file is loosened. Also Pursuit.hs is modified to support the higher version of http-client, without behaviour change.
1 parent 74ca00d commit e336bba

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

purescript.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ source-repository head
113113

114114
library
115115
build-depends: base >=4.8 && <5,
116-
aeson >= 0.8 && < 1.0,
116+
aeson >= 0.8 && < 1.1,
117117
aeson-better-errors >= 0.8,
118118
ansi-terminal >= 0.6.2 && < 0.7,
119119
base-compat >=0.6.0,
@@ -133,7 +133,7 @@ library
133133
fsnotify >= 0.2.1,
134134
Glob >= 0.7 && < 0.8,
135135
haskeline >= 0.7.0.0,
136-
http-client >= 0.4.30 && <0.5,
136+
http-client >= 0.4.30 && < 0.6.0,
137137
http-types -any,
138138
language-javascript >= 0.6.0.9 && < 0.7,
139139
lens == 4.*,
@@ -144,7 +144,7 @@ library
144144
parallel >= 3.2 && < 3.3,
145145
parsec >=3.1.10,
146146
pattern-arrows >= 0.0.2 && < 0.1,
147-
pipes >= 4.0.0 && < 4.3.0,
147+
pipes >= 4.0.0 && < 4.4.0,
148148
pipes-http -any,
149149
process >= 1.2.0 && < 1.5,
150150
protolude >= 0.1.6,
@@ -341,7 +341,7 @@ library
341341

342342
executable purs
343343
build-depends: base >=4 && <5,
344-
aeson >= 0.8 && < 1.0,
344+
aeson >= 0.8 && < 1.1,
345345
ansi-terminal >= 0.6.2 && < 0.7,
346346
ansi-wl-pprint -any,
347347
base-compat >=0.6.0,
@@ -373,7 +373,7 @@ executable purs
373373
wai == 3.*,
374374
wai-websockets == 3.*,
375375
warp == 3.*,
376-
websockets >= 0.9 && <0.10
376+
websockets >= 0.9 && <0.11
377377
main-is: Main.hs
378378
buildable: True
379379
hs-source-dirs: app

src/Language/PureScript/Ide/Pursuit.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ queryPursuit q = do
4545

4646

4747
handler :: HttpException -> IO [a]
48-
handler StatusCodeException{} = pure []
4948
handler _ = pure []
5049

5150
searchPursuitForDeclarations :: Text -> IO [PursuitResponse]

stack-ghc-8.0.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,4 @@ resolver: nightly-2017-01-31
22
packages:
33
- '.'
44
extra-deps:
5-
- aeson-0.11.3.0
6-
- bower-json-1.0.0.1
7-
- http-client-0.4.31.2
8-
- http-client-tls-0.2.4.1
9-
- optparse-applicative-0.13.0.0
10-
- pipes-4.1.9
11-
- pipes-http-1.0.2
12-
- wai-websockets-3.0.0.9
13-
- websockets-0.9.6.2
5+
- pipes-http-1.0.5

0 commit comments

Comments
 (0)