Work

3 files changed, 265 insertions, 264 deletions

diff --git a/skip/pandoc/cabal.config b/skip/pandoc/cabal.config
new file mode 100644
index 0000000..19f0515
--- /dev/null
+++ b/skip/pandoc/cabal.config
@@ -0,0 +1,223 @@
+--2.19.1
+constraints: Cabal ==3.4.1.0,
+             Glob ==0.10.2,
+             HUnit ==1.6.2.0,
+             HsYAML ==0.2.1.1,
+             JuicyPixels ==3.3.8,
+             OneTuple ==0.3.1,
+             QuickCheck ==2.14.2,
+             SHA ==1.6.4.4,
+             StateVar ==1.2.2,
+             aeson ==2.1.0.0,
+             aeson-pretty ==0.8.9,
+             ansi-terminal ==0.11.3,
+             ansi-wl-pprint ==0.6.9,
+             appar ==0.1.8,
+             array ==0.5.4.0,
+             asn1-encoding ==0.9.6,
+             asn1-parse ==0.9.5,
+             asn1-types ==0.3.4,
+             assoc ==1.0.2,
+             async ==2.2.4,
+             attoparsec ==0.14.4,
+             attoparsec-iso8601 ==1.0.2.1,
+             auto-update ==0.1.6,
+             base ==4.15.1.0,
+             base-compat ==0.12.2,
+             base-compat-batteries ==0.12.2,
+             base-orphans ==0.8.7,
+             base16-bytestring ==1.0.2.0,
+             base64 ==0.4.2.4,
+             base64-bytestring ==1.2.1.0,
+             basement ==0.0.15,
+             bifunctors ==5.5.12,
+             binary ==0.8.8.0,
+             bitvec ==1.1.3.0,
+             blaze-builder ==0.4.2.2,
+             blaze-html ==0.9.1.2,
+             blaze-markup ==0.8.2.8,
+             boring ==0.2,
+             bsb-http-chunked ==0.0.0.4,
+             byteorder ==1.0.4,
+             bytestring ==0.10.12.1,
+             cabal-doctest ==1.0.9,
+             call-stack ==0.4.0,
+             case-insensitive ==1.2.1.0,
+             cereal ==0.5.8.3,
+             citeproc ==0.8.0.1,
+             cmdargs ==0.10.21,
+             colour ==2.3.6,
+             commonmark ==0.2.2,
+             commonmark-extensions ==0.2.3.2,
+             commonmark-pandoc ==0.2.1.2,
+             comonad ==5.0.8,
+             conduit ==1.3.4.2,
+             conduit-extra ==1.3.6,
+             connection ==0.3.1,
+             constraints ==0.13.4,
+             containers ==0.6.4.1,
+             contravariant ==1.5.5,
+             cookie ==0.4.5,
+             cryptonite ==0.30,
+             data-default ==0.7.1.1,
+             data-default-class ==0.1.2.0,
+             data-default-instances-containers ==0.0.1,
+             data-default-instances-dlist ==0.0.1,
+             data-default-instances-old-locale ==0.0.1,
+             data-fix ==0.3.2,
+             dec ==0.0.5,
+             deepseq ==1.4.5.0,
+             digest ==0.0.1.3,
+             directory ==1.3.6.2,
+             distributive ==0.6.2.1,
+             dlist ==1.0,
+             doclayout ==0.4,
+             doctemplates ==0.10.0.2,
+             easy-file ==0.2.2,
+             emojis ==0.1.2,
+             exceptions ==0.10.4,
+             fast-logger ==3.1.1,
+             file-embed ==0.0.15.0,
+             filepath ==1.4.2.1,
+             generically ==0.1,
+             ghc-bignum ==1.1,
+             ghc-boot-th ==9.0.2,
+             ghc-prim ==0.7.0,
+             gridtables ==0.0.3.0,
+             haddock-library ==1.11.0,
+             happy ==1.20.0,
+             hashable ==1.4.1.0,
+             haskell-lexer ==1.1,
+             hourglass ==0.2.12,
+             hsc2hs ==0.68.8,
+             hslua ==2.2.1,
+             hslua-aeson ==2.2.1,
+             hslua-classes ==2.2.0,
+             hslua-core ==2.2.1,
+             hslua-marshalling ==2.2.1,
+             hslua-module-doclayout ==1.0.4,
+             hslua-module-path ==1.0.3,
+             hslua-module-system ==1.0.2,
+             hslua-module-text ==1.0.2,
+             hslua-module-version ==1.0.2,
+             hslua-objectorientation ==2.2.1,
+             hslua-packaging ==2.2.1,
+             http-api-data ==0.4.3,
+             http-client ==0.7.13.1,
+             http-client-tls ==0.3.6.1,
+             http-date ==0.0.11,
+             http-media ==0.8.0.0,
+             http-types ==0.12.3,
+             http2 ==3.0.3,
+             indexed-traversable ==0.1.2,
+             indexed-traversable-instances ==0.1.1.1,
+             integer-gmp ==1.1,
+             integer-logarithms ==1.0.3.1,
+             iproute ==1.7.12,
+             ipynb ==0.2,
+             jira-wiki-markup ==1.4.0,
+             libyaml ==0.1.2,
+             lpeg ==1.0.3,
+             lua ==2.2.1,
+             memory ==0.17.0,
+             mime-types ==0.1.0.9,
+             mmorph ==1.2.0,
+             monad-control ==1.0.3.1,
+             mono-traversable ==1.0.15.3,
+             mtl ==2.2.2,
+             network ==3.1.2.7,
+             network-byte-order ==0.1.6,
+             network-uri ==2.6.4.1,
+             old-locale ==1.0.0.7,
+             old-time ==1.1.0.3,
+             optparse-applicative ==0.17.0.0,
+             pandoc-lua-marshal ==0.1.7,
+             pandoc-types ==1.22.2.1,
+             parsec ==3.1.14.0,
+             pem ==0.2.4,
+             pretty ==1.1.3.6,
+             pretty-show ==1.10,
+             primitive ==0.7.4.0,
+             process ==1.6.13.2,
+             psqueues ==0.2.7.3,
+             random ==1.2.1.1,
+             resourcet ==1.2.6,
+             rts ==1.0.2,
+             safe ==0.3.19,
+             scientific ==0.3.7.0,
+             semialign ==1.2.0.1,
+             semigroupoids ==5.3.7,
+             servant ==0.19,
+             servant-server ==0.19.1,
+             simple-sendfile ==0.2.30,
+             singleton-bool ==0.1.6,
+             skylighting ==0.13,
+             skylighting-core ==0.13,
+             skylighting-format-ansi ==0.1,
+             skylighting-format-blaze-html ==0.1,
+             skylighting-format-latex ==0.1,
+             socks ==0.6.1,
+             some ==1.0.4,
+             sop-core ==0.5.0.2,
+             split ==0.2.3.5,
+             splitmix ==0.1.0.4,
+             stm ==2.5.0.0,
+             streaming-commons ==0.2.2.4,
+             strict ==0.4.0.1,
+             string-conversions ==0.4.0.1,
+             syb ==0.7.2.1,
+             tagged ==0.8.6.1,
+             tagsoup ==0.14.8,
+             template-haskell ==2.17.0.0,
+             temporary ==1.3,
+             texmath ==0.12.5.2,
+             text ==1.2.5.0,
+             text-conversions ==0.3.1.1,
+             text-short ==0.1.5,
+             th-abstraction ==0.4.4.0,
+             th-compat ==0.1.4,
+             th-lift ==0.8.2,
+             th-lift-instances ==0.1.19,
+             these ==1.1.1.1,
+             time ==1.9.3,
+             time-compat ==1.9.6.1,
+             time-manager ==0.0.0,
+             tls ==1.6.0,
+             transformers ==0.5.6.2,
+             transformers-base ==0.4.6,
+             transformers-compat ==0.7.2,
+             type-equality ==1,
+             typed-process ==0.2.10.1,
+             unicode-collation ==0.1.3.2,
+             unicode-data ==0.3.0,
+             unicode-transforms ==0.4.0.1,
+             uniplate ==1.6.13,
+             unix ==2.7.2.2,
+             unix-compat ==0.6,
+             unix-time ==0.4.7,
+             unliftio ==0.2.22.0,
+             unliftio-core ==0.2.0.1,
+             unordered-containers ==0.2.19.1,
+             utf8-string ==1.0.2,
+             uuid-types ==1.0.5,
+             vault ==0.3.1.5,
+             vector ==0.13.0.0,
+             vector-algorithms ==0.9.0.1,
+             vector-stream ==0.1.0.0,
+             wai ==3.2.3,
+             wai-app-static ==3.1.7.4,
+             wai-extra ==3.1.12.1,
+             wai-logger ==2.4.0,
+             warp ==3.3.22,
+             witherable ==0.4.2,
+             word8 ==0.1.3,
+             x509 ==1.7.7,
+             x509-store ==1.6.9,
+             x509-system ==1.6.7,
+             x509-validation ==1.6.12,
+             xml ==1.3.14,
+             xml-conduit ==1.9.1.1,
+             xml-types ==0.3.8,
+             yaml ==0.11.8.0,
+             zip-archive ==0.4.2.1,
+             zlib ==0.6.3.0
diff --git a/skip/pandoc/cabal.project.freeze b/skip/pandoc/cabal.project.freeze
deleted file mode 100644
index c532ee0..0000000
--- a/skip/pandoc/cabal.project.freeze
+++ /dev/null
@@ -1,249 +0,0 @@
-active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.4.0.0,
-             any.Diff ==0.4.0,
-             any.Glob ==0.10.2,
-             any.HsYAML ==0.2.1.0,
-             HsYAML -exe,
-             any.JuicyPixels ==3.3.6,
-             JuicyPixels -mmap,
-             any.OneTuple ==0.3.1,
-             any.QuickCheck ==2.14.2,
-             QuickCheck -old-random +templatehaskell,
-             any.SHA ==1.6.4.4,
-             SHA -exe,
-             any.StateVar ==1.2.2,
-             any.aeson ==2.0.2.0,
-             aeson -bytestring-builder -cffi +ordered-keymap,
-             any.aeson-pretty ==0.8.9,
-             aeson-pretty -lib-only,
-             any.ansi-terminal ==0.11.1,
-             ansi-terminal -example,
-             any.ansi-wl-pprint ==0.6.9,
-             ansi-wl-pprint -example,
-             any.appar ==0.1.8,
-             any.array ==0.5.4.0,
-             any.asn1-encoding ==0.9.6,
-             any.asn1-parse ==0.9.5,
-             any.asn1-types ==0.3.4,
-             any.assoc ==1.0.2,
-             any.async ==2.2.4,
-             async -bench,
-             any.attoparsec ==0.14.3,
-             attoparsec -developer,
-             any.base ==4.15.0.0,
-             any.base-compat ==0.12.1,
-             any.base-compat-batteries ==0.12.1,
-             any.base-orphans ==0.8.6,
-             any.base16-bytestring ==1.0.2.0,
-             any.base64-bytestring ==1.2.1.0,
-             any.basement ==0.0.12,
-             any.bifunctors ==5.5.11,
-             bifunctors +semigroups +tagged,
-             any.binary ==0.8.8.0,
-             any.blaze-builder ==0.4.2.2,
-             any.blaze-html ==0.9.1.2,
-             any.blaze-markup ==0.8.2.8,
-             any.byteorder ==1.0.4,
-             any.bytestring ==0.10.12.1,
-             any.cabal-doctest ==1.0.9,
-             any.call-stack ==0.4.0,
-             any.case-insensitive ==1.2.1.0,
-             any.cereal ==0.5.8.2,
-             cereal -bytestring-builder,
-             any.citeproc ==0.6,
-             citeproc -executable -icu,
-             any.clock ==0.8.2,
-             clock -llvm,
-             any.cmdargs ==0.10.21,
-             cmdargs +quotation -testprog,
-             any.colour ==2.3.6,
-             any.commonmark ==0.2.1.1,
-             any.commonmark-extensions ==0.2.2.1,
-             any.commonmark-pandoc ==0.2.1.1,
-             any.comonad ==5.0.8,
-             comonad +containers +distributive +indexed-traversable,
-             any.conduit ==1.3.4.2,
-             any.conduit-extra ==1.3.5,
-             any.connection ==0.3.1,
-             any.containers ==0.6.4.1,
-             any.contravariant ==1.5.5,
-             contravariant +semigroups +statevar +tagged,
-             any.cookie ==0.4.5,
-             any.cryptonite ==0.29,
-             cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
-             any.data-default ==0.7.1.1,
-             any.data-default-class ==0.1.2.0,
-             any.data-default-instances-containers ==0.0.1,
-             any.data-default-instances-dlist ==0.0.1,
-             any.data-default-instances-old-locale ==0.0.1,
-             any.data-fix ==0.3.2,
-             any.deepseq ==1.4.5.0,
-             any.digest ==0.0.1.3,
-             digest -bytestring-in-base,
-             any.directory ==1.3.6.1,
-             any.distributive ==0.6.2.1,
-             distributive +semigroups +tagged,
-             any.dlist ==1.0,
-             dlist -werror,
-             any.doclayout ==0.3.1.1,
-             any.doctemplates ==0.10.0.1,
-             any.emojis ==0.1.2,
-             any.errors ==2.3.0,
-             any.exceptions ==0.10.4,
-             any.file-embed ==0.0.15.0,
-             any.filepath ==1.4.2.1,
-             any.ghc-bignum ==1.0,
-             any.ghc-bignum-orphans ==0.1.1,
-             any.ghc-boot-th ==9.0.1,
-             any.ghc-prim ==0.7.0,
-             any.haddock-library ==1.10.0,
-             any.happy ==1.20.0,
-             any.hashable ==1.4.0.1,
-             hashable +containers +integer-gmp -random-initial-seed,
-             any.haskell-lexer ==1.1,
-             any.hourglass ==0.2.12,
-             any.hsc2hs ==0.68.8,
-             hsc2hs -in-ghc-tree,
-             any.hslua ==2.0.1,
-             any.hslua-classes ==2.0.0,
-             any.hslua-core ==2.0.0.2,
-             any.hslua-marshalling ==2.0.1,
-             any.hslua-module-path ==1.0.0,
-             any.hslua-module-system ==1.0.0,
-             any.hslua-module-text ==1.0.0,
-             any.hslua-module-version ==1.0.0,
-             any.hslua-objectorientation ==2.0.1,
-             any.hslua-packaging ==2.0.0,
-             any.http-client ==0.7.9,
-             http-client +network-uri,
-             any.http-client-tls ==0.3.5.3,
-             any.http-types ==0.12.3,
-             any.indexed-traversable ==0.1.2,
-             any.indexed-traversable-instances ==0.1.1,
-             any.integer-gmp ==1.1,
-             any.integer-logarithms ==1.0.3.1,
-             integer-logarithms -check-bounds +integer-gmp,
-             any.iproute ==1.7.12,
-             any.ipynb ==0.1.0.2,
-             any.jira-wiki-markup ==1.4.0,
-             any.libyaml ==0.1.2,
-             libyaml -no-unicode -system-libyaml,
-             any.lpeg ==1.0.1,
-             lpeg -rely-on-shared-lpeg-library,
-             any.lua ==2.0.2,
-             lua +allow-unsafe-gc -apicheck +export-dynamic +hardcode-reg-keys -lua_32bits -pkg-config -system-lua,
-             any.memory ==0.16.0,
-             memory +support_basement +support_bytestring +support_deepseq +support_foundation,
-             any.mime-types ==0.1.0.9,
-             any.mono-traversable ==1.0.15.3,
-             any.mtl ==2.2.2,
-             any.network ==3.1.2.5,
-             network -devel,
-             any.network-uri ==2.6.4.1,
-             any.old-locale ==1.0.0.7,
-             any.optparse-applicative ==0.16.1.0,
-             optparse-applicative +process,
-             pandoc +embed_data_files -trypandoc,
-             any.pandoc-types ==1.22.1,
-             any.parsec ==3.1.14.0,
-             any.pem ==0.2.4,
-             any.pretty ==1.1.3.6,
-             any.pretty-show ==1.10,
-             any.primitive ==0.7.3.0,
-             any.process ==1.6.11.0,
-             any.random ==1.2.1,
-             any.resourcet ==1.2.4.3,
-             any.rts ==1.0,
-             any.safe ==0.3.19,
-             any.scientific ==0.3.7.0,
-             scientific -bytestring-builder -integer-simple,
-             any.semialign ==1.2.0.1,
-             semialign +semigroupoids,
-             any.semigroupoids ==5.3.6,
-             semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
-             any.skylighting ==0.12.1,
-             skylighting -executable,
-             any.skylighting-core ==0.12.1,
-             skylighting-core -executable,
-             any.socks ==0.6.1,
-             any.split ==0.2.3.4,
-             any.splitmix ==0.1.0.4,
-             splitmix -optimised-mixer,
-             any.stm ==2.5.0.0,
-             any.streaming-commons ==0.2.2.3,
-             streaming-commons -use-bytestring-builder,
-             any.strict ==0.4.0.1,
-             strict +assoc,
-             any.syb ==0.7.2.1,
-             any.tagged ==0.8.6.1,
-             tagged +deepseq +transformers,
-             any.tagsoup ==0.14.8,
-             any.tasty ==1.4.2.1,
-             tasty +clock +unix,
-             any.tasty-bench ==0.3.1,
-             tasty-bench -debug +tasty,
-             any.tasty-golden ==2.3.4,
-             tasty-golden -build-example,
-             any.tasty-hunit ==0.10.0.3,
-             any.tasty-lua ==1.0.0,
-             any.tasty-quickcheck ==0.10.2,
-             any.template-haskell ==2.17.0.0,
-             any.temporary ==1.3,
-             any.texmath ==0.12.3.2,
-             texmath -executable +network-uri,
-             any.text ==1.2.4.1,
-             any.text-conversions ==0.3.1,
-             any.text-short ==0.1.4,
-             text-short -asserts,
-             any.th-abstraction ==0.4.3.0,
-             any.th-compat ==0.1.3,
-             any.th-lift ==0.8.2,
-             any.th-lift-instances ==0.1.18,
-             any.these ==1.1.1.1,
-             these +assoc,
-             any.time ==1.9.3,
-             any.time-compat ==1.9.6.1,
-             time-compat -old-locale,
-             any.tls ==1.5.5,
-             tls +compat -hans +network,
-             any.transformers ==0.5.6.2,
-             any.transformers-compat ==0.7.1,
-             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
-             any.typed-process ==0.2.8.0,
-             any.unbounded-delays ==0.1.1.1,
-             any.unicode-collation ==0.1.3.1,
-             unicode-collation -doctests -executable,
-             any.unicode-data ==0.1.0.1,
-             unicode-data -ucd2haskell,
-             any.unicode-transforms ==0.3.8,
-             unicode-transforms -bench-show -dev -has-icu -has-llvm -use-gauge,
-             any.uniplate ==1.6.13,
-             any.unix ==2.7.2.2,
-             any.unix-compat ==0.5.3,
-             unix-compat -old-time,
-             any.unliftio-core ==0.2.0.1,
-             any.unordered-containers ==0.2.16.0,
-             unordered-containers -debug,
-             any.utf8-string ==1.0.2,
-             any.uuid-types ==1.0.5,
-             any.vector ==0.12.3.1,
-             vector +boundschecks -internalchecks -unsafechecks -wall,
-             any.vector-algorithms ==0.8.0.4,
-             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
-             any.wcwidth ==0.0.2,
-             wcwidth -cli +split-base,
-             any.witherable ==0.4.2,
-             any.x509 ==1.7.5,
-             any.x509-store ==1.6.7,
-             any.x509-system ==1.6.6,
-             any.x509-validation ==1.6.11,
-             any.xml ==1.3.14,
-             any.xml-conduit ==1.9.1.1,
-             any.xml-types ==0.3.8,
-             any.yaml ==0.11.7.0,
-             yaml +no-examples +no-exe,
-             any.zip-archive ==0.4.1,
-             zip-archive -executable,
-             any.zlib ==0.6.2.3,
-             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config
-index-state: hackage.haskell.org 2021-12-11T21:58:01Z
diff --git a/skip/pandoc/pandoc.xibuild b/skip/pandoc/pandoc.xibuild
index fd6988c..12d2406 100644
--- a/skip/pandoc/pandoc.xibuild
+++ b/skip/pandoc/pandoc.xibuild
@@ -3,36 +3,63 @@
 NAME="pandoc"
 DESC="universal markup converter"
 
-MAKEDEPS="cabal"
-DEPS="gmp libffi musl zlib "
+MAKEDEPS=" ghc cabal zlib libffi"
 
-PKG_VER=2.16.2
+PKG_VER=2.19.1
 SOURCE="https://hackage.haskell.org/package/pandoc-$PKG_VER/pandoc-$PKG_VER.tar.gz"
-ADDITIONAL="cabal.project.freeze "
 
-prepare () {
-	cp "$srcdir/cabal.project.freeze" .  
+ADDITIONAL="
+cabal.config
+"
+
+cabal_update() {
+	echo "Freezing pandoc dependencies"
+
+	# Resolve deps and generate fresh cabal.config with version constraints.
+	cabal update
+	(
+		cd "$BUILD_ROOT"
+		cabal v1-freeze --shadow-installed-packages
+
+		# Add version tag at the first line.
+		sed -i "1i--$PKG_VER" "cabal.config"
+
+		mv "cabal.config" "$startdir/"
+	)
+}
+
+prepare() {
+	apply_patches
+
+	if [ "$(head -n 1 "$BUILD_ROOT/cabal.config")" != "--$PKG_VER" ]; then
+		die "Requirements file is outdated, run 'abuild cabal_update'"
+	fi
+
+	ln -sf "$BUILD_ROOT/cabal.config" "$BUILD_ROOT/cabal.project.freeze"
+}
+
+build() {
 	cabal update
+	cabal install --only-dependencies
 	cabal configure \
 		--prefix='/usr' \
 		--enable-tests \
 		--enable-split-sections \
 		--ghc-option="-split-sections" \
-		--ghc-option="-j" \
-		--ghc-option="-O1" \
 		--flags="+embed_data_files -trypandoc +static"
+	cabal build --jobs=${JOBS:-1}
 }
 
-build () {
-    cabal install --only-dependencies
-	cabal build --jobs=${JOBS:-1}
+check() {
+	cabal test --jobs=${JOBS:-1}
 }
 
-package () {
-    bindir="$PKG_DEST/usr/bin"
-	mkdir -p "$bindir"
+package() {
+	_bindir="$PKG_DEST/usr/bin"
+	mkdir -p "$_bindir"
 	cabal install \
-		--installdir="$bindir" \
+		--installdir="$_bindir" \
 		--install-method=copy
 	install -Dm644 man/pandoc.1 "$PKG_DEST"/usr/share/man/man1/pandoc.1
 }
+