Removed stack.pkg.yaml.

We only really need stack.yaml; we can put flag settings
for pandoc-citeproc there.

Also use ghc-8.0.2 in dockerized linux build.  This is
the only version available for alpine so far.

linux/Dockerfile

@@ -14,7 +14,7 @@ RUN mkdir -p /usr/src/
 WORKDIR /usr/src/
 RUN git clone https://github.com/jgm/pandoc
 WORKDIR /usr/src/pandoc
-RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
+RUN stack install --compiler 'ghc-8.0.2' --only-dependencies \
     --flag 'pandoc:static' \
     --flag 'pandoc:embed_data_files' \
     --flag 'pandoc-citeproc:static' \
@@ -24,7 +24,7 @@ RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
     pandoc pandoc-citeproc
 CMD git pull && \
     git checkout -b work $TREE && \
-    stack install --stack-yaml stack.pkg.yaml \
+    stack install --compiler 'ghc-8.0.2' \
       --flag 'pandoc:static' \
       --flag 'pandoc:embed_data_files' \
       --flag 'pandoc-citeproc:static' \

macos/make_macos_package.sh

@@ -27,7 +27,7 @@ stack setup
 
 echo Building pandoc...
 stack clean
-stack install --ghc-options="-O2" --stack-yaml=stack.pkg.yaml --local-bin-path $DEST/bin/ pandoc pandoc-citeproc
+stack install --ghc-options="-O2" --local-bin-path $DEST/bin/ pandoc pandoc-citeproc
 
 strip $DEST/bin/pandoc
 strip $DEST/bin/pandoc-citeproc

stack.pkg.yaml

@@ -1,16 +0,0 @@
-flags:
-  pandoc:
-    trypandoc: false
-    embed_data_files: true
-    old-locale: false
-    network-uri: true
-  pandoc-citeproc:
-    bibutils: true
-    embed_data_files: true
-    unicode_collation: false
-    test_citeproc: false
-    debug: false
-packages:
-- '.'
-extra-deps: []
-resolver: lts-10.1

stack.yaml

@@ -1,9 +1,16 @@
 flags:
   pandoc:
     trypandoc: false
-    embed_data_files: false
+    embed_data_files: true
     old-locale: false
     network-uri: true
+  pandoc-citeproc:
+    bibutils: true
+    embed_data_files: true
+    unicode_collation: false
+    test_citeproc: false
+    debug: false
 packages:
+- '.'
 extra-deps: []
 resolver: lts-10.1

windows/make-windows-installer.bat

@@ -1,5 +1,5 @@
 @echo off
-stack install --test --ghc-options="-O2" --stack-yaml=..\stack.pkg.yml
+stack install --test --ghc-options="-O2" --stack-yaml=..\stack.yaml
 if %errorlevel% neq 0 exit /b %errorlevel%
 for /f "delims=" %%a in ('stack path --local-bin-path') do @set BINPATH=%%a
 %BINPATH%\pandoc.exe -s --toc ..\MANUAL.txt -o MANUAL.html