From 395f20a0484b3be14614169b74a8f5b9e063bb2b Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 12 Feb 2017 21:41:16 +0100
Subject: [PATCH] Replaced {deb,macos,windows}/stack.yaml with stack.pkg.yaml.

---
 deb/make_deb.sh                    |  4 ++--
 deb/stack.yaml                     | 21 ---------------------
 macos/make_macos_package.sh        |  2 +-
 macos/stack.yaml => stack.pkg.yaml |  2 +-
 windows/make-windows-installer.bat |  2 +-
 windows/stack.yaml                 | 21 ---------------------
 6 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 deb/stack.yaml
 rename macos/stack.yaml => stack.pkg.yaml (98%)
 delete mode 100644 windows/stack.yaml

diff --git a/deb/make_deb.sh b/deb/make_deb.sh
index f07264d78..572698ae6 100755
--- a/deb/make_deb.sh
+++ b/deb/make_deb.sh
@@ -22,8 +22,8 @@ mkdir -p $DEST/bin
 mkdir -p $DEST/share/man/man1
 mkdir -p $DEST/share/doc/pandoc
 
-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
+stack install --install-ghc --stack-yaml stack.pkg.yaml --local-bin-path . hsb2hs
+stack install --install-ghc --stack-yaml stack.pkg.yaml --local-bin-path . pandoc pandoc-citeproc
 
 make man/pandoc.1
 # get pandoc-citeproc man page:
diff --git a/deb/stack.yaml b/deb/stack.yaml
deleted file mode 100644
index d0e84a147..000000000
--- a/deb/stack.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-flags:
-  pandoc:
-    trypandoc: false
-    https: true
-    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:
-- '..'
-- location:
-    git: https://github.com/jgm/pandoc-citeproc.git
-    commit: c53a27513318f1d23303ee27e46da9e7702c798e
-  extra-dep: true
-extra-deps:
-resolver: lts-8.0
diff --git a/macos/make_macos_package.sh b/macos/make_macos_package.sh
index 39e7bf1c2..911219f14 100755
--- a/macos/make_macos_package.sh
+++ b/macos/make_macos_package.sh
@@ -28,7 +28,7 @@ which cpphs  || stack install cpphs
 
 echo Building pandoc...
 stack clean
-stack install --stack-yaml=$MACOS/stack.yaml --local-bin-path . pandoc pandoc-citeproc
+stack install --stack-yaml=stack.pkg.yaml --local-bin-path . pandoc pandoc-citeproc
 
 echo Getting man pages...
 make man/pandoc.1
diff --git a/macos/stack.yaml b/stack.pkg.yaml
similarity index 98%
rename from macos/stack.yaml
rename to stack.pkg.yaml
index 56a348479..4121ff466 100644
--- a/macos/stack.yaml
+++ b/stack.pkg.yaml
@@ -12,7 +12,7 @@ flags:
     test_citeproc: false
     debug: false
 packages:
-- '..'
+- '.'
 - location:
     git: https://github.com/jgm/pandoc-citeproc.git
     commit: 9de619a02f79544bec933e4366a0d2f92ae2fe13
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
index 30af17d0c..76f22295e 100644
--- a/windows/make-windows-installer.bat
+++ b/windows/make-windows-installer.bat
@@ -1,5 +1,5 @@
 @echo off
-stack install --test
+stack install --test --stack-yaml ..\stack.pkg.yml
 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
diff --git a/windows/stack.yaml b/windows/stack.yaml
deleted file mode 100644
index 4cd629f2d..000000000
--- a/windows/stack.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-flags:
-  pandoc:
-    trypandoc: false
-    https: true
-    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:
-- '..'
-- location:
-    git: https://github.com/jgm/pandoc-citeproc.git
-    commit: c53a27513318f1d23303ee27e46da9e7702c798e
-  extra-dep: true
-extra-deps: []
-resolver: lts-8.0