From 39b247ee9208fbbb2f183ddf5d0db98772a51b3e Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt <jaspervdj@gmail.com>
Date: Sun, 17 Dec 2017 11:57:44 +0100
Subject: Get Travis working again (longer timeouts...)

---
 .travis.yml  | 24 +++++++-----------------
 hakyll.cabal |  4 ++--
 stack.yaml   |  7 +++++--
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ba6728d..769b72c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,18 @@
+language: haskell
+ghc: '8.0.2'
 sudo: false
 
 cache:
   directories:
-  - $HOME/.stack
+  - '$HOME/.cabal'
+  - '$HOME/.ghc'
 
 branches:
   only:
-    - master
-
-cache:
-  directories:
-  - $HOME/.stack
-  - .stack-work
-
-before_install:
-  - mkdir -p ~/.local/bin
-  - export PATH=$HOME/.local/bin:$PATH
-  - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
+    - 'master'
 
 install:
-  - stack --no-terminal --skip-ghc-check setup
-
-before_script:
-  - echo "override before_script"
+  - travis_wait 40 cabal install --enable-tests
 
 script:
-  - stack --no-terminal --skip-ghc-check test
+  - cabal test
diff --git a/hakyll.cabal b/hakyll.cabal
index 79cf1e9..2eaab3d 100644
--- a/hakyll.cabal
+++ b/hakyll.cabal
@@ -168,7 +168,7 @@ Library
     mtl                  >= 1      && < 2.3,
     network              >= 2.6    && < 2.7,
     network-uri          >= 2.6    && < 2.7,
-    pandoc               >= 2.0    && < 2.1,
+    pandoc               >= 2.0.5  && < 2.1,
     pandoc-citeproc      >= 0.12   && < 0.13,
     parsec               >= 3.0    && < 3.2,
     process              >= 1.6    && < 1.7,
@@ -263,7 +263,7 @@ Test-suite hakyll-tests
     mtl                  >= 1      && < 2.3,
     network              >= 2.6    && < 2.7,
     network-uri          >= 2.6    && < 2.7,
-    pandoc               >= 2.0    && < 2.1,
+    pandoc               >= 2.0.5  && < 2.1,
     pandoc-citeproc      >= 0.12   && < 0.13,
     parsec               >= 3.0    && < 3.2,
     process              >= 1.6    && < 1.7,
diff --git a/stack.yaml b/stack.yaml
index 389a469..3e644a9 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,6 +1,5 @@
-resolver: nightly-2017-11-20
+resolver: nightly-2017-12-14
 extra-package-dbs: []
-extra-deps: []
 
 flags:
   hakyll:
@@ -11,6 +10,10 @@ flags:
 packages:
   - '.'
 
+extra-deps:
+  - hslua-module-text-0.1.2
+  - skylighting-0.5
+
 nix:
   enable: false
   packages:
-- 
cgit v1.2.3