From b5aafdee61244936f3db200edacc08ae4f2fe327 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 14 Aug 2021 17:10:48 +0200 Subject: [PATCH] Fix CI --- .gitlab/before_script/darwin/install_deps.sh | 2 +- .gitlab/before_script/windows/install_deps.sh | 2 +- .gitlab/shell.nix | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab/before_script/darwin/install_deps.sh b/.gitlab/before_script/darwin/install_deps.sh index 571a584..7d8db00 100755 --- a/.gitlab/before_script/darwin/install_deps.sh +++ b/.gitlab/before_script/darwin/install_deps.sh @@ -7,7 +7,7 @@ set -eux mkdir -p "${TMPDIR}" if [ $ARCH = 'ARM64' ] ; then - curl -sSfL https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-apple-darwin-ghcup-0.1.15.1 > ./ghcup-bin + curl -sSfL https://downloads.haskell.org/~ghcup/aarch64-apple-darwin-ghcup > ./ghcup-bin chmod +x ghcup-bin else curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup > ./ghcup-bin diff --git a/.gitlab/before_script/windows/install_deps.sh b/.gitlab/before_script/windows/install_deps.sh index 65fda92..eeb68e7 100644 --- a/.gitlab/before_script/windows/install_deps.sh +++ b/.gitlab/before_script/windows/install_deps.sh @@ -9,7 +9,7 @@ mkdir -p "${TMPDIR}" "${CABAL_DIR}" mkdir -p "$GHCUP_INSTALL_BASE_PREFIX/ghcup/bin" CI_PROJECT_DIR=$(pwd) -curl -o ghcup.exe https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-mingw64-ghcup-0.1.15.1.exe +curl -o ghcup.exe https://downloads.haskell.org/~ghcup/x86_64-mingw64-ghcup.exe chmod +x ghcup.exe ./ghcup.exe install ${GHC_VERSION} diff --git a/.gitlab/shell.nix b/.gitlab/shell.nix index f6d5804..33c7c67 100644 --- a/.gitlab/shell.nix +++ b/.gitlab/shell.nix @@ -43,6 +43,7 @@ # unconditionally add the MacOSX.sdk and TargetConditional.h export NIX_CFLAGS_COMPILE+=" -isystem /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include" + export NIX_LDFLAGS="-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib $NIX_LDFLAGS" '';