From df9dd0e785b927f58d0a697ec06ddbadfd3dbb36 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 12 Apr 2020 18:31:07 +0200 Subject: [PATCH] Update download info and bootstrap script --- app/ghcup-gen/GHCupDownloads.hs | 30 ++++++++++++++++++++++++++---- bootstrap-haskell | 15 +++++++++++---- ghcup-0.0.1.json | 30 ++++++++++++++++++++++++++---- 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/app/ghcup-gen/GHCupDownloads.hs b/app/ghcup-gen/GHCupDownloads.hs index 827d467..8ba2ccd 100644 --- a/app/ghcup-gen/GHCupDownloads.hs +++ b/app/ghcup-gen/GHCupDownloads.hs @@ -986,16 +986,30 @@ cabal_3200_64_darwin = DownloadInfo ghcup_010_64_linux :: DownloadInfo ghcup_010_64_linux = DownloadInfo - [uri|https://github.com/hasufell/ghcup-hs/releases/download/0.1.0-pre/x86_64-pc-linux-ghcup|] + [uri|https://www.haskell.org/ghcup/bin/0.1.0/x86_64-linux-ghcup-0.1.0|] Nothing - "f0105c69669285aaa8db101ce44f04e2ff69d4939882e52110b330a9d02409aa" + "e2e124903193551df84679887a5741021f0d67df45442c9d3d2429e83b95aad1" ghcup_010_64_freebsd :: DownloadInfo ghcup_010_64_freebsd = DownloadInfo - [uri|https://github.com/hasufell/ghcup-hs/releases/download/0.1.0-pre/x86_64-portbld-freebsd-ghcup|] + [uri|https://www.haskell.org/ghcup/bin/0.1.0/x86_64-portbld-freebsd-ghcup-0.1.0|] Nothing - "1ef384ad54af02d7a9c1151e17cd96273c857395dc4a6696eef11b369c0a1b46" + "c6024c7f2849b6ed83cd683bb0a0e3d5b559aee3fba2ee78ada4f0c9804dbe36" + + +ghcup_010_64_darwin10_13 :: DownloadInfo +ghcup_010_64_darwin10_13 = DownloadInfo + [uri|https://www.haskell.org/ghcup/bin/0.1.0/x86_64-apple-darwin-10.13-ghcup-0.1.0|] + Nothing + "39b96cd984b6e8393bcb93eaeab2f4648e7ef4e4547afe623283774643eede58" + + +ghcup_010_64_darwin10_14 :: DownloadInfo +ghcup_010_64_darwin10_14 = DownloadInfo + [uri|https://www.haskell.org/ghcup/bin/0.1.0/x86_64-apple-darwin-10.14-ghcup-0.1.0|] + Nothing + "adfcf500f0414951685e53f72bbc9c1e3b2f41c06e562ed3f63fbd645bf61e54" @@ -1867,6 +1881,14 @@ ghcupDownloads = M.fromList [ ( A_64 , M.fromList [ (Linux UnknownLinux, M.fromList [(Nothing, ghcup_010_64_linux)]) + , ( Darwin + , M.fromList + [ (Nothing , ghcup_010_64_darwin10_13) + , (Just [vers|10.13|], ghcup_010_64_darwin10_13) + , (Just [vers|10.14|], ghcup_010_64_darwin10_14) + , (Just [vers|10.15|], ghcup_010_64_darwin10_14) + ] + ) , (FreeBSD, M.fromList [(Nothing, ghcup_010_64_freebsd)]) ] ) diff --git a/bootstrap-haskell b/bootstrap-haskell index 4a3f1d3..6efc2cf 100755 --- a/bootstrap-haskell +++ b/bootstrap-haskell @@ -39,19 +39,26 @@ download_ghcup() { case "${_plat}" in "linux"|"Linux") - edo curl -Lf https://github.com/hasufell/ghcup-hs/releases/download/0.1.0-pre/x86_64-pc-linux-ghcup > "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/ghcup + _url=https://www.haskell.org/ghcup/bin/x86_64-linux-ghcup ;; "FreeBSD"|"freebsd") - edo curl -Lf https://github.com/hasufell/ghcup-hs/releases/download/0.1.0-pre/x86_64-portbld-freebsd-ghcup > "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/ghcup + _url=https://www.haskell.org/ghcup/bin/x86_64-portbld-freebsd-ghcup ;; "Darwin"|"darwin") - edo curl -Lf https://github.com/hasufell/ghcup-hs/releases/download/travis-0.1.8/x86_64-apple-darwin-10.13-ghcup > "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/ghcup + case "$(sw_vers -productVersion || echo "none")" in + 10.15.*) _url=https://www.haskell.org/ghcup/bin/x86_64-apple-darwin-10.14-ghcup ;; + 10.14.*) _url=https://www.haskell.org/ghcup/bin/x86_64-apple-darwin-10.14-ghcup ;; + 10.13.*) _url=https://www.haskell.org/ghcup/bin/x86_64-apple-darwin-10.13-ghcup ;; + *) _url=https://www.haskell.org/ghcup/bin/x86_64-apple-darwin-10.13-ghcup ;; + esac ;; *) die "Unknown platform: ${_plat}" ;; esac - unset _plat _arch + edo curl -Lf "${_url}" > "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/ghcup + + unset _plat _arch _url } diff --git a/ghcup-0.0.1.json b/ghcup-0.0.1.json index eee23ed..29b50ee 100644 --- a/ghcup-0.0.1.json +++ b/ghcup-0.0.1.json @@ -2118,16 +2118,38 @@ "A_64": { "FreeBSD": { "unknown_versioning": { - "dlHash": "1ef384ad54af02d7a9c1151e17cd96273c857395dc4a6696eef11b369c0a1b46", + "dlHash": "c6024c7f2849b6ed83cd683bb0a0e3d5b559aee3fba2ee78ada4f0c9804dbe36", "dlSubdir": null, - "dlUri": "https://github.com/hasufell/ghcup-hs/releases/download/0.1.0-pre/x86_64-portbld-freebsd-ghcup" + "dlUri": "https://www.haskell.org/ghcup/bin/0.1.0/x86_64-portbld-freebsd-ghcup-0.1.0" + } + }, + "Darwin": { + "unknown_versioning": { + "dlHash": "39b96cd984b6e8393bcb93eaeab2f4648e7ef4e4547afe623283774643eede58", + "dlSubdir": null, + "dlUri": "https://www.haskell.org/ghcup/bin/0.1.0/x86_64-apple-darwin-10.13-ghcup-0.1.0" + }, + "10.14": { + "dlHash": "adfcf500f0414951685e53f72bbc9c1e3b2f41c06e562ed3f63fbd645bf61e54", + "dlSubdir": null, + "dlUri": "https://www.haskell.org/ghcup/bin/0.1.0/x86_64-apple-darwin-10.14-ghcup-0.1.0" + }, + "10.13": { + "dlHash": "39b96cd984b6e8393bcb93eaeab2f4648e7ef4e4547afe623283774643eede58", + "dlSubdir": null, + "dlUri": "https://www.haskell.org/ghcup/bin/0.1.0/x86_64-apple-darwin-10.13-ghcup-0.1.0" + }, + "10.15": { + "dlHash": "adfcf500f0414951685e53f72bbc9c1e3b2f41c06e562ed3f63fbd645bf61e54", + "dlSubdir": null, + "dlUri": "https://www.haskell.org/ghcup/bin/0.1.0/x86_64-apple-darwin-10.14-ghcup-0.1.0" } }, "Linux_UnknownLinux": { "unknown_versioning": { - "dlHash": "f0105c69669285aaa8db101ce44f04e2ff69d4939882e52110b330a9d02409aa", + "dlHash": "e2e124903193551df84679887a5741021f0d67df45442c9d3d2429e83b95aad1", "dlSubdir": null, - "dlUri": "https://github.com/hasufell/ghcup-hs/releases/download/0.1.0-pre/x86_64-pc-linux-ghcup" + "dlUri": "https://www.haskell.org/ghcup/bin/0.1.0/x86_64-linux-ghcup-0.1.0" } } }