From 85b9abc7a37fbd2f08992e770e6c9c4e7e8d16bf Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 16 Jan 2017 12:11:23 +0100
Subject: [PATCH] Compile against pandoc-types 1.18.*.
---
pandoc.cabal | 6 +++---
stack.yaml | 7 ++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pandoc.cabal b/pandoc.cabal
index 7cb292b05..b62fe551d 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -270,7 +270,7 @@ Library
xml >= 1.3.12 && < 1.4,
random >= 1 && < 1.2,
extensible-exceptions >= 0.1 && < 0.2,
- pandoc-types >= 1.17 && < 1.18,
+ pandoc-types >= 1.18 && < 1.19,
aeson >= 0.7 && < 1.2,
tagsoup >= 0.13.7 && < 0.15,
base64-bytestring >= 0.1 && < 1.1,
@@ -426,7 +426,7 @@ Library
Executable pandoc
Build-Depends: pandoc,
- pandoc-types >= 1.17 && < 1.18,
+ pandoc-types >= 1.18 && < 1.19,
base >= 4.2 && <5,
directory >= 1.2 && < 1.4,
filepath >= 1.1 && < 1.5,
@@ -504,7 +504,7 @@ Test-Suite test-pandoc
Build-Depends: base >= 4.2 && < 5,
syb >= 0.1 && < 0.7,
pandoc,
- pandoc-types >= 1.17 && < 1.18,
+ pandoc-types >= 1.18 && < 1.19,
bytestring >= 0.9 && < 0.11,
text >= 0.11 && < 1.3,
directory >= 1 && < 1.4,
diff --git a/stack.yaml b/stack.yaml
index b58c3725f..66122c920 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -7,8 +7,13 @@ flags:
network-uri: true
packages:
- '.'
+- location:
+ git: https://github.com/jgm/pandoc-types.git
+ commit: 973394685aad945ccd92a86bf76e5c644e72e127
+- location:
+ git: https://github.com/jgm/texmath.git
+ commit: 31273683a376e97848028e4619f28ab8c03c88af
extra-deps:
-- texmath-0.9
- doctemplates-0.1.0.2
- pandoc-types-1.17.0.4
- skylighting-0.1.1.1