Revert "Remove travis"

This reverts commit 5e35a91ef0.
Fix CI
2020-05-07 18:32:55 +02:00 · 2020-05-07 00:42:52 +02:00 · 2020-05-06 22:33:52 +02:00 · 2020-05-02 23:50:09 +02:00 · 2020-05-01 16:28:51 +02:00 · 2020-05-01 16:27:41 +02:00
18 changed files with 154 additions and 2446 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 dist-newstyle/
+cabal.project.local
 .stack-work/
+bin/
--- a/.gitlab/before_script/darwin/install_deps.sh
+++ b/.gitlab/before_script/darwin/install_deps.sh
@@ -4,6 +4,8 @@ set -eux

 . "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"

+mkdir -p "${TMPDIR}"
+
 curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup > ./ghcup-bin
 chmod +x ghcup-bin

--- a/.gitlab/before_script/freebsd/install_deps.sh
+++ b/.gitlab/before_script/freebsd/install_deps.sh
@@ -6,6 +6,8 @@ set -eux

 . "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"

+mkdir -p "${TMPDIR}"
+
 curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-portbld-freebsd-ghcup > ./ghcup-bin
 chmod +x ghcup-bin

--- a/.gitlab/before_script/linux/alpine/install_deps.sh
+++ b/.gitlab/before_script/linux/alpine/install_deps.sh
@@ -4,6 +4,8 @@ set -eux

 . "$( cd "$(dirname "$0")" ; pwd -P )/../../../ghcup_env"

+mkdir -p "${TMPDIR}"
+
 apk add --no-cache \
 	curl \
 	gcc \
--- a/.gitlab/before_script/linux/install_deps.sh
+++ b/.gitlab/before_script/linux/install_deps.sh
@@ -2,11 +2,13 @@

 set -eux

+. "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"
+
+mkdir -p "${TMPDIR}"
+
 sudo apt-get update -y
 sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev git wget

-. "$( cd "$(dirname "$0")" ; pwd -P )/../../ghcup_env"
-
 curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > ./ghcup-bin
 chmod +x ghcup-bin

--- a/.gitlab/ghcup_env
+++ b/.gitlab/ghcup_env
@@ -1,3 +1,3 @@
 export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
 export PATH="$CI_PROJECT_DIR/.ghcup/bin:$CI_PROJECT_DIR/.local/bin:$PATH"
-
+export TMPDIR="$CI_PROJECT_DIR/tmp"
--- a/.gitlab/script/ghcup_version.sh
+++ b/.gitlab/script/ghcup_version.sh
@@ -14,7 +14,7 @@ eghcup() {
 	ghcup -v -c -s file://$(pwd)/ghcup-${JSON_VERSION}.json "$@"
 }

-git describe
+git describe --always

 ### build

--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -18,5 +18,5 @@ ghcup set 8.8.3
 ## install ghcup

 cabal update
-cabal build -fcurl
+cabal build
 cp "$(cabal new-exec --verbose=0 --offline sh -- -c 'command -v ghcup')" "./${ARTIFACT}"
--- a/42
+++ b/42
@@ -1,42 +0,0 @@
-FROM alpine:edge
-
-# ghc and cabal
-RUN apk add --no-cache \
-	curl \
-	gcc \
-	g++ \
-	gmp-dev \
-	ncurses-dev \
-	libffi-dev \
-	make \
-	xz \
-	tar \
-	perl \
-	\
-	cabal \
-	ghc
-
-# utils
-RUN apk add --no-cache \
-	bash
-
-## Package specific
-RUN apk add --no-cache \
-	zlib \
-	zlib-dev \
-	zlib-static \
-	gmp \
-	gmp-dev \
-	openssl-dev \
-	openssl-libs-static \
-	xz \
-	xz-dev
-
-RUN cabal v2-update
-
-COPY . /app
-
-WORKDIR /app
-
-RUN chmod +x /app/docker/build.sh
-
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -2,13 +2,18 @@

 1. update `GHCup.Version` module. `ghcupURL` must only be updated if we change the `_toolRequirements` type or the JSON representation of it. The version of the json represents the change increments. `ghcUpVer` is the current application version.

-2. Add/fix downloads to `GHCupDownloads` module, then run `ghcup-gen gen` to generate the new json and validate it via `ghcup-gen check`.
+2. Update version in ghcup.cabal

-3. Commit and git push with tag. Wait for tests to succeed and release artifacts to build.
+3. Add ChangeLog entry

-4. Download release artifacts and upload them `downloads.haskell.org/ghcup`
+4. Add/fix downloads to `GHCupDownloads` module, then run `ghcup-gen gen` to generate the new json and validate it via `ghcup-gen check`.

-5. Add release artifacts to GHCupDownloads (see point 2.)
+5. Commit and git push with tag. Wait for tests to succeed and release artifacts to build.

-6. Upload the final `ghcup-<ver>.json` to `webhost.haskell.org/ghcup/data/`.
+6. Download release artifacts and upload them `downloads.haskell.org/ghcup`

+7. Add release artifacts to GHCupDownloads (see point 4.)
+
+8. Upload the final `ghcup-<ver>.json` to `webhost.haskell.org/ghcup/data/`.
+
+9. Update bootstrap-haskell and symlinks on `downloads.haskell.org/ghcup`
--- a/TODO.md
+++ b/TODO.md
@@ -2,20 +2,19 @@

 ## Now

-* try to run exe before upgrade (backup to ~/.ghcup/bin/ghcup.old)
-* allow to build 8.8
-* curl DL does not cache json
-* explain environment variables
-* add --keep=<always|error> option
-
-* allow to switch to curl/wget at runtime
-
-* cross support
+* ghcup init?
+* merge two download files
+* fetch/unpack functionality
 * installing multiple versions of the same
+* post-install

 * proper test suite
-* add more logging

+* !! update of 0.1.5 must go in ghcup-0.0.1.json !!
+
+* try to run exe before upgrade (backup to ~/.ghcup/bin/ghcup.old)
+* stdout flushing?
+* resume support (for make-install only)

 ## Maybe

--- a/37
+++ b/37
@@ -26,15 +26,16 @@ eghcup() {
 download_ghcup() {
 	_plat="$(uname -s)"
 	_arch=$(uname -m)
+	_ghver="0.1.5"

    case "${_plat}" in
        "linux"|"Linux")
 			case "${_arch}" in
 				x86_64|amd64)
-					_url=https://downloads.haskell.org/~ghcup/0.1.4/x86_64-linux-ghcup-0.1.4
+					_url=https://downloads.haskell.org/~ghcup/${_ghver}/x86_64-linux-ghcup-${_ghver}
 					;;
 				i*86)
-					_url=https://downloads.haskell.org/~ghcup/0.1.4/i386-linux-ghcup-0.1.4
+					_url=https://downloads.haskell.org/~ghcup/${_ghver}/i386-linux-ghcup-${_ghver}
 					;;
 				*) die "Unknown architecture: ${_arch}"
 					;;
@@ -50,7 +51,7 @@ download_ghcup() {
 				*) die "Unknown architecture: ${_arch}"
 					;;
 			esac
-			_url=https://downloads.haskell.org/~ghcup/0.1.4/x86_64-portbld-freebsd-ghcup-0.1.4
+			_url=https://downloads.haskell.org/~ghcup/${_ghver}/x86_64-portbld-freebsd-ghcup-${_ghver}
            ;;
        "Darwin"|"darwin")
 			case "${_arch}" in
@@ -62,30 +63,31 @@ download_ghcup() {
 				*) die "Unknown architecture: ${_arch}"
 					;;
 			esac
-			_url=https://downloads.haskell.org/~ghcup/0.1.4/x86_64-apple-darwin-ghcup-0.1.4 ;;
+			_url=https://downloads.haskell.org/~ghcup/${_ghver}/x86_64-apple-darwin-ghcup-${_ghver} ;;
        *) die "Unknown platform: ${_plat}"
 			;;
    esac

 	edo curl -Lf "${_url}" > "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/ghcup

-	unset _plat _arch _url
+	unset _plat _arch _url _ghver
 }


 echo
 echo "Welcome to Haskell!"
 echo
-echo "This will download and install the Glasgow Haskell Compiler (GHC)"
-echo "and the Cabal build tool."
+echo "This script will download and install the following binaries:"
+echo "  * ghcup - The Haskell toolchain installer (for managing GHC/cabal versions)"
+echo "  * ghc   - The Glasgow Haskell Compiler"
+echo "  * cabal - The Cabal build tool"
 echo
 echo "ghcup installs only into the following directory, which can be removed anytime:"
 echo "  $GHCUP_INSTALL_BASE_PREFIX/.ghcup"
 echo

 if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
-    printf "\\033[0;35m%s\\033[0m\\n" "Press ENTER to proceed"
-    printf "\\033[0;35m%s\\033[0m\\n" "or ctrl-c to abort."
+    printf "\\033[0;35m%s\\033[0m\\n" "Press ENTER to proceed or ctrl-c to abort."
    printf "\\033[0;35m%s\\033[0m\\n" "Note that this script can be re-run at any given time."
    echo
    # Wait for user input to continue.
@@ -116,8 +118,7 @@ echo "$(ghcup tool-requirements)"
 echo

 if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
-    printf "\\033[0;35m%s\\033[0m\\n" "Press ENTER to proceed"
-    printf "\\033[0;35m%s\\033[0m\\n" "or ctrl-c to abort."
+    printf "\\033[0;35m%s\\033[0m\\n" "Press ENTER to proceed or ctrl-c to abort."
    printf "\\033[0;35m%s\\033[0m\\n" "Installation may take a while."
    echo

@@ -147,21 +148,11 @@ if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
 			GHCUP_PROFILE_FILE="$HOME/.zshrc"
 			MY_SHELL="zsh" ;;
 		*/bash) # login shell is bash
-			if [ -f "$HOME/.bashrc" ] ; then # bashrc is not sourced by default, so assume it isn't if file does not exist
-				GHCUP_PROFILE_FILE="$HOME/.bashrc"
-			else
-				GHCUP_PROFILE_FILE="$HOME/.bash_profile"
-			fi
-
+			GHCUP_PROFILE_FILE="$HOME/.bashrc"
 			MY_SHELL="bash" ;;
 		*/sh) # login shell is sh, but might be a symlink to bash or zsh
 			if [ -n "${BASH}" ] ; then
-				if [ -f "$HOME/.bashrc" ] ; then # bashrc is not sourced by default, so assume it isn't if file does not exist
-					GHCUP_PROFILE_FILE="$HOME/.bashrc"
-				else
-					GHCUP_PROFILE_FILE="$HOME/.bash_profile"
-				fi
-
+				GHCUP_PROFILE_FILE="$HOME/.bashrc"
 				MY_SHELL="bash"
 			elif [ -n "${ZSH_VERSION}" ] ; then
 				GHCUP_PROFILE_FILE="$HOME/.zshrc"
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-cd /app
-
-cabal v2-update
-
-cabal v2-install \
-	--install-method=copy \
-	--overwrite-policy=always \
-	--installdir="/bin" \
-	--ghc-options='-optl-static'
-
--- a/ghcup-0.0.1.json
+++ b/ghcup-0.0.1.json
--- a/ghcup-0.0.2.json
+++ b/ghcup-0.0.2.json
@@ -65,6 +65,7 @@
              "gcc",
              "gcc-c++",
              "gmp",
+              "gmp-devel",
              "make",
              "ncurses",
              "xz",
@@ -77,6 +78,7 @@
              "gcc",
              "gcc-c++",
              "gmp",
+              "gmp-devel",
              "make",
              "ncurses",
              "ncurses-compat-libs",
@@ -197,7 +199,7 @@
          "dlSubdir": "ghc-8.6.2",
          "dlUri": "https://downloads.haskell.org/~ghc/8.6.2/ghc-8.6.2-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.6.2/docs/html/users_guide/8.6.2-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.6.2/docs/html/users_guide/8.6.2-notes.html",
        "viTags": [
          "base-4.12.0.0"
        ]
@@ -294,7 +296,7 @@
          "dlSubdir": "ghc-8.0.2",
          "dlUri": "https://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.0.2/docs/html/users_guide/8.0.1-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.0.2/docs/html/users_guide/8.0.1-notes.html",
        "viTags": [
          "base-4.9.1.0"
        ]
@@ -410,7 +412,7 @@
          "dlSubdir": "ghc-8.6.4",
          "dlUri": "https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.6.4/docs/html/users_guide/8.6.4-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.6.4/docs/html/users_guide/8.6.4-notes.html",
        "viTags": [
          "base-4.12.0.0"
        ]
@@ -518,7 +520,7 @@
          "dlSubdir": "ghc-8.4.1",
          "dlUri": "https://downloads.haskell.org/~ghc/8.4.1/ghc-8.4.1-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.4.1/docs/html/users_guide/8.4.1-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.4.1/docs/html/users_guide/8.4.1-notes.html",
        "viTags": [
          "base-4.11.0.0"
        ]
@@ -655,7 +657,7 @@
          "dlSubdir": "ghc-8.6.3",
          "dlUri": "https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.6.3/docs/html/users_guide/8.6.3-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.6.3/docs/html/users_guide/8.6.3-notes.html",
        "viTags": [
          "base-4.12.0.0"
        ]
@@ -798,7 +800,7 @@
          "dlSubdir": "ghc-8.10.1",
          "dlUri": "https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.10.1/docs/html/users_guide/8.10.1-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.10.1/docs/html/users_guide/8.10.1-notes.html",
        "viTags": [
          "Latest",
          "base-4.14.0.0"
@@ -929,7 +931,7 @@
          "dlSubdir": "ghc-8.6.5",
          "dlUri": "https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.6.5/docs/html/users_guide/8.6.5-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.6.5/docs/html/users_guide/8.6.5-notes.html",
        "viTags": [
          "base-4.12.0.0"
        ]
@@ -1052,7 +1054,7 @@
          "dlSubdir": "ghc-8.4.2",
          "dlUri": "https://downloads.haskell.org/~ghc/8.4.2/ghc-8.4.2-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.4.2/docs/html/users_guide/8.4.2-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.4.2/docs/html/users_guide/8.4.2-notes.html",
        "viTags": [
          "base-4.11.1.0"
        ]
@@ -1182,7 +1184,7 @@
          "dlSubdir": "ghc-8.8.1",
          "dlUri": "https://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.8.1/docs/html/users_guide/8.8.1-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.8.1/docs/html/users_guide/8.8.1-notes.html",
        "viTags": [
          "base-4.13.0.0"
        ]
@@ -1298,7 +1300,7 @@
          "dlSubdir": "ghc-8.4.3",
          "dlUri": "https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html",
        "viTags": [
          "base-4.11.1.0"
        ]
@@ -1421,7 +1423,7 @@
          "dlSubdir": "ghc-8.6.1",
          "dlUri": "https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.6.1/docs/html/users_guide/8.6.1-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.6.1/docs/html/users_guide/8.6.1-notes.html",
        "viTags": [
          "base-4.12.0.0"
        ]
@@ -1551,7 +1553,7 @@
          "dlSubdir": "ghc-8.8.2",
          "dlUri": "https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.8.2/docs/html/users_guide/8.8.2-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.8.2/docs/html/users_guide/8.8.2-notes.html",
        "viTags": [
          "base-4.13.0.0"
        ]
@@ -1680,7 +1682,7 @@
          "dlSubdir": "ghc-7.10.3",
          "dlUri": "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/7.10.3/docs/html/users_guide/release-7-10-1.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/7.10.3/docs/html/users_guide/release-7-10-1.html",
        "viTags": [
          "base-4.8.2.0"
        ]
@@ -1787,7 +1789,7 @@
          "dlSubdir": "ghc-8.2.2",
          "dlUri": "https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.2.2/docs/html/users_guide/8.2.2-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.2.2/docs/html/users_guide/8.2.2-notes.html",
        "viTags": [
          "base-4.10.1.0"
        ]
@@ -1924,7 +1926,7 @@
          "dlSubdir": "ghc-8.4.4",
          "dlUri": "https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.4.4/docs/html/users_guide/8.4.4-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.4.4/docs/html/users_guide/8.4.4-notes.html",
        "viTags": [
          "base-4.11.1.0"
        ]
@@ -2054,7 +2056,7 @@
          "dlSubdir": "ghc-8.8.3",
          "dlUri": "https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-src.tar.xz"
        },
-        "viChangeLog": "https://downloads.haskell.org/ghc/8.8.3/docs/html/users_guide/8.8.3-notes.html",
+        "viChangeLog": "https://downloads.haskell.org/~ghc/8.8.3/docs/html/users_guide/8.8.3-notes.html",
        "viTags": [
          "Recommended",
          "base-4.13.0.0"
@@ -2067,23 +2069,23 @@
          "A_64": {
            "Linux_Alpine": {
              "unknown_versioning": {
-                "dlHash": "7b35e5986aba4a40fc37141cbde26612bfc916e95a2d2ff35a413612d8c7cd3a",
+                "dlHash": "2b7ea63601e11a0db2941b96e6a7036a48efc2a1ab3849d7dfce08b45f5daa58",
                "dlSubdir": null,
-                "dlUri": "https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=%2Fcabal-install-3.0.0.0-x86_64-alpine-linux-musl.tar.xz&dl=1"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-alpine-linux-musl.tar.xz"
              }
            },
            "FreeBSD": {
              "unknown_versioning": {
-                "dlHash": "d97b6469ed612a1367ad1032d0722469ee5277668879694d7d4336233b937516",
+                "dlHash": "2240842ab2ae7b955feb8b526aba1c7991248c803383107adf39990441294d2a",
                "dlSubdir": null,
-                "dlUri": "https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=%2Fcabal-install-3.0.0.0-x86_64-portbld-freebsd.tar.xz&dl=1"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-portbld-freebsd.tar.xz"
              }
            },
            "Darwin": {
              "unknown_versioning": {
                "dlHash": "d4857e068560515e4cbb0e8ca124c370e07892f2a28804d87152834e5fe2b845",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-apple-darwin17.7.0.tar.xz"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-apple-darwin17.7.0.tar.xz"
              }
            },
            "Linux_UnknownLinux": {
@@ -2097,16 +2099,16 @@
          "A_32": {
            "Linux_Alpine": {
              "unknown_versioning": {
-                "dlHash": "a4191cd5a645b00e6a9c53abe6f3cb91fe700de7d7c520c9cb36ce8ec5c9919a",
+                "dlHash": "ac018f061993d40bf146517e32629bcab274b4d9f5527b1c37a665ebdf3f5ac6",
                "dlSubdir": null,
-                "dlUri": "https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=%2Fcabal-install-3.0.0.0-i386-alpine-linux-musl.tar.xz&dl=1"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-i386-alpine-linux-musl.tar.xz"
              }
            },
            "Linux_UnknownLinux": {
              "unknown_versioning": {
                "dlHash": "6898ccd6e6dc0872999c06daaf61d546164e12f60a1880d09852c9f0c59c5cf6",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-i386-unknown-linux.tar.xz"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-i386-unknown-linux.tar.xz"
              }
            }
          }
@@ -2124,23 +2126,23 @@
          "A_64": {
            "Linux_Alpine": {
              "unknown_versioning": {
-                "dlHash": "c1f3c21a5307cea8d2a0bd9a2eab9f56f3dd90e947ae64e231f909024980992b",
+                "dlHash": "8bae37a1ce8b5f10440b5591fed734935e1411c1b765258325ffe268e2cc2042",
                "dlSubdir": null,
-                "dlUri": "https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=%2Fcabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz&dl=1"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz"
              }
            },
            "FreeBSD": {
              "unknown_versioning": {
-                "dlHash": "e4dc00ab7fef51354e7624dd03e49c6bb684887fc95acb9b33bc52f357a5ef8c",
+                "dlHash": "f1e35151cca91541b0fb4bdb3ed18f3c348038eab751845ad19c11307d66c273",
                "dlSubdir": null,
-                "dlUri": "https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=%2Fcabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz&dl=1"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz"
              }
            },
            "Darwin": {
              "unknown_versioning": {
                "dlHash": "9197c17d2ece0f934f5b33e323cfcaf486e4681952687bc3d249488ce3cbe0e9",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-apple-darwin17.7.0.tar.xz"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-apple-darwin17.7.0.tar.xz"
              }
            },
            "Linux_UnknownLinux": {
@@ -2154,16 +2156,16 @@
          "A_32": {
            "Linux_Alpine": {
              "unknown_versioning": {
-                "dlHash": "4aaa52fbc337ae1ef855a2aa2808186580b21ec36883aafec7473e7d899bc5ec",
+                "dlHash": "c2a419dedf730987b60daf8d24e871d115a09ea608d740d7c61b36e3f5b9c830",
                "dlSubdir": null,
-                "dlUri": "https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=%2Fcabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz&dl=1"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz"
              }
            },
            "Linux_UnknownLinux": {
              "unknown_versioning": {
                "dlHash": "2b3ac28549916de5f3379241797eaf60e84b6c001f2abbe73d9fadbbaf768e93",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-i386-unknown-linux.tar.xz"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-i386-unknown-linux.tar.xz"
              }
            }
          }
@@ -2186,7 +2188,7 @@
              "unknown_versioning": {
                "dlHash": "720bef015f834a03deb7180be2952a44e7c2e6c8429137570404c3de4f46b984",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-alpine-linux-musl.tar.xz"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-alpine-linux-musl.tar.xz"
              }
            },
            "FreeBSD": {
@@ -2200,14 +2202,14 @@
              "unknown_versioning": {
                "dlHash": "56361cf4b0d920fe23174751fea1fb82a8e1ce522bd9706a3fbe47a72e458c9c",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-apple-darwin-sierra.tar.xz"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-apple-darwin-sierra.tar.xz"
              }
            },
            "Linux_UnknownLinux": {
              "unknown_versioning": {
                "dlHash": "6136c189ffccaa39916f9cb5788f757166444a2d0c473b987856a79ecbf0c714",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-unknown-linux.tar.xz"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-unknown-linux.tar.xz"
              }
            }
          },
@@ -2216,7 +2218,7 @@
              "unknown_versioning": {
                "dlHash": "b2da736cc27609442b10f77fc1a687aba603a7a33045b722dbf1a0066fade198",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-i386-unknown-linux.tar.xz"
+                "dlUri": "https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-i386-unknown-linux.tar.xz"
              }
            }
          }
@@ -2231,37 +2233,37 @@
      }
    },
    "GHCup": {
-      "0.1.4": {
+      "0.1.5": {
        "viArch": {
          "A_64": {
            "FreeBSD": {
              "unknown_versioning": {
-                "dlHash": "cda0b959f053abc04ab0a1b9919a505b8c9304e2898a291f527a370cb0e00731",
+                "dlHash": "6dd57cc5958ef3a6ba7de22808d9292d31dada8af95277578b69be35fc090194",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.4/x86_64-portbld-freebsd-ghcup-0.1.4"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/x86_64-portbld-freebsd-ghcup-0.1.5"
              }
            },
            "Darwin": {
              "unknown_versioning": {
-                "dlHash": "2422b79933ae037237ccb8f836417b90b3111d7931beb7ae8b9e33a1945c641e",
+                "dlHash": "5be3324b65c737af942cc5ed1a025d4882f29c1efcc7dcd971a893efab78d394",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.4/x86_64-apple-darwin-ghcup-0.1.4"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/x86_64-apple-darwin-ghcup-0.1.5"
              }
            },
            "Linux_UnknownLinux": {
              "unknown_versioning": {
-                "dlHash": "78d69ed4c9a810a445af89ea25e4217a632799ecb427b06cd2320ffb574f555e",
+                "dlHash": "cfdb01dde77121859b5d90b6707238b54e23787fcbb3003e18ab52a5dbfee330",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.4/x86_64-linux-ghcup-0.1.4"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/x86_64-linux-ghcup-0.1.5"
              }
            }
          },
          "A_32": {
            "Linux_UnknownLinux": {
              "unknown_versioning": {
-                "dlHash": "057cc1cc39abdacd92cb1d4fb44c850fd9c5398a36b893286248ac5c38bc0c70",
+                "dlHash": "3707f60d703912709335dc0103fb1af5e5dfa83050825a8156b56bc81760b2a8",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.4/i386-linux-ghcup-0.1.4"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/i386-linux-ghcup-0.1.5"
              }
            }
          }
--- a/lib/GHCup/Data/GHCupDownloads.hs
+++ b/lib/GHCup/Data/GHCupDownloads.hs
@@ -897,25 +897,25 @@ ghc_8101_64_alpine = DownloadInfo

 cabal_2410_32_linux :: DownloadInfo
 cabal_2410_32_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-i386-unknown-linux.tar.xz|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-i386-unknown-linux.tar.xz|]
  Nothing
  "b2da736cc27609442b10f77fc1a687aba603a7a33045b722dbf1a0066fade198"

 cabal_2410_64_linux :: DownloadInfo
 cabal_2410_64_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-unknown-linux.tar.xz|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-unknown-linux.tar.xz|]
  Nothing
  "6136c189ffccaa39916f9cb5788f757166444a2d0c473b987856a79ecbf0c714"

 cabal_2410_64_darwin :: DownloadInfo
 cabal_2410_64_darwin = DownloadInfo
-  [uri|https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-apple-darwin-sierra.tar.xz|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-apple-darwin-sierra.tar.xz|]
  Nothing
  "56361cf4b0d920fe23174751fea1fb82a8e1ce522bd9706a3fbe47a72e458c9c"

 cabal_2410_64_alpine :: DownloadInfo
 cabal_2410_64_alpine = DownloadInfo
-  [uri|https://downloads.haskell.org/cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-alpine-linux-musl.tar.xz|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-alpine-linux-musl.tar.xz|]
  Nothing
  "720bef015f834a03deb7180be2952a44e7c2e6c8429137570404c3de4f46b984"

@@ -935,7 +935,7 @@ cabal_2410_64_freebsd = DownloadInfo

 cabal_3000_32_linux :: DownloadInfo
 cabal_3000_32_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-i386-unknown-linux.tar.xz|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-i386-unknown-linux.tar.xz|]
  Nothing
  "6898ccd6e6dc0872999c06daaf61d546164e12f60a1880d09852c9f0c59c5cf6"

@@ -947,27 +947,27 @@ cabal_3000_64_linux = DownloadInfo

 cabal_3000_64_darwin :: DownloadInfo
 cabal_3000_64_darwin = DownloadInfo
-  [uri|https://downloads.haskell.org/cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-apple-darwin17.7.0.tar.xz|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-apple-darwin17.7.0.tar.xz|]
  Nothing
  "d4857e068560515e4cbb0e8ca124c370e07892f2a28804d87152834e5fe2b845"

 cabal_3000_64_freebsd :: DownloadInfo
 cabal_3000_64_freebsd = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.0.0.0-x86_64-portbld-freebsd.tar.xz&dl=1|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-portbld-freebsd.tar.xz|]
  Nothing
-  "d97b6469ed612a1367ad1032d0722469ee5277668879694d7d4336233b937516"
+  "2240842ab2ae7b955feb8b526aba1c7991248c803383107adf39990441294d2a"

 cabal_3000_32_alpine :: DownloadInfo
 cabal_3000_32_alpine = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.0.0.0-i386-alpine-linux-musl.tar.xz&dl=1|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-i386-alpine-linux-musl.tar.xz|]
  Nothing
-  "a4191cd5a645b00e6a9c53abe6f3cb91fe700de7d7c520c9cb36ce8ec5c9919a"
+  "ac018f061993d40bf146517e32629bcab274b4d9f5527b1c37a665ebdf3f5ac6"

 cabal_3000_64_alpine :: DownloadInfo
 cabal_3000_64_alpine = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.0.0.0-x86_64-alpine-linux-musl.tar.xz&dl=1|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-alpine-linux-musl.tar.xz|]
  Nothing
-  "7b35e5986aba4a40fc37141cbde26612bfc916e95a2d2ff35a413612d8c7cd3a"
+  "2b7ea63601e11a0db2941b96e6a7036a48efc2a1ab3849d7dfce08b45f5daa58"



@@ -978,7 +978,7 @@ cabal_3000_64_alpine = DownloadInfo

 cabal_3200_32_linux :: DownloadInfo
 cabal_3200_32_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-i386-unknown-linux.tar.xz|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-i386-unknown-linux.tar.xz|]
  Nothing
  "2b3ac28549916de5f3379241797eaf60e84b6c001f2abbe73d9fadbbaf768e93"

@@ -990,27 +990,27 @@ cabal_3200_64_linux = DownloadInfo

 cabal_3200_64_darwin :: DownloadInfo
 cabal_3200_64_darwin = DownloadInfo
-  [uri|https://downloads.haskell.org/cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-apple-darwin17.7.0.tar.xz|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-apple-darwin17.7.0.tar.xz|]
  Nothing
  "9197c17d2ece0f934f5b33e323cfcaf486e4681952687bc3d249488ce3cbe0e9"

 cabal_3200_64_freebsd :: DownloadInfo
 cabal_3200_64_freebsd = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz&dl=1|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz|]
  Nothing
-  "e4dc00ab7fef51354e7624dd03e49c6bb684887fc95acb9b33bc52f357a5ef8c"
+  "f1e35151cca91541b0fb4bdb3ed18f3c348038eab751845ad19c11307d66c273"

 cabal_3200_32_alpine :: DownloadInfo
 cabal_3200_32_alpine = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz&dl=1|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz|]
  Nothing
-  "4aaa52fbc337ae1ef855a2aa2808186580b21ec36883aafec7473e7d899bc5ec"
+  "c2a419dedf730987b60daf8d24e871d115a09ea608d740d7c61b36e3f5b9c830"

 cabal_3200_64_alpine :: DownloadInfo
 cabal_3200_64_alpine = DownloadInfo
-  [uri|https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz&dl=1|]
+  [uri|https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz|]
  Nothing
-  "c1f3c21a5307cea8d2a0bd9a2eab9f56f3dd90e947ae64e231f909024980992b"
+  "8bae37a1ce8b5f10440b5591fed734935e1411c1b765258325ffe268e2cc2042"



@@ -1020,32 +1020,32 @@ cabal_3200_64_alpine = DownloadInfo
    -------------


-ghcup_014_32_linux :: DownloadInfo
-ghcup_014_32_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.4/i386-linux-ghcup-0.1.4|]
+ghcup_015_32_linux :: DownloadInfo
+ghcup_015_32_linux = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.5/i386-linux-ghcup-0.1.5|]
  Nothing
-  "057cc1cc39abdacd92cb1d4fb44c850fd9c5398a36b893286248ac5c38bc0c70"
+  "3707f60d703912709335dc0103fb1af5e5dfa83050825a8156b56bc81760b2a8"


-ghcup_014_64_linux :: DownloadInfo
-ghcup_014_64_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.4/x86_64-linux-ghcup-0.1.4|]
+ghcup_015_64_linux :: DownloadInfo
+ghcup_015_64_linux = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.5/x86_64-linux-ghcup-0.1.5|]
  Nothing
-  "78d69ed4c9a810a445af89ea25e4217a632799ecb427b06cd2320ffb574f555e"
+  "cfdb01dde77121859b5d90b6707238b54e23787fcbb3003e18ab52a5dbfee330"


-ghcup_014_64_freebsd :: DownloadInfo
-ghcup_014_64_freebsd = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.4/x86_64-portbld-freebsd-ghcup-0.1.4|]
+ghcup_015_64_freebsd :: DownloadInfo
+ghcup_015_64_freebsd = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.5/x86_64-portbld-freebsd-ghcup-0.1.5|]
  Nothing
-  "cda0b959f053abc04ab0a1b9919a505b8c9304e2898a291f527a370cb0e00731"
+  "6dd57cc5958ef3a6ba7de22808d9292d31dada8af95277578b69be35fc090194"


-ghcup_014_64_darwin10_13 :: DownloadInfo
-ghcup_014_64_darwin10_13 = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.4/x86_64-apple-darwin-ghcup-0.1.4|]
+ghcup_015_64_darwin10_13 :: DownloadInfo
+ghcup_015_64_darwin10_13 = DownloadInfo
+  [uri|https://downloads.haskell.org/~ghcup/0.1.5/x86_64-apple-darwin-ghcup-0.1.5|]
  Nothing
-  "2422b79933ae037237ccb8f836417b90b3111d7931beb7ae8b9e33a1945c641e"
+  "5be3324b65c737af942cc5ed1a025d4882f29c1efcc7dcd971a893efab78d394"



@@ -1064,7 +1064,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.8.2.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/7.10.3/docs/html/users_guide/release-7-10-1.html|]
+              [uri|https://downloads.haskell.org/~ghc/7.10.3/docs/html/users_guide/release-7-10-1.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3-src.tar.xz|]
@@ -1110,7 +1110,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.9.1.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.0.2/docs/html/users_guide/8.0.1-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.0.2/docs/html/users_guide/8.0.1-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-src.tar.xz|]
@@ -1156,7 +1156,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.10.1.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.2.2/docs/html/users_guide/8.2.2-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.2.2/docs/html/users_guide/8.2.2-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-src.tar.xz|]
@@ -1208,7 +1208,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.11.0.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.4.1/docs/html/users_guide/8.4.1-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.4.1/docs/html/users_guide/8.4.1-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.4.1/ghc-8.4.1-src.tar.xz|]
@@ -1247,7 +1247,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.11.1.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.4.2/docs/html/users_guide/8.4.2-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.4.2/docs/html/users_guide/8.4.2-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.4.2/ghc-8.4.2-src.tar.xz|]
@@ -1297,7 +1297,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.11.1.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-src.tar.xz|]
@@ -1346,7 +1346,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.11.1.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.4.4/docs/html/users_guide/8.4.4-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.4.4/docs/html/users_guide/8.4.4-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.4.4/ghc-8.4.4-src.tar.xz|]
@@ -1400,7 +1400,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.12.0.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.6.1/docs/html/users_guide/8.6.1-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.6.1/docs/html/users_guide/8.6.1-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.6.1/ghc-8.6.1-src.tar.xz|]
@@ -1450,7 +1450,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.12.0.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.6.2/docs/html/users_guide/8.6.2-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.6.2/docs/html/users_guide/8.6.2-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.6.2/ghc-8.6.2-src.tar.xz|]
@@ -1494,7 +1494,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.12.0.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.6.3/docs/html/users_guide/8.6.3-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.6.3/docs/html/users_guide/8.6.3-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.6.3/ghc-8.6.3-src.tar.xz|]
@@ -1548,7 +1548,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.12.0.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.6.4/docs/html/users_guide/8.6.4-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.6.4/docs/html/users_guide/8.6.4-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-src.tar.xz|]
@@ -1597,7 +1597,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.12.0.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.6.5/docs/html/users_guide/8.6.5-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.6.5/docs/html/users_guide/8.6.5-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-src.tar.xz|]
@@ -1650,7 +1650,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.13.0.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.8.1/docs/html/users_guide/8.8.1-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.8.1/docs/html/users_guide/8.8.1-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-src.tar.xz|]
@@ -1703,7 +1703,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Base [pver|4.13.0.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.8.2/docs/html/users_guide/8.8.2-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.8.2/docs/html/users_guide/8.8.2-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-src.tar.xz|]
@@ -1756,7 +1756,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Recommended, Base [pver|4.13.0.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.8.3/docs/html/users_guide/8.8.3-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.8.3/docs/html/users_guide/8.8.3-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-src.tar.xz|]
@@ -1809,7 +1809,7 @@ ghcupDownloads = M.fromList
        , VersionInfo
            [Latest, Base [pver|4.14.0.0|]]
            (Just
-              [uri|https://downloads.haskell.org/ghc/8.10.1/docs/html/users_guide/8.10.1-notes.html|]
+              [uri|https://downloads.haskell.org/~ghc/8.10.1/docs/html/users_guide/8.10.1-notes.html|]
            )
            (Just $ DownloadInfo
              [uri|https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-src.tar.xz|]
@@ -1976,7 +1976,7 @@ ghcupDownloads = M.fromList
    )
  , ( GHCup
    , M.fromList
-      [ ( [vver|0.1.4|]
+      [ ( [vver|0.1.5|]
        , VersionInfo
            [Recommended, Latest]
            (Just
@@ -1987,16 +1987,16 @@ ghcupDownloads = M.fromList
              [ ( A_64
                , M.fromList
                  [ ( Linux UnknownLinux
-                    , M.fromList [(Nothing, ghcup_014_64_linux)]
+                    , M.fromList [(Nothing, ghcup_015_64_linux)]
                    )
-                  , (Darwin , M.fromList [(Nothing, ghcup_014_64_darwin10_13)])
-                  , (FreeBSD, M.fromList [(Nothing, ghcup_014_64_freebsd)])
+                  , (Darwin , M.fromList [(Nothing, ghcup_015_64_darwin10_13)])
+                  , (FreeBSD, M.fromList [(Nothing, ghcup_015_64_freebsd)])
                  ]
                )
              , ( A_32
                , M.fromList
                  [ ( Linux UnknownLinux
-                    , M.fromList [(Nothing, ghcup_014_32_linux)]
+                    , M.fromList [(Nothing, ghcup_015_32_linux)]
                    )
                  ]
                )
--- a/lib/GHCup/Data/ToolRequirements.hs
+++ b/lib/GHCup/Data/ToolRequirements.hs
@@ -69,6 +69,7 @@ toolRequirements = M.fromList
                  [ "gcc"
                  , "gcc-c++"
                  , "gmp"
+                  , "gmp-devel"
                  , "make"
                  , "ncurses"
                  , "ncurses-compat-libs"
@@ -82,6 +83,7 @@ toolRequirements = M.fromList
                  [ "gcc"
                  , "gcc-c++"
                  , "gmp"
+                  , "gmp-devel"
                  , "make"
                  , "ncurses"
                  , "xz"
--- a/update-index-state.sh
+++ b/update-index-state.sh
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-status_message() {
-    printf "\\033[0;32m%s\\033[0m\\n" "$1"
-}
-
-error_message() {
-    printf "\\033[0;31m%s\\033[0m\\n" "$1"
-}
-
-SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
-CACHE_LOCATION="${HOME}/.cabal/packages/hackage.haskell.org/01-index.cache"
-
-if [ ! -f "${CACHE_LOCATION}" ] ; then
-	error_message "${CACHE_LOCATION} does not exist, did you run 'cabal update'?"
-	exit 1
-fi
-
-if [ ! -f "${SCRIPTPATH}/cabal.project" ] ; then
-	error_message "Could not find ${SCRIPTPATH}/cabal.project, skipping index state update."
-	exit 3
-fi
-
-cabal v2-update
-
-arch=$(getconf LONG_BIT)
-
-case "${arch}" in
-32)
-	byte_size=4
-	magic_word="CABA1002"
-    ;;
-64)
-	byte_size=8
-	magic_word="00000000CABA1002"
-    ;;
-*)
-	error_message "Unknown architecture (long bit): ${arch}"
-	exit 2
-    ;;
-esac
-
-# This is the logic to parse the binary format of 01-index.cache.
-# The first word is a magic 'caba1002', the second one is the timestamp in unix epoch.
-# Better than copying the cabal-install source code.
-if [ "$(xxd -u -p -l${byte_size} -s 0 "${CACHE_LOCATION}")" != "${magic_word}" ] ; then
-	error_message "Magic word does not match!"
-	exit 4
-fi
-cache_timestamp=$(echo "ibase=16;obase=A;$(xxd -u -p -l${byte_size} -s ${byte_size} "${CACHE_LOCATION}")" | bc)
-
-# If we got junk from the binary file, this should fail.
-cache_date=$(date --utc --date "@${cache_timestamp}" "+%FT%TZ")
-
-
-status_message "Updating index state in ${SCRIPTPATH}/cabal.project"
-
-if grep -q "^index-state: .*" "${SCRIPTPATH}/cabal.project" ; then
-	awk '/index-state:/ {gsub(/.*/, "index-state: '${cache_date}'")}; { print }' "${SCRIPTPATH}/cabal.project" > "${SCRIPTPATH}/cabal.project.tmp"
-	mv "${SCRIPTPATH}/cabal.project.tmp" "${SCRIPTPATH}/cabal.project"
-else
-	printf "index-state: %s\n" "${cache_date}" >> "${SCRIPTPATH}/cabal.project"
-fi
-
Author	SHA1	Message	Date
Julian Ospald	1207c7b3dd	Revert "Remove travis" This reverts commit `5e35a91ef0`.	2020-05-07 18:32:55 +02:00
Julian Ospald	788883df7b	Fix CI	2020-05-07 00:42:52 +02:00
Julian Ospald	5ab1f6c203	Small improvements to bootstrap-haskell	2020-05-06 22:33:52 +02:00
Julian Ospald	175066780b	Forget about .bash_profile Previously we would prefer .bash_profile if no .bashrc exists, but that seems a bit far-fetched. .bash_profile is for login shells, .bashrc is sourced for interactive non-login shells, but most .bash_profiles also explicitly source .bashrc, so it's hard to go wrong with it.	2020-05-02 23:50:09 +02:00
Julian Ospald	a629cf7b9f	Update gitignore	2020-05-01 16:28:51 +02:00
Julian Ospald	684130bfa3	Update bootstrap-haskell	2020-05-01 16:27:41 +02:00
Julian Ospald	ee34d85dbc	Set TMPDIR during CI	2020-05-01 16:27:27 +02:00
Julian Ospald	d2b280da2d	Update tarballs	2020-04-30 20:46:45 +02:00
Julian Ospald	a5593a725f	Cleanup	2020-04-30 00:59:19 +02:00
Julian Ospald	5e35a91ef0	Remove travis	2020-04-30 00:43:44 +02:00
Julian Ospald	4abd10d9c9	Update RELEASING.md	2020-04-30 00:31:33 +02:00
Julian Ospald	0bbac877bd	Update ghcup tarballs	2020-04-30 00:12:30 +02:00
Julian Ospald	f558bd9932	Fix CI failing on git-describe	2020-04-29 23:01:51 +02:00
Julian Ospald	781c28b03c	Update RELEASING.md	2020-04-29 22:37:12 +02:00