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: