Skip to content

Commit 3039875

Browse files
committed
Remove dependency on old network version
This allows us to remove the flag. Fixes #160
1 parent 482194f commit 3039875

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

HTTP.cabal

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Cabal-Version: >= 1.10
1+
Cabal-Version: 3.6
22
Name: HTTP
33
Version: 4000.4.1
44
x-revision: 5
55
Build-type: Simple
6-
License: BSD3
6+
License: BSD-3-Clause
77
License-file: LICENSE
88
Author: Warrick Gray <[email protected]>
99
Maintainer: Ganesh Sittampalam <[email protected]>
@@ -91,10 +91,6 @@ Flag warp-tests
9191
default: False
9292
manual: True
9393

94-
flag network-uri
95-
description: Get Network.URI from the network-uri package
96-
default: True
97-
9894
Library
9995
Exposed-modules:
10096
Network.BufferType,
@@ -114,7 +110,7 @@ Library
114110
Other-modules:
115111
Network.HTTP.Base64,
116112
Network.HTTP.MD5Aux,
117-
Network.HTTP.Utils
113+
Network.HTTP.Utils,
118114
Paths_HTTP
119115
GHC-options: -fwarn-missing-signatures -Wall
120116

@@ -131,16 +127,12 @@ Library
131127
-- The following dependencies are refined by flags, but they should
132128
-- still be mentioned here on the top-level.
133129
, mtl >= 2.0.0.0 && < 2.4
134-
, network >= 2.4 && < 3.3
130+
, network >= 2.6 && < 3.3
131+
, network-uri ^>= 2.6
135132

136133
default-language: Haskell98
137134
default-extensions: FlexibleInstances
138135

139-
if flag(network-uri)
140-
Build-depends: network-uri == 2.6.*, network >= 2.6
141-
else
142-
Build-depends: network < 2.6
143-
144136
if flag(warn-as-error)
145137
ghc-options: -Werror
146138

0 commit comments

Comments
 (0)