From a13a5e5d2062327720b438cf72a7a39be604378f Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 11 Jun 2021 11:52:20 +0200 Subject: [PATCH 1/6] Update darwin aarch64 install deps --- .gitlab/before_script/darwin/install_deps.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab/before_script/darwin/install_deps.sh b/.gitlab/before_script/darwin/install_deps.sh index f6f45b0..fb8f49d 100755 --- a/.gitlab/before_script/darwin/install_deps.sh +++ b/.gitlab/before_script/darwin/install_deps.sh @@ -8,12 +8,13 @@ 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 + chmod +x ghcup-bin else curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup > ./ghcup-bin + chmod +x ghcup-bin + ./ghcup-bin upgrade -i -f fi -chmod +x ghcup-bin -./ghcup-bin upgrade -i -f ./ghcup-bin install ${GHC_VERSION} ./ghcup-bin set ${GHC_VERSION} ./ghcup-bin install-cabal ${CABAL_VERSION} From 79d6a50e4444273337161543ff13d8fe9a299ffd Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 11 Jun 2021 22:12:23 +0200 Subject: [PATCH 2/6] Drop some mingw64 packages we don't need --- bootstrap-haskell.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bootstrap-haskell.ps1 b/bootstrap-haskell.ps1 index 705f33f..1672e21 100644 --- a/bootstrap-haskell.ps1 +++ b/bootstrap-haskell.ps1 @@ -272,15 +272,15 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) { $ghcBuildDeps = $Quick } elseif (!($Silent)) { $ghcBuildDeps = $Host.UI.PromptForChoice('Install Dependencies' - , 'Install various dependencies to be able to build GHC itself and make use of ''ghcup compile'' command? (recommended, however this might take a while)' + , 'Install a standard set of mingw64 packages to be able to build various haskell packages requiring unix libraries? (recommended, however this might take a while... if you skip this, you might have to do it manually later)' , [System.Management.Automation.Host.ChoiceDescription[]] @('&Yes' '&No'), 0) } else { $ghcBuildDeps = 0 } if ($ghcBuildDeps -eq 0) { - Print-Msg -msg 'Installing GHC Build Dependencies...' - Exec "$Bash" '-lc' 'pacman --noconfirm -S --needed git tar curl wget base-devel gettext binutils autoconf make libtool automake python p7zip patch unzip mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb mingw-w64-x86_64-python2 mingw-w64-x86_64-python3-sphinx' + Print-Msg -msg 'Installing Dependencies...' + Exec "$Bash" '-lc' 'pacman --noconfirm -S --needed git tar curl wget base-devel gettext binutils autoconf make libtool automake pkgconf python p7zip patch unzip' } Print-Msg -msg 'Updating SSL root certificate authorities...' @@ -398,3 +398,4 @@ if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell")) { # aED5Ujwyq3Qre+TGVRUqwkEauDhQiX2A008G00fRO6+di6yJRCRn5eaRAbdU3Xww # E5VhEwLBnwzWrvLKtdEclhgUCo5Tq87QMXVdgX4aRmunl4ZE+Q== # SIG # End signature block + From da2e7e0411219f6d37c31ad22e7dea4352cebefb Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 11 Jun 2021 22:17:02 +0200 Subject: [PATCH 3/6] Fix aarch64 darwin thanks to bgamari --- cabal.project | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cabal.project b/cabal.project index 2f71058..bfbec4d 100644 --- a/cabal.project +++ b/cabal.project @@ -11,6 +11,11 @@ source-repository-package location: https://github.com/Bodigrim/tar tag: ac197ec7ea4838dc2b4e22b9b888b080cedf29cf +source-repository-package + type: git + location: https://github.com/bgamari/terminal-size + tag: 34ea816bd63f75f800eedac12c6908c6f3736036 + constraints: http-io-streams -brotli package libarchive From d9fe4b8723fba3236c7382731f602ed23fdbae4e Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 11 Jun 2021 22:17:18 +0200 Subject: [PATCH 4/6] Use homebrew llvm --- .gitlab/before_script/darwin/install_deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/before_script/darwin/install_deps.sh b/.gitlab/before_script/darwin/install_deps.sh index fb8f49d..4cc3b85 100755 --- a/.gitlab/before_script/darwin/install_deps.sh +++ b/.gitlab/before_script/darwin/install_deps.sh @@ -7,6 +7,7 @@ set -eux mkdir -p "${TMPDIR}" if [ $ARCH = 'ARM64' ] ; then + export PATH="/opt/homebrew/opt/llvm/bin:$PATH" curl -sSfL https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-apple-darwin-ghcup-0.1.15.1 > ./ghcup-bin chmod +x ghcup-bin else From fd6ccf8f0af2a887407491d29639bb9e16734d14 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 11 Jun 2021 22:51:40 +0200 Subject: [PATCH 5/6] Add FreeBSD to 0.1.14.1 --- ghcup-0.0.4.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ghcup-0.0.4.yaml b/ghcup-0.0.4.yaml index 05caa88..ddf04d6 100644 --- a/ghcup-0.0.4.yaml +++ b/ghcup-0.0.4.yaml @@ -1520,11 +1520,11 @@ ghcupDownloads: dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-x86_64-apple-darwin.tar.xz dlSubdir: ghc-8.10.5 dlHash: ef0f47eff8962d58fa447123636cf8ef31c1e5b2d0ae90177d3388861ddf4a22 - # FreeBSD: - # unknown_versioning: - # dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-x86_64-portbld-freebsd.tar.xz - # dlSubdir: ghc-8.10.5 - # dlHash: c9776a2ccf9629b03e967206a507fcdcb6c5189800a626e9461ababf6733c357 + FreeBSD: + unknown_versioning: + dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/8.10.5/ghc-8.10.5-x86_64-portbld-freebsd.tar.xz + dlSubdir: ghc-8.10.5 + dlHash: 11a0b490bfb2f57b5bc87c69c197542eafce1b4991cc22f625179a6c6e567834 A_32: Linux_Debian: '( >= 9 && < 10 )': &ghc-8105-32-deb9 From 650f0a3e4e3c44703ddac82c9b4ede77322106da Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 11 Jun 2021 23:57:16 +0200 Subject: [PATCH 6/6] Fix up 0.1.15.1 --- CHANGELOG.md | 6 +++--- bootstrap-haskell | 10 +++++++--- bootstrap-haskell.ps1 | 2 +- ghcup-0.0.4.yaml | 34 +++++++++++++++++++++------------- ghcup-0.0.5.yaml | 34 +++++++++++++++++++--------------- 5 files changed, 51 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 182bded..7eb0104 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,14 @@ # Revision history for ghcup -## 0.1.15.1 -- ????-??-?? +## 0.1.15.1 -- 2021-06-11 * Add Apple Silicon support * Add windows support wrt [#130](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/130) -* Add date to GHC bindist names created by ghcup +* Add stack support * Warn when /tmp doesn't have 5GB or more of disk space * Allow to compile GHC from git repo wrt [#126](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/126) * Allow to set custom ghc version when running 'ghcup compile ghc' wrt [#136](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/136) -* Add stack support +* Add date to GHC bindist names created by ghcup ## 0.1.14.2 -- 2021-05-12 diff --git a/bootstrap-haskell b/bootstrap-haskell index d077bc2..ca4bd35 100755 --- a/bootstrap-haskell +++ b/bootstrap-haskell @@ -16,7 +16,7 @@ plat="$(uname -s)" arch=$(uname -m) -ghver="0.1.14.1" +ghver="0.1.15.1" base_url="https://downloads.haskell.org/~ghcup" case "${plat}" in @@ -166,6 +166,10 @@ download_ghcup() { "Darwin"|"darwin") case "${arch}" in x86_64|amd64) + _url=${base_url}/${ghver}/x86_64-apple-darwin-ghcup-${ghver} + ;; + aarch64|arm64|armv8l) + _url=${base_url}/${ghver}/aarch64-apple-darwin-ghcup-${ghver} ;; i*86) die "i386 currently not supported!" @@ -173,11 +177,11 @@ download_ghcup() { *) die "Unknown architecture: ${arch}" ;; esac - _url=${base_url}/${ghver}/x86_64-apple-darwin-ghcup-${ghver} ;; + ;; MSYS*|MINGW*) case "${arch}" in x86_64|amd64) - _url=https://downloads.haskell.org/~ghcup/tmp/x86_64-mingw64-ghcup-9.exe + _url=${base_url}/${ghver}/x86_64-mingw64-ghcup-${ghver}.exe ;; *) die "Unknown architecture: ${arch}" ;; diff --git a/bootstrap-haskell.ps1 b/bootstrap-haskell.ps1 index 1672e21..a0f722a 100644 --- a/bootstrap-haskell.ps1 +++ b/bootstrap-haskell.ps1 @@ -194,7 +194,7 @@ $null = [Environment]::SetEnvironmentVariable("GHCUP_INSTALL_BASE_PREFIX", $Ghcu $GhcupDir = ('{0}\ghcup' -f $GhcupBasePrefix) $MsysDir = ('{0}\msys64' -f $GhcupDir) $Bash = ('{0}\usr\bin\bash' -f $MsysDir) -$BootstrapUrl = 'https://www.haskell.org/ghcup/sh/bootstrap-haskell-windows' +$BootstrapUrl = 'https://www.haskell.org/ghcup/sh/bootstrap-haskell' $GhcupMsys2 = [System.Environment]::GetEnvironmentVariable('GHCUP_MSYS2', 'user') Print-Msg -msg 'Preparing for GHCup installation...' diff --git a/ghcup-0.0.4.yaml b/ghcup-0.0.4.yaml index ddf04d6..78ff184 100644 --- a/ghcup-0.0.4.yaml +++ b/ghcup-0.0.4.yaml @@ -1868,7 +1868,7 @@ ghcupDownloads: dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-armv7-linux-bootstrapped.tar.xz dlHash: 16c0d1eaba24bed14f3e152970179a45d9f9bb5cc839b2c210ad06eb7d4826ed GHCup: - 0.1.14.1: + 0.1.15.1: viTags: - Recommended - Latest @@ -1878,35 +1878,43 @@ ghcupDownloads: A_64: Linux_UnknownLinux: unknown_versioning: &ghcup-64 - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-linux-ghcup-0.1.14.1 - dlHash: 59e31b2ede3ed20f79dce0f8ba0a68b6fb25e5f00ba2d7243f6a8af68d979ff5 + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-linux-ghcup-0.1.15.1 + dlHash: 871c9dc1bfbf7df6fe3b9b7250c20a3dae8a7aee171712a3e63689ab75bc9439 Darwin: unknown_versioning: - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-apple-darwin-ghcup-0.1.14.1 - dlHash: 3e1dd173b3e7b5d90dcdece423c3ddd3efb4c83e964967b0fb574c9b7b2c44e1 + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-apple-darwin-ghcup-0.1.15.1 + dlHash: 7cd67b554fc58c4ffb224b73e369c5dd27c5276c01f102f6423230b34cc635bc FreeBSD: unknown_versioning: - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-portbld-freebsd-ghcup-0.1.14.1 - dlHash: 89a70980d77888dae8b9fd0f05e7a7920f421bc3bb5192da8e73fd4e7b4cb86f + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-portbld-freebsd-ghcup-0.1.15.1 + dlHash: b4ad9c9f1a878560e8f770d985d53b8fb70582baf99e40e53ec9ee97dc47ae64 + Windows: + unknown_versioning: + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-mingw64-ghcup-0.1.15.1.exe + dlHash: 6243ade97cf50788b5c9752b876684f64f70d048a9d2d93ddedf5512136cc014 Linux_Alpine: unknown_versioning: *ghcup-64 A_32: Linux_UnknownLinux: unknown_versioning: &ghcup-32 - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/i386-linux-ghcup-0.1.14.1 - dlHash: 610aac7c3be3ba3874c07b9cae5b2ca0da9a92bf381afc2597bd2dc9c70aae0c + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/i386-linux-ghcup-0.1.15.1 + dlHash: 0c1dcbdd7cfa8accdfbe14c623924f3ca29a35d32a2ac3e61f0eb322855e2cb1 Linux_Alpine: unknown_versioning: *ghcup-32 A_ARM64: Linux_UnknownLinux: unknown_versioning: - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/aarch64-linux-ghcup-0.1.14.1 - dlHash: e9ae07b7d41ea03e6af9c1f3587f61287827c4e29478b6a5d46ea1ce5af4cee5 + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-linux-ghcup-0.1.15.1 + dlHash: 7fa29d8e9a9fe3d1e3a63a1d16fc3550128edbdb9b5b5dff7974358c4dab192c + Darwin: + unknown_versioning: + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-apple-darwin-ghcup-0.1.15.1 + dlHash: 6a743cd50e8124ac2de8be77013d49dcf3b99ce7cc463ec86ed99a904a51dfd9 A_ARM: Linux_UnknownLinux: unknown_versioning: - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/armv7-linux-ghcup-0.1.14.1 - dlHash: 646832030efbc0a848df24c08b5eb7507bd15d1c2eb95fea6d9d03890f3662be + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/armv7-linux-ghcup-0.1.15.1 + dlHash: 77ee5d9828c2ba771127274e301e81412b9f29af2d65dd85dada4786d9438c2c HLS: 1.1.0: viTags: diff --git a/ghcup-0.0.5.yaml b/ghcup-0.0.5.yaml index c3922ce..d7739a8 100644 --- a/ghcup-0.0.5.yaml +++ b/ghcup-0.0.5.yaml @@ -2024,7 +2024,7 @@ ghcupDownloads: dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-armv7-linux-bootstrapped.tar.xz dlHash: 16c0d1eaba24bed14f3e152970179a45d9f9bb5cc839b2c210ad06eb7d4826ed GHCup: - 0.1.14.1: + 0.1.15.1: viTags: - Recommended - Latest @@ -2034,39 +2034,43 @@ ghcupDownloads: A_64: Linux_UnknownLinux: unknown_versioning: &ghcup-64 - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-linux-ghcup-0.1.14.1 - dlHash: 59e31b2ede3ed20f79dce0f8ba0a68b6fb25e5f00ba2d7243f6a8af68d979ff5 + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-linux-ghcup-0.1.15.1 + dlHash: 871c9dc1bfbf7df6fe3b9b7250c20a3dae8a7aee171712a3e63689ab75bc9439 Darwin: unknown_versioning: - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-apple-darwin-ghcup-0.1.14.1 - dlHash: 3e1dd173b3e7b5d90dcdece423c3ddd3efb4c83e964967b0fb574c9b7b2c44e1 + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-apple-darwin-ghcup-0.1.15.1 + dlHash: 7cd67b554fc58c4ffb224b73e369c5dd27c5276c01f102f6423230b34cc635bc FreeBSD: unknown_versioning: - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-portbld-freebsd-ghcup-0.1.14.1 - dlHash: 89a70980d77888dae8b9fd0f05e7a7920f421bc3bb5192da8e73fd4e7b4cb86f + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-portbld-freebsd-ghcup-0.1.15.1 + dlHash: b4ad9c9f1a878560e8f770d985d53b8fb70582baf99e40e53ec9ee97dc47ae64 Windows: unknown_versioning: - dlUri: https://downloads.haskell.org/~ghcup/tmp/x86_64-mingw64-ghcup-1.exe - dlHash: a61ae29e677db0f0a93505e0ab3b35b7ccc3ebec6a2a2cf9418cfd550ef82ec6 + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/x86_64-mingw64-ghcup-0.1.15.1.exe + dlHash: 6243ade97cf50788b5c9752b876684f64f70d048a9d2d93ddedf5512136cc014 Linux_Alpine: unknown_versioning: *ghcup-64 A_32: Linux_UnknownLinux: unknown_versioning: &ghcup-32 - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/i386-linux-ghcup-0.1.14.1 - dlHash: 610aac7c3be3ba3874c07b9cae5b2ca0da9a92bf381afc2597bd2dc9c70aae0c + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/i386-linux-ghcup-0.1.15.1 + dlHash: 0c1dcbdd7cfa8accdfbe14c623924f3ca29a35d32a2ac3e61f0eb322855e2cb1 Linux_Alpine: unknown_versioning: *ghcup-32 A_ARM64: Linux_UnknownLinux: unknown_versioning: - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/aarch64-linux-ghcup-0.1.14.1 - dlHash: e9ae07b7d41ea03e6af9c1f3587f61287827c4e29478b6a5d46ea1ce5af4cee5 + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-linux-ghcup-0.1.15.1 + dlHash: 7fa29d8e9a9fe3d1e3a63a1d16fc3550128edbdb9b5b5dff7974358c4dab192c + Darwin: + unknown_versioning: + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-apple-darwin-ghcup-0.1.15.1 + dlHash: 6a743cd50e8124ac2de8be77013d49dcf3b99ce7cc463ec86ed99a904a51dfd9 A_ARM: Linux_UnknownLinux: unknown_versioning: - dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/armv7-linux-ghcup-0.1.14.1 - dlHash: 646832030efbc0a848df24c08b5eb7507bd15d1c2eb95fea6d9d03890f3662be + dlUri: https://downloads.haskell.org/~ghcup/0.1.15.1/armv7-linux-ghcup-0.1.15.1 + dlHash: 77ee5d9828c2ba771127274e301e81412b9f29af2d65dd85dada4786d9438c2c HLS: 1.1.0: viTags: