hasufell/ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test M1 build with new config.{guess,sub} but configure generated by autoconf-2.69

Browse Source
This commit is contained in:
Julian Ospald 2021-10-07 14:30:31 +02:00
parent c100daeba5
commit 5f3e0c494b
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -166,7 +166,7 @@ variables:
set -Eeuo pipefail set -Eeuo pipefail
function runInNixShell() { function runInNixShell() {
time nix-shell $CI_PROJECT_DIR/.gitlab/shell.nix \ time nix-shell $CI_PROJECT_DIR/.gitlab/shell.nix \
-I nixpkgs=https://github.com/angerman/nixpkgs/archive/75f7281738b.tar.gz \ -I nixpkgs=https://github.com/bgamari/nixpkgs/archive/37c60356e3f83c708a78a96fdd914b5ffc1f551c.tar.gz \
--argstr system "aarch64-darwin" \ --argstr system "aarch64-darwin" \
--pure \ --pure \
--keep CI_PROJECT_DIR \ --keep CI_PROJECT_DIR \

8
.gitlab/before_script/darwin/install_deps.sh
View File

@ -23,10 +23,10 @@ if [ $ARCH = 'ARM64' ] ; then
cabal update cabal update
mkdir vendored mkdir vendored
cd vendored cd vendored
cabal unpack network-3.1.2.1 curl -O https://downloads.haskell.org/~ghcup/tmp/network-3.1.2.3.tar.gz
cd network* tar xf network-3.1.2.3.tar.gz
autoreconf -fi rm network-3.1.2.3.tar.gz
cd ../.. cd ..
fi fi
exit 0 exit 0