summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnMacFarlane <>2017-11-02 17:50:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-11-02 17:50:00 (GMT)
commit2304e8072397f48137b0e0d994ada49d6cd29959 (patch)
tree6dae15274fecee9672bbe18e5d4df0bb9631c589
parentd5801934a3be170db7555290e1bf6f90c2cf5e2b (diff)
version 0.11.1.30.11.1.3
-rw-r--r--changelog5
-rw-r--r--pandoc-citeproc.cabal7
-rw-r--r--stack.yaml6
3 files changed, 10 insertions, 8 deletions
diff --git a/changelog b/changelog
index ce1b2ec..6349456 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,8 @@
+pandoc-citeproc (0.11.1.3)
+
+ * Align static flag with pandoc's.
+ * Update version bound for xml-conduit.
+
pandoc-citeproc (0.11.1.2)
* Fixed quotes in three test cases. We'd been using straight quotes.
diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal
index c2fc430..180c937 100644
--- a/pandoc-citeproc.cabal
+++ b/pandoc-citeproc.cabal
@@ -1,5 +1,5 @@
name: pandoc-citeproc
-version: 0.11.1.2
+version: 0.11.1.3
cabal-version: >= 1.12
synopsis: Supports using pandoc with citeproc
@@ -113,7 +113,7 @@ library
aeson >= 0.7 && < 1.3,
text,
vector,
- xml-conduit >= 1.2 && < 1.7,
+ xml-conduit >= 1.2 && < 1.8,
unordered-containers >= 0.2 && < 0.3,
data-default,
setenv >= 0.1 && < 0.2,
@@ -164,8 +164,7 @@ executable pandoc-citeproc
default-language: Haskell2010
ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind
if flag(static)
- ld-options: -static -pthread
- ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind -fPIC
+ ld-options: -static
if flag(bibutils)
default-extensions: CPP
cpp-options: -DUSE_BIBUTILS
diff --git a/stack.yaml b/stack.yaml
index 116afbd..a710dbf 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -5,13 +5,11 @@ flags:
unicode_collation: false
test_citeproc: false
debug: false
+ static: false
packages:
- '.'
-- location:
- git: https://github.com/jgm/pandoc.git
- commit: 47e2719cc3e18a6216c886b8ab7166f48bfe457f
- extra-dep: true
extra-deps:
+- pandoc-2.0.1
- texmath-0.9.4.2
- hslua-0.9.2
- skylighting-0.4.2