summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-10-23 11:20:31 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2017-10-23 11:20:31 -0700
commita27dc79073dacfa325275a7dee35322738ba05b5 (patch)
tree203fb0a64e4ae7be02bb0a76ce7992ba0130f92f
parentcecf02e326e72d19392ab2045af80f6e1b0c2d46 (diff)
Updated Glob upper bound.
-rw-r--r--Makefile2
-rw-r--r--pandoc.cabal2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 52e6e8fb1..e4d05eb1d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ version?=$(shell grep '^Version:' pandoc.cabal | awk '{print $$2;}')
pandoc=$(shell find dist -name pandoc -type f -exec ls -t {} \; | head -1)
sourcefiles=$(shell find pandoc.hs src test -name '*.hs')
BRANCH?=master
-RESOLVER=nightly-2017-08-09
+RESOLVER=nightly-2017-10-22
GHCOPTS=-fdiagnostics-color=always -Wall -fno-warn-unused-do-bind -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
quick:
diff --git a/pandoc.cabal b/pandoc.cabal
index ea6d98f58..d4dba30eb 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -332,7 +332,7 @@ library
haddock-library >= 1.1 && < 1.5,
deepseq >= 1.3 && < 1.5,
JuicyPixels >= 3.1.6.1 && < 3.3,
- Glob >= 0.7 && < 0.9,
+ Glob >= 0.7 && < 0.10,
cmark-gfm >= 0.1.1 && < 0.2,
doctemplates >= 0.2.1 && < 0.3,
http-client >= 0.4.30 && < 0.6,