diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-07-20 13:48:20 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-07-20 13:48:20 -0700 |
| commit | c52fa069002e1a89f30143256a9d48bc7065e1ae (patch) | |
| tree | 01f762ac084e3b8845c8179337a099e47f43b6e8 | |
| parent | 34533dd8d19ee8e420fddb5c3aeba99cfc326947 (diff) | |
| download | pandoc-c52fa069002e1a89f30143256a9d48bc7065e1ae.tar.gz | |
Small changes in debian package creation.
Use more recent resolver, no longer need custom stack.yaml
for hsb2hs
| -rwxr-xr-x | deb/make_deb.sh | 3 | ||||
| -rw-r--r-- | stack.hsb2hs.yaml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/deb/make_deb.sh b/deb/make_deb.sh index fc1f1e232..ed06d2e6b 100755 --- a/deb/make_deb.sh +++ b/deb/make_deb.sh @@ -19,8 +19,7 @@ TEMPDIR=make_binary_package.tmp.$$ # We need this for hsb2hs: PATH=$LOCAL/bin:$PATH -which hsb2hs || stack install --install-ghc --stack-yaml stack.hsb2hs.yaml - +stack install --install-ghc --stack-yaml deb/stack.yaml --local-bin-path . hsb2hs stack install --install-ghc --stack-yaml deb/stack.yaml --local-bin-path . pandoc pandoc-citeproc make man/pandoc.1 diff --git a/stack.hsb2hs.yaml b/stack.hsb2hs.yaml index 7dd7899f9..be12b37d5 100644 --- a/stack.hsb2hs.yaml +++ b/stack.hsb2hs.yaml @@ -1,4 +1,4 @@ packages: - 'https://hackage.haskell.org/package/preprocessor-tools-1.0.1/preprocessor-tools-1.0.1.tar.gz' - 'https://hackage.haskell.org/package/hsb2hs-0.3.1/hsb2hs-0.3.1.tar.gz' -resolver: lts-4.0 +resolver: lts-6.5 |