ivabus/pantry
1
0
Fork 0
mirror of https://github.com/ivabus/pantry synced 2024-11-22 08:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(pandoc-crossref)

Browse source 
closes #6061
This commit is contained in:
Jacob Heider 2024-05-04 21:50:57 -04:00 committed by Jacob Heider
parent d85a96c48f
commit 7e3f73b7e3
2 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
projects/haskell.org/cabal/package.yml
View file

@ -16,7 +16,7 @@ provides:
build: build:
dependencies: dependencies:
haskell.org: 9.6.3 # later version pass invalid linker flags on darwin clang-14 haskell.org: <9.6.4 # later versions pass invalid linker flags on darwin clang-14
curl.se: '*' curl.se: '*'
linux/aarch64: linux/aarch64:
github.com/numactl/numactl: ^2 # downloaded cabal needs this github.com/numactl/numactl: ^2 # downloaded cabal needs this
@ -26,6 +26,19 @@ build:
- run: export HOME="$(mktemp -d)" - run: export HOME="$(mktemp -d)"
if: linux if: linux
# FIXME: this isn't great, but it'll fix any ghc install at build time
# needs install-time customization for a true fix
- run: |
if ! grep -q 'rpath,{{pkgx.prefix}}' settings; then
sed -i \
-e 's|\(C compiler flags.*\)")|\1 -Wl,-rpath,{{pkgx.prefix}}")|' \
-e 's|\(C++ compiler flags.*\)")|\1 -Wl,-rpath,{{pkgx.prefix}}")|' \
-e 's|\(C compiler link flags.*\)")|\1 -Wl,-rpath,{{pkgx.prefix}}")|' \
settings
fi
if: darwin
working-directory: ${{deps.haskell.org.prefix}}/.ghcup/ghc/{{deps.haskell.org.version}}/lib/ghc-{{deps.haskell.org.version}}/lib
- run: | - run: |
if test ! -e .bootstrap/cabal; then if test ! -e .bootstrap/cabal; then
if test ! -e .bootstrap; then if test ! -e .bootstrap; then
@ -47,8 +60,6 @@ build:
- | - |
sed -i \ sed -i \
-e 's/build-depends: base.*/build-depends: base >=4.10 \&\& <5/' \ -e 's/build-depends: base.*/build-depends: base >=4.10 \&\& <5/' \
-e 's/text.*>=.*/text >= 1.2.3 \&\& < 3,/' \
-e 's/zlib.*< .*/zlib >= 0.5.3 \&\& < 0.7,/' \
cabal-install.cabal cabal-install.cabal
# ^^ SEE https://github.com/haskell/cabal/issues/8118 # ^^ SEE https://github.com/haskell/cabal/issues/8118
- mkdir -p "{{prefix}}/bin" - mkdir -p "{{prefix}}/bin"

28
projects/pandoc.org/crossref/package.yml
View file

@ -13,15 +13,29 @@ dependencies:
build: build:
dependencies: dependencies:
haskell.org: ^9 haskell.org: <9.6.4 # later versions pass invalid linker flags on darwin clang-14
haskell.org/cabal: ^3 haskell.org/cabal: ^3
openssl.org: ^1.1 openssl.org: ^1.1
script: |- script:
cabal update # FIXME: this isn't great, but it'll fix any ghc install at build time
mkdir -p "{{prefix}}/bin" # needs install-time customization for a true fix
cabal install --install-method=copy --installdir={{prefix}}/bin - run: |
if ! grep -q 'rpath,{{pkgx.prefix}}' settings; then
sed -i \
-e 's|\(C compiler flags.*\)")|\1 -Wl,-rpath,{{pkgx.prefix}}")|' \
-e 's|\(C++ compiler flags.*\)")|\1 -Wl,-rpath,{{pkgx.prefix}}")|' \
-e 's|\(C compiler link flags.*\)")|\1 -Wl,-rpath,{{pkgx.prefix}}")|' \
settings
fi
if: darwin
working-directory: ${{deps.haskell.org.prefix}}/.ghcup/ghc/{{deps.haskell.org.version}}/lib/ghc-{{deps.haskell.org.version}}/lib
test: true #FIXME - cabal update
- mkdir -p "{{prefix}}/bin"
- cabal install --install-method=copy --installdir={{prefix}}/bin
test:
- 'true' #FIXME
provides: provides:
- bin/pandoc-crossref - bin/pandoc-crossref