Merge branch 'alpine-ghc-support'

This commit is contained in:
Julian Ospald 2019-06-14 10:06:25 +08:00
commit 13612acb2a
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
3 changed files with 30 additions and 4 deletions

View File

@ -19,6 +19,10 @@ ghc 8.0.2 x86_64 debian=8,debian,ubuntu,mint,unknown https://downloads.haskel
ghc 8.0.2 i386 debian=8,debian,ubuntu,mint,unknown https://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-i386-deb8-linux.tar.xz
ghc 8.0.2 x86_64 darwin https://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-x86_64-apple-darwin.tar.xz
ghc 8.0.2 x86_64 freebsd=9,freebsd=10,freebsd=11 https://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-x86_64-portbld-freebsd.tar.xz
ghc 8.0.2 x86_64 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.0.2-musl/ghc-8.0.2-x86_64-unknown-linux-musl.tar.xz
ghc 8.0.2 i386 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.0.2-musl/ghc-8.0.2-i386-unknown-linux-musl.tar.xz
ghc 8.2.2 x86_64 debian=7 https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-x86_64-deb7-linux.tar.xz
ghc 8.2.2 i386 debian=7 https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-i386-deb7-linux.tar.xz
@ -34,6 +38,8 @@ ghc 8.4.3 x86_64 debian=8 https://downloads.haskel
ghc 8.4.3 x86_64 debian=9,debian,ubuntu,mint https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-x86_64-deb9-linux.tar.xz
ghc 8.4.3 x86_64 fedora=27,fedora,unknown https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-x86_64-fedora27-linux.tar.xz
ghc 8.4.3 x86_64 darwin https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-x86_64-apple-darwin.tar.xz
ghc 8.4.3 i386 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.4.3-musl/ghc-8.4.3-i386-unknown-linux-musl.tar.xz
ghc 8.4.3 x86_64 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.4.3-musl/ghc-8.4.3-x86_64-unknown-linux-musl.tar.xz
ghc 8.4.4 i386 debian=8,debian,ubuntu,mint,unknown https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-i386-deb8-linux.tar.xz
ghc 8.4.4 x86_64 debian=8 https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-x86_64-deb8-linux.tar.xz
@ -42,6 +48,8 @@ ghc 8.4.4 x86_64 centos=7,centos,amazonlinux https://downloads.haskel
ghc 8.4.4 x86_64 fedora=27,fedora,unknown https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-x86_64-fedora27-linux.tar.xz
ghc 8.4.4 x86_64 darwin https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-x86_64-apple-darwin.tar.xz
ghc 8.4.4 x86_64 freebsd=11 https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-x86_64-portbld-freebsd11.tar.xz
ghc 8.4.4 i386 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.4.4-musl/ghc-8.4.4-i386-unknown-linux-musl.tar.xz
ghc 8.4.4 x86_64 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.4.4-musl/ghc-8.4.4-x86_64-unknown-linux-musl.tar.xz
ghc 8.6.1 i386 debian=8,debian,ubuntu,mint,unknown https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-i386-deb8-linux.tar.xz
ghc 8.6.1 x86_64 debian=8 https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-x86_64-deb8-linux.tar.xz
@ -49,11 +57,16 @@ ghc 8.6.1 x86_64 debian=9,debian,ubuntu,mint https://downloads.haskel
ghc 8.6.1 x86_64 fedora=27,fedora,unknown https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-x86_64-fedora27-linux.tar.xz
ghc 8.6.1 x86_64 darwin https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-x86_64-apple-darwin.tar.xz
ghc 8.6.1 x86_64 freebsd https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-x86_64-portbld-freebsd.tar.xz
ghc 8.6.1 i386 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.1-musl/ghc-8.6.1-i386-unknown-linux-musl.tar.xz
ghc 8.6.1 x86_64 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.1-musl/ghc-8.6.1-x86_64-unknown-linux-musl.tar.xz
ghc 8.6.2 i386 debian=8,debian,ubuntu,mint,unknown https://downloads.haskell.org/~ghc/8.6.2/ghc-8.6.2-i386-deb8-linux.tar.xz
ghc 8.6.2 x86_64 debian=8,debian,ubuntu,mint https://downloads.haskell.org/~ghc/8.6.2/ghc-8.6.2-x86_64-deb8-linux.tar.xz
ghc 8.6.2 x86_64 fedora=27,fedora,unknown https://downloads.haskell.org/~ghc/8.6.2/ghc-8.6.2-x86_64-fedora27-linux.tar.xz
ghc 8.6.2 x86_64 darwin https://downloads.haskell.org/~ghc/8.6.2/ghc-8.6.2-x86_64-apple-darwin.tar.xz
ghc 8.6.2 i386 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.2-musl/ghc-8.6.2-i386-unknown-linux-musl.tar.xz
ghc 8.6.2 x86_64 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.2-musl/ghc-8.6.2-x86_64-unknown-linux-musl.tar.xz
ghc 8.6.3 i386 debian=8,debian,ubuntu,mint,unknown https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-i386-deb8-linux.tar.xz
ghc 8.6.3 x86_64 debian=8 https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-x86_64-deb8-linux.tar.xz
@ -62,12 +75,16 @@ ghc 8.6.3 x86_64 fedora=27,fedora,unknown https://downloads.haskel
ghc 8.6.3 x86_64 centos=7,centos,amazonlinux https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-x86_64-centos7-linux.tar.xz
ghc 8.6.3 x86_64 darwin https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-x86_64-apple-darwin.tar.xz
ghc 8.6.3 x86_64 freebsd=11 https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-x86_64-portbld-freebsd.tar.xz
ghc 8.6.3 i386 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.3-musl/ghc-8.6.3-i386-unknown-linux-musl.tar.xz
ghc 8.6.3 x86_64 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.3-musl/ghc-8.6.3-x86_64-unknown-linux-musl.tar.xz
ghc 8.6.4 i386 debian=9,debian,ubuntu,mint,unknown https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-i386-deb9-linux.tar.xz
ghc 8.6.4 x86_64 debian=8 https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-x86_64-deb8-linux.tar.xz
ghc 8.6.4 x86_64 debian=9,debian,ubuntu,mint https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-x86_64-deb9-linux.tar.xz
ghc 8.6.4 x86_64 fedora=27,fedora,unknown https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-x86_64-fedora27-linux.tar.xz
ghc 8.6.4 x86_64 darwin https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-x86_64-apple-darwin.tar.xz
ghc 8.6.4 i386 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.4-musl/ghc-8.6.4-i386-unknown-linux-musl.tar.xz
ghc 8.6.4 x86_64 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.4-musl/ghc-8.6.4-x86_64-unknown-linux-musl.tar.xz
ghc 8.6.5 i386 debian=9,debian,ubuntu,mint,unknown https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-i386-deb9-linux.tar.xz
ghc 8.6.5 x86_64 debian=8 https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-deb8-linux.tar.xz
@ -75,6 +92,8 @@ ghc 8.6.5 x86_64 debian=9,debian,ubuntu,mint https://downloads.haskel
ghc 8.6.5 x86_64 fedora=27,fedora,unknown https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-fedora27-linux.tar.xz
ghc 8.6.5 x86_64 centos=7,centos,amazonlinux https://downloads.haskell.org/~ghc/8.6.5/ghc-x86_64-centos7-linux.tar.xz
ghc 8.6.5 x86_64 darwin https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-apple-darwin.tar.xz
ghc 8.6.5 i386 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.5-musl/ghc-8.6.5-i386-unknown-linux-musl.tar.xz
ghc 8.6.5 x86_64 alpine https://github.com/redneb/ghc-alt-libc/releases/download/ghc-8.6.5-musl/ghc-8.6.5-x86_64-unknown-linux-musl.tar.xz
cabal-install 2.2.0.0 i386 unknown https://downloads.haskell.org/~cabal/cabal-install-2.2.0.0/cabal-install-2.2.0.0-i386-unknown-linux.tar.gz

1
.requirements/ghc/alpine Normal file
View File

@ -0,0 +1 @@
curl gcc g++ gmp-dev ncurses-dev libffi-dev make python3 xz tar perl

14
ghcup
View File

@ -98,12 +98,12 @@ DOWNLOADER="curl"
# @VARIABLE: DOWNLOADER_OPTS
# @DESCRIPTION:
# Options passed to the download program.
DOWNLOADER_OPTS="--fail -O"
DOWNLOADER_OPTS="-L --fail -O"
# @VARIABLE: DOWNLOADER_STDOUT_OPTS
# @DESCRIPTION:
# Options passed to the download program when printing the content to stdout.
DOWNLOADER_STDOUT_OPTS="--fail"
DOWNLOADER_STDOUT_OPTS="-L --fail"
# @VARIABLE: GHC_DOWNLOAD_BASEURL
# @DESCRIPTION:
@ -1493,8 +1493,11 @@ set_ghc() {
done
# shellcheck disable=SC2046
edo ln $(optionv "-v") -sf "runghc${target_suffix}" "${BIN_LOCATION}/runhaskell${target_suffix}"
# shellcheck disable=SC2046
edo ln $(optionv "-v") -sf "haddock-ghc${target_suffix}" "${BIN_LOCATION}/haddock${target_suffix}"
# not all bindists install haddock...
if [ -e "${inst_location}/bin/haddock" ] ; then
# shellcheck disable=SC2046
edo ln $(optionv "-v") -sf "haddock-ghc${target_suffix}" "${BIN_LOCATION}/haddock${target_suffix}"
fi
status_message "Done, make sure \"${BIN_LOCATION}\" is in your PATH!"
@ -1950,6 +1953,9 @@ system_reqs_url() {
[ -z "$1" ] && die "Internal error: no argument given to system_reqs_url"
case "$1" in
"alpine")
printf "%s/.requirements/ghc/alpine" "${BASE_DOWNLOAD_URL}"
;;
"debian"|"ubuntu")
printf "%s/.requirements/ghc/ubuntu" "${BASE_DOWNLOAD_URL}"
;;