From c18bb2ab58a3e65b1b71c867990c2a008d3ce89b Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 3 Apr 2022 23:13:48 -0700
Subject: [PATCH] Use latest doclayout (0.4)
---
cabal.project | 8 ++++----
pandoc.cabal | 4 ++--
stack.yaml | 5 ++---
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/cabal.project b/cabal.project
index 62d356496..8a3643e28 100644
--- a/cabal.project
+++ b/cabal.project
@@ -4,7 +4,7 @@ flags: +embed_data_files
constraints: aeson >= 2.0.1.0
-source-repository-package
- type: git
- location: https://github.com/jgm/doclayout.git
- tag: b274a5658f3655f31c0bc6175d5b27a9467c1456
+-- source-repository-package
+-- type: git
+-- location: https://github.com/jgm/doclayout.git
+-- tag: b274a5658f3655f31c0bc6175d5b27a9467c1456
diff --git a/pandoc.cabal b/pandoc.cabal
index 0c77c0b1c..b1266ffaf 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -481,14 +481,14 @@ library
data-default >= 0.4 && < 0.8,
deepseq >= 1.3 && < 1.5,
directory >= 1.2.3 && < 1.4,
- doclayout >= 0.3.1.1 && < 0.4,
+ doclayout >= 0.4 && < 0.5,
doctemplates >= 0.10 && < 0.11,
emojis >= 0.1 && < 0.2,
exceptions >= 0.8 && < 0.11,
file-embed >= 0.0 && < 0.1,
filepath >= 1.1 && < 1.5,
haddock-library >= 1.10 && < 1.11,
- hslua-module-doclayout>= 1.0.2 && < 1.1,
+ hslua-module-doclayout>= 1.0.4 && < 1.1,
hslua-module-path >= 1.0 && < 1.1,
hslua-module-system >= 1.0 && < 1.1,
hslua-module-text >= 1.0 && < 1.1,
diff --git a/stack.yaml b/stack.yaml
index 65ecfecb2..86253b7f1 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -9,7 +9,6 @@ packages:
extra-deps:
- skylighting-core-0.12.3
- skylighting-0.12.3
-- doctemplates-0.10.0.1
- emojis-0.1.2
- lpeg-1.0.3
- hslua-2.2.0
@@ -39,8 +38,8 @@ extra-deps:
- citeproc-0.7
- commonmark-0.2.2
- commonmark-extensions-0.2.3.1
-- git: https://github.com/jgm/doclayout.git
- commit: b274a5658f3655f31c0bc6175d5b27a9467c1456
+- doclayout-0.4
+- doctemplates-0.10.0.2
ghc-options:
"$locals": -fhide-source-paths -Wno-missing-home-modules
resolver: lts-18.10