summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwereHamster <>2016-12-28 19:20:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2016-12-28 19:20:00 (GMT)
commit57616af1f16d3d5368d8a309cb7871f119238470 (patch)
tree8908d48027c943e696ee2f34f4611ed96d8d38b9
parent3c88aa24916d46f2bbf29ef4e3d5e31fc24cf496 (diff)
version 0.0.17.1HEAD0.0.17.1master
-rw-r--r--avers.cabal28
-rw-r--r--src/Avers/TH.hs4
2 files changed, 16 insertions, 16 deletions
diff --git a/avers.cabal b/avers.cabal
index 17221e2..4c4b926 100644
--- a/avers.cabal
+++ b/avers.cabal
@@ -1,5 +1,5 @@
name: avers
-version: 0.0.17.0
+version: 0.0.17.1
cabal-version: >=1.10
build-type: Simple
license: GPL-3
@@ -33,7 +33,7 @@ library
Avers.Types
Avers.Views
build-depends:
- aeson >=1.0.2.0 && <1.1,
+ aeson >=1.0.2.1 && <1.1,
attoparsec >=0.13.1.0 && <0.14,
base >=4.9.0.0 && <4.10,
bytestring >=0.10.8.1 && <0.11,
@@ -43,17 +43,17 @@ library
mtl >=2.2.1 && <2.3,
network >=2.6.3.1 && <2.7,
network-uri >=2.6.1.0 && <2.7,
- safe >=0.3.9 && <0.4,
+ safe >=0.3.10 && <0.4,
stm >=2.4.4.1 && <2.5,
template-haskell >=2.11.0.0 && <2.12,
text >=1.2.2.1 && <1.3,
time >=1.6.0.1 && <1.7,
- unordered-containers >=0.2.7.1 && <0.3,
+ unordered-containers >=0.2.7.2 && <0.3,
vector >=0.11.0.0 && <0.12,
MonadRandom >=0.4.2.3 && <0.5,
- cryptonite ==0.20.*,
- memory ==0.13.*,
- inflections >=0.2.0.1 && <0.3,
+ cryptonite ==0.21.*,
+ memory ==0.14.*,
+ inflections <0.3 && >=0.3.0.0,
resource-pool >=0.2.3.2 && <0.3,
rethinkdb-client-driver >=0.0.23 && <0.1,
scrypt >=0.5.0 && <0.6
@@ -66,15 +66,15 @@ test-suite spec
main-is: Test.hs
build-depends:
MonadRandom >=0.4.2.3 && <0.5,
- aeson >=1.0.2.0 && <1.1,
+ aeson >=1.0.2.1 && <1.1,
attoparsec >=0.13.1.0 && <0.14,
- avers >=0.0.17.0 && <0.1,
+ avers >=0.0.17.1 && <0.1,
base >=4.9.0.0 && <4.10,
base16-bytestring >=0.1.1.6 && <0.2,
bytestring >=0.10.8.1 && <0.11,
containers >=0.5.7.1 && <0.6,
cryptohash >=0.11.9 && <0.12,
- hspec >=2.2.3 && <2.3,
+ hspec >=2.3.2 && <2.4,
inflections >=0.2.0.1 && <0.3,
mtl >=2.2.1 && <2.3,
resource-pool >=0.2.3.2 && <0.3,
@@ -83,7 +83,7 @@ test-suite spec
stm >=2.4.4.1 && <2.5,
text >=1.2.2.1 && <1.3,
time >=1.6.0.1 && <1.7,
- unordered-containers >=0.2.7.1 && <0.3,
+ unordered-containers >=0.2.7.2 && <0.3,
vector >=0.11.0.0 && <0.12
default-language: Haskell2010
hs-source-dirs: test
@@ -92,11 +92,11 @@ benchmark benchmark
type: exitcode-stdio-1.0
main-is: Benchmark.hs
build-depends:
- aeson >=1.0.2.0 && <1.1,
- avers >=0.0.17.0 && <0.1,
+ aeson >=1.0.2.1 && <1.1,
+ avers >=0.0.17.1 && <0.1,
base >=4.9.0.0 && <4.10,
mtl >=2.2.1 && <2.3,
- criterion >=1.1.1.0 && <1.2,
+ criterion >=1.1.4.0 && <1.2,
resource-pool >=0.2.3.2 && <0.3,
rethinkdb-client-driver >=0.0.23 && <0.1,
network-uri >=2.6.1.0 && <2.7,
diff --git a/src/Avers/TH.hs b/src/Avers/TH.hs
index 44facc8..79519ea 100644
--- a/src/Avers/TH.hs
+++ b/src/Avers/TH.hs
@@ -50,9 +50,9 @@ deriveJSONOptions prefix = defaultOptions
}
dasherizeTag :: String -> String
-dasherizeTag x = case parseCamelCase [] x of
+dasherizeTag x = case parseCamelCase [] (T.pack x) of
Left err -> error $ show err
- Right res -> map toLower $ dasherize res
+ Right res -> map toLower $ T.unpack $ dasherize res
variantOptions :: String -> String -> String -> Options
variantOptions tagField contentsField prefix = defaultOptions