You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/09/01 21:56:05 UTC
git commit: THRIFT-2677 haskell library and tutorial: build with
network > 2.5
Repository: thrift
Updated Branches:
refs/heads/master b3c8409c2 -> aa42d61d7
THRIFT-2677 haskell library and tutorial: build with network > 2.5
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/aa42d61d
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/aa42d61d
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/aa42d61d
Branch: refs/heads/master
Commit: aa42d61d7a596c00b6587f14ed5e87bbbbf0646e
Parents: b3c8409
Author: John Chee <ch...@gmail.com>
Authored: Mon Aug 25 22:08:46 2014 -0700
Committer: Roger Meier <ro...@apache.org>
Committed: Mon Sep 1 21:55:04 2014 +0200
----------------------------------------------------------------------
lib/hs/Thrift.cabal | 10 +++++++++-
tutorial/hs/ThriftTutorial.cabal | 12 ++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/aa42d61d/lib/hs/Thrift.cabal
----------------------------------------------------------------------
diff --git a/lib/hs/Thrift.cabal b/lib/hs/Thrift.cabal
index bd88299..7c9a295 100755
--- a/lib/hs/Thrift.cabal
+++ b/lib/hs/Thrift.cabal
@@ -32,11 +32,19 @@ License-File: ../../LICENSE
Description:
Haskell bindings for the Apache Thrift RPC system. Requires the use of the thrift code generator.
+flag network-uri
+ description: Get Network.URI from the network-uri package
+ default: True
+
Library
Hs-Source-Dirs:
src
Build-Depends:
- base >= 4, base < 5, containers, network, ghc-prim, attoparsec, binary, bytestring >= 0.10, hashable, HTTP, text, unordered-containers, vector, QuickCheck, split
+ base >= 4, base < 5, containers, ghc-prim, attoparsec, binary, bytestring >= 0.10, hashable, HTTP, text, unordered-containers, vector, QuickCheck, split
+ if flag(network-uri)
+ build-depends: network-uri >= 2.6, network >= 2.6
+ else
+ build-depends: network < 2.6
Exposed-Modules:
Thrift,
Thrift.Arbitraries
http://git-wip-us.apache.org/repos/asf/thrift/blob/aa42d61d/tutorial/hs/ThriftTutorial.cabal
----------------------------------------------------------------------
diff --git a/tutorial/hs/ThriftTutorial.cabal b/tutorial/hs/ThriftTutorial.cabal
index b38fc5c..e6f0182 100755
--- a/tutorial/hs/ThriftTutorial.cabal
+++ b/tutorial/hs/ThriftTutorial.cabal
@@ -32,12 +32,16 @@ License-File: ../../LICENSE
Description:
Haskell tutorial for the Apache Thrift RPC system. Requires the use of the thrift code generator.
+flag network-uri
+ description: Get Network.URI from the network-uri package
+ default: True
+
Executable HaskellServer
Main-is: HaskellServer.hs
Hs-Source-Dirs:
., gen-hs/
Build-Depends:
- base >= 4, base < 5, network, ghc-prim, containers, thrift, vector, unordered-containers, text, hashable, bytestring, QuickCheck
+ base >= 4, base < 5, ghc-prim, containers, thrift, vector, unordered-containers, text, hashable, bytestring, QuickCheck
Extensions:
DeriveDataTypeable,
ExistentialQuantification,
@@ -53,7 +57,11 @@ Executable HaskellClient
Hs-Source-Dirs:
., gen-hs/
Build-Depends:
- base >= 4, base < 5, network, ghc-prim, containers, thrift, vector, QuickCheck
+ base >= 4, base < 5, ghc-prim, containers, thrift, vector, QuickCheck
+ if flag(network-uri)
+ build-depends: network-uri >= 2.6, network >= 2.6
+ else
+ build-depends: network < 2.6
Extensions:
DeriveDataTypeable,
ExistentialQuantification,