summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgesh2025-03-19 17:00:05 +0200
committergesh2025-03-26 14:57:57 +0200
commit5eaa708683b44e697c72e3d4a07a034e1a75c731 (patch)
tree5d9d2591354d812a378d8a9e1f375229a3e39396
parent7fd967d534cf0f4e59594423dc7b101c04a49f26 (diff)
downloadaur-pandoc-static-git.tar.gz
Move to building using cabal
Upstream has indicated[1] that stack support is getting demoted, preempt the move to test migration early. [1]: https://github.com/jgm/pandoc/issues/10695#issuecomment-2727635792
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD22
2 files changed, 15 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9a9323c62358..e47785e1d91d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
pkgbase = pandoc-static-git
pkgdesc = Conversion between markup formats (static build, dynamic Lua support)
- pkgver = 3.6.2.r6.gba04a9987
+ pkgver = 3.6.4.r8.g68bb4ae58
pkgrel = 1
url = https://pandoc.org
arch = i686
arch = x86_64
license = GPL-2.0-or-later
makedepends = git
- makedepends = stack
+ makedepends = cabal-install
depends = gmp
depends = zlib
optdepends = texlive-core: for pdf output
- provides = pandoc-cli=3.6.2
- provides = pandoc=3.6.2
+ provides = pandoc-cli=3.6.4
+ provides = pandoc=3.6.4
conflicts = pandoc-cli
conflicts = pandoc
source = pandoc-static-git::git+https://github.com/jgm/pandoc.git
diff --git a/PKGBUILD b/PKGBUILD
index 0957ebb1056e..a6622ae7396a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ shopt -s extglob
pkgname=pandoc-static-git
_pkgname_old=(pandoc-cli pandoc)
-pkgver=3.6.2.r6.gba04a9987
+pkgver=3.6.4.r8.g68bb4ae58
pkgrel=1
pkgdesc='Conversion between markup formats (static build, dynamic Lua support)'
arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ license=('GPL-2.0-or-later')
provides=("${_pkgname_old[@]/%/=${pkgver%%*([a-z]).r*}}")
conflicts=("${_pkgname_old[@]}")
depends=('gmp' 'zlib')
-makedepends=('git' 'stack')
+makedepends=('git' 'cabal-install')
optdepends=('texlive-core: for pdf output')
_url=https://github.com/jgm/pandoc
source=("$pkgname::git+$_url.git")
@@ -39,28 +39,28 @@ pkgver() {
prepare() {
cd "$pkgname"
- stack config set resolver lts-23.1 # ghc-9.8.4
+ cabal update
+ cabal configure --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \
+ --enable-tests --flag embed_data_files
+ cabal build --only-dependencies
}
build() {
cd "$pkgname"
- stack build \
- --install-ghc \
- --ghc-options='-fdiagnostics-color=always' \
- --flag 'pandoc:embed_data_files' \
- --fast
- stack run -- --bash-completion > pandoc.bash
+ cabal build --offline
+ cabal run -v0 pandoc-cli -- --bash-completion > pandoc.bash
}
check() {
cd "$pkgname"
- stack test
+ cabal test
}
package() {
cd "$pkgname"
- stack install --verbose --local-bin-path "$pkgdir/usr/bin"
+ mkdir -p "$pkgdir/usr/bin"
+ cabal install pandoc-cli --install-method=copy --installdir "$pkgdir/usr/bin"
env -C "$pkgdir/usr/bin" ln -s pandoc pandoc-lua
env -C "$pkgdir/usr/bin" ln -s pandoc pandoc-server
install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"