summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2014-09-03 15:40:26 +0000
committerhallgren <hallgren@chalmers.se>2014-09-03 15:40:26 +0000
commita21ffc194185165ab487e0553cd5c4d0a36a8a9d (patch)
tree53cfe09e2a3a982a6757e2c5acc786b6da147849
parente0e6079c9141a0c2d7d2a6dda50496e237bfc8bb (diff)
gf.cabal, gf-server.cabal: add version bounds on network & httpd-shed
* httpd-shed-0.4 does not specify an upper bound on network, but it fails to build against network>=2.6. This is fixed in httpd-shed-0.4.0.2. * With network-2.6, the Network.URI modules is moved to a separate package, so for the time being GF requires network>=2.3 && <2.6. This is compatible with the four most recent versions of the Haskell Platform.
-rw-r--r--gf.cabal2
-rw-r--r--src/server/gf-server.cabal4
2 files changed, 3 insertions, 3 deletions
diff --git a/gf.cabal b/gf.cabal
index c254c9894..bde0bd32b 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -154,7 +154,7 @@ Executable gf
utf8-string
ghc-options: -threaded -fwarn-unused-imports
if flag(server)
- build-depends: httpd-shed, network, json, cgi
+ build-depends: httpd-shed>=0.4.0.2, network>=2.3 && <2.6, json, cgi
-- ,silently
cpp-options: -DSERVER_MODE
other-modules: GFServer
diff --git a/src/server/gf-server.cabal b/src/server/gf-server.cabal
index bfe8cf346..d5e58e359 100644
--- a/src/server/gf-server.cabal
+++ b/src/server/gf-server.cabal
@@ -36,9 +36,9 @@ Library
process,
gf >= 3.6,
cgi >= 3001.1.7.3,
- httpd-shed,
+ httpd-shed>=0.4.0.2,
mtl,
- network,
+ network>=2.3 && <2.6,
json >= 0.3.3,
utf8-string >= 0.3.1.1,
bytestring,