diff options
| author | ickc <ickc@users.noreply.github.com> | 2016-05-09 19:24:40 -0700 |
|---|---|---|
| committer | ickc <ickc@users.noreply.github.com> | 2016-05-09 19:24:40 -0700 |
| commit | 0ae60a91535a8f55f3061f36fdb3a54f6ddda85d (patch) | |
| tree | f0c74ae411967ed5f67bd8b0bdf175ee5ca964ab /osx | |
| parent | 846fa8704618e7e544313f5b3b627ccb6e65b550 (diff) | |
| parent | f7601297f0ff184a59efdc3ea279137fc6012eef (diff) | |
| download | pandoc-0ae60a91535a8f55f3061f36fdb3a54f6ddda85d.tar.gz | |
Merge pull request #1 from jgm/master
Merge from jgm's master
Diffstat (limited to 'osx')
| -rw-r--r-- | osx/distribution.xml.in (renamed from osx/distribution.xml) | 2 | ||||
| -rw-r--r-- | osx/stack.yaml | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/osx/distribution.xml b/osx/distribution.xml.in index 346fe06fe..145fc0f21 100644 --- a/osx/distribution.xml +++ b/osx/distribution.xml.in @@ -11,7 +11,7 @@ <options hostArchitectures="x86_64" /> <!-- List all component packages --> <pkg-ref id="net.johnmacfarlane.pandoc" - version="1.16.0.2" + version="PANDOCVERSION" auth="root">pandoc.pkg</pkg-ref> <!-- List them again here. They can now be organized as a hierarchy if you want. --> diff --git a/osx/stack.yaml b/osx/stack.yaml index 50a90f9d6..c29a7f45b 100644 --- a/osx/stack.yaml +++ b/osx/stack.yaml @@ -16,6 +16,9 @@ ghc-options: highlighting-kate: '-pgmP cpphs -optP--cpp' packages: - '..' -- 'https://hackage.haskell.org/package/pandoc-citeproc-0.9/pandoc-citeproc-0.9.tar.gz' +- 'https://hackage.haskell.org/package/pandoc-citeproc-0.9.1.1/pandoc-citeproc-0.9.1.1.tar.gz' extra-deps: -resolver: lts-5.2 +- 'aeson-0.11.1.1' +- 'texmath-0.8.5' +- 'highlighting-kate-0.6.2' +resolver: lts-5.8 |