on master help sign in
Merge pull request #33 from basvandijk/deepseq

Allow building with both the newer and older deepseq and containers

commit875c496cf2a3321a08e1d97ee25e298ac29133f3 authorBryan O'Sullivan <bos@serpentine.com> dateThu 27 Oct 2011, 15:20 (15 years ago) parent84e773b39369c9
1 file changed+12−2
aeson.cabal+12−2
aeson.cabal+12−2
@@ -105,6 +105,9 @@ flag developer
105105 description: operate in developer mode
106106 default: False
107107
108+flag old-deepseq-containers
109+ default: False
110+
108111library
109112 exposed-modules:
110113 Data.Aeson
@@ -124,8 +127,6 @@ library
124127 blaze-builder >= 0.2.1.4,
125128 blaze-textual >= 0.2.0.2,
126129 bytestring,
127− containers,
128− deepseq < 1.2,
129130 hashable >= 1.1.2.0,
130131 mtl,
131132 old-locale,
@@ -136,6 +137,15 @@ library
136137 unordered-containers >= 0.1.3.0,
137138 vector >= 0.7
138139
140+ if flag(old-deepseq-containers)
141+ build-depends:
142+ containers < 0.4.2,
143+ deepseq < 1.2
144+ else
145+ build-depends:
146+ containers >= 0.4.2,
147+ deepseq >= 1.2
148+
139149 if flag(developer)
140150 ghc-options: -Werror
141151 ghc-prof-options: -auto-all