aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <[email protected]>2019-11-12 11:15:13 -0800
committerJohn MacFarlane <[email protected]>2019-11-12 11:15:13 -0800
commit7cd9694e5c34d87466749901feb52237def379fe (patch)
treee2c14455782108dad3bad1a2fd94ed8f249c917a
parent37aeb807752f4e1fe97c63ba8e0354aa3935e117 (diff)
Use released texmath, pandoc-types.text
-rw-r--r--cabal.project10
-rw-r--r--pandoc.cabal6
-rw-r--r--stack.yaml10
3 files changed, 5 insertions, 21 deletions
diff --git a/cabal.project b/cabal.project
index dfbb44135..ed1aac8a6 100644
--- a/cabal.project
+++ b/cabal.project
@@ -12,13 +12,3 @@ source-repository-package
type: git
location: https://github.com/jgm/pandoc-citeproc
tag: 0.16.3.1
-
-source-repository-package
- type: git
- location: https://github.com/despresc/pandoc-types
- tag: 59c45cdd996ed57c51112e3c22be4a8e2ea697a3
-
-source-repository-package
- type: git
- location: https://github.com/jgm/texmath
- tag: 0d71300d91513bdd812d2c89b78460c15c277457
diff --git a/pandoc.cabal b/pandoc.cabal
index 67357eae6..d25446779 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -381,11 +381,11 @@ library
safe >= 0.3 && < 0.4,
zip-archive >= 0.2.3.4 && < 0.5,
HTTP >= 4000.0.5 && < 4000.4,
- texmath >= 0.11.3 && < 0.12,
+ texmath >= 0.12 && < 0.13,
xml >= 1.3.12 && < 1.4,
split >= 0.2 && < 0.3,
random >= 1 && < 1.2,
- pandoc-types >= 1.17.6 && < 1.18,
+ pandoc-types >= 1.20 && < 1.21,
aeson >= 0.7 && < 1.5,
scientific >= 0.3 && < 0.4,
aeson-pretty >= 0.8.5 && < 0.9,
@@ -705,7 +705,7 @@ test-suite test-pandoc
hs-source-dirs: test
build-depends: base >= 4.8 && < 5,
pandoc,
- pandoc-types >= 1.17.6 && < 1.18,
+ pandoc-types >= 1.20 && < 1.21,
mtl >= 2.2 && < 2.3,
bytestring >= 0.9 && < 0.11,
base64-bytestring >= 0.1 && < 1.1,
diff --git a/stack.yaml b/stack.yaml
index a524253c8..e87705eea 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -13,14 +13,8 @@ packages:
- '.'
extra-deps:
- pandoc-citeproc-0.16.3.1
-#- pandoc-types-1.17.6.1
-#- texmath-0.11.3
- # The text branch
-- git: [email protected]:jgm/texmath
- commit: 0d71300d91513bdd812d2c89b78460c15c277457
- # The text branch
-- git: [email protected]:despresc/pandoc-types
- commit: 59c45cdd996ed57c51112e3c22be4a8e2ea697a3
+- pandoc-types-1.20
+- texmath-0.12
- haddock-library-1.8.0
- skylighting-0.8.2.3
- skylighting-core-0.8.2.3