From 5605365a5036f86a8254bf6c8f57366b86f36530 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 22 Aug 2023 19:14:25 -0400 Subject: [PATCH] fix(haskell^8) (#3029) * fix(haskell^8) * last guess :/ * ghc-pkg check * i think this does it * 9.0 didn't actually build before --- projects/haskell.org/package.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/projects/haskell.org/package.yml b/projects/haskell.org/package.yml index f3dc9fa1..5101ffb1 100644 --- a/projects/haskell.org/package.yml +++ b/projects/haskell.org/package.yml @@ -42,6 +42,8 @@ dependencies: invisible-island.net/ncurses: 6 tea.xyz/gx/cc: 'c99' # ghc uses this during builds sourceware.org/libffi: 3 + linux: + github.com/numactl/numactl: ^2 warnings: - vendored @@ -59,8 +61,17 @@ build: working-directory: ${{prefix}} - run: | find . -type f -print0 | xargs -0 sed -i.bak -e "s|$TEA_PREFIX|\$TEA_PREFIX|g" - rm *.bak + rm *.bak working-directory: ${{prefix}}/ghc/{{version}}/bin + - run: | + sed -i.bak -e "s|$TEA_PREFIX|\$TEA_PREFIX|g" env + rm env.bak + working-directory: ${{prefix}}/.ghcup + - run: | + find . -type f -name \*.conf -print0 | xargs -0 sed -i.bak -e 's|{{prefix}}|${pkgroot}/../../../../..|g' + find . -type f -name \*.conf.bak -delete + working-directory: ${{prefix}}/ghc/{{version}}/lib/ghc-{{version}}/package.conf.d + if: <9.4 env: BOOTSTRAP_HASKELL_NONINTERACTIVE: 1 BOOTSTRAP_HASKELL_NO_UPGRADE: 1 @@ -70,6 +81,8 @@ build: test: script: + - ghc-pkg recache + - ghc-pkg check - test "$(runghc $FIXTURE)" = "Hello World" fixture: main = putStrLn "Hello World"