git.iko.soy/typeable/pandoc
on master help sign in
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.

commitffa3d7160ead338a75f04167bc4931b8b55d608c authorJohn MacFarlane <jgm@berkeley.edu> dateWed 27 Dec 2017, 20:21 (9 years ago) parent4371b07
5 files changed+12−21
compare with master
unifiedsplit
linux/Dockerfile+2−2 macos/make_macos_package.sh+1−1 stack.pkg.yaml−16 stack.yaml+8−1 windows/make-windows-installer.bat+1−1
linux/Dockerfile+2−2
@@ -14,7 +14,7 @@ RUN mkdir -p /usr/src/
1414WORKDIR /usr/src/
1515RUN git clone https://github.com/jgm/pandoc
1616WORKDIR /usr/src/pandoc
17−RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
17+RUN stack install --compiler 'ghc-8.0.2' --only-dependencies \
1818 --flag 'pandoc:static' \
1919 --flag 'pandoc:embed_data_files' \
2020 --flag 'pandoc-citeproc:static' \
@@ -24,7 +24,7 @@ RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
2424 pandoc pandoc-citeproc
2525CMD git pull && \
2626 git checkout -b work $TREE && \
27− stack install --stack-yaml stack.pkg.yaml \
27+ stack install --compiler 'ghc-8.0.2' \
2828 --flag 'pandoc:static' \
2929 --flag 'pandoc:embed_data_files' \
3030 --flag 'pandoc-citeproc:static' \
macos/make_macos_package.sh+1−1
@@ -27,7 +27,7 @@ stack setup
2727
2828echo Building pandoc...
2929stack clean
30−stack install --ghc-options="-O2" --stack-yaml=stack.pkg.yaml --local-bin-path $DEST/bin/ pandoc pandoc-citeproc
30+stack install --ghc-options="-O2" --local-bin-path $DEST/bin/ pandoc pandoc-citeproc
3131
3232strip $DEST/bin/pandoc
3333strip $DEST/bin/pandoc-citeproc
stack.pkg.yamldeleted−16
@@ -1,16 +0,0 @@
1−flags:
2− pandoc:
3− trypandoc: false
4− embed_data_files: true
5− old-locale: false
6− network-uri: true
7− pandoc-citeproc:
8− bibutils: true
9− embed_data_files: true
10− unicode_collation: false
11− test_citeproc: false
12− debug: false
13−packages:
14−- '.'
15−extra-deps: []
16−resolver: lts-10.1
stack.yaml+8−1
@@ -1,9 +1,16 @@
11flags:
22 pandoc:
33 trypandoc: false
4− embed_data_files: false
4+ embed_data_files: true
55 old-locale: false
66 network-uri: true
7+ pandoc-citeproc:
8+ bibutils: true
9+ embed_data_files: true
10+ unicode_collation: false
11+ test_citeproc: false
12+ debug: false
713packages:
14+- '.'
815extra-deps: []
916resolver: lts-10.1
windows/make-windows-installer.bat+1−1
@@ -1,5 +1,5 @@
11@echo off
2−stack install --test --ghc-options="-O2" --stack-yaml=..\stack.pkg.yml
2+stack install --test --ghc-options="-O2" --stack-yaml=..\stack.yaml
33if %errorlevel% neq 0 exit /b %errorlevel%
44for /f "delims=" %%a in ('stack path --local-bin-path') do @set BINPATH=%%a
55%BINPATH%\pandoc.exe -s --toc ..\MANUAL.txt -o MANUAL.html