Fix bindist for GHC 9.4.1 and 9.4.2 for old GLIBCs

This will break cabal cache and HLS ABI.

.github/workflows/bindists.yaml

@@ -18,11 +18,6 @@ on:
         required: true
         default: ghcup-0.0.7.yaml
         type: string
-      channel:
-        description: Distribution channel (main|prerelease|nightly)
-        required: true
-        default: Main
-        type: string
 env:
   BOOTSTRAP_HASKELL_NONINTERACTIVE: 1
   BOOTSTRAP_HASKELL_MINIMAL: 1
@@ -30,7 +25,6 @@ env:
   TOOL: ${{ github.event.inputs.tool }}
   VERSION: ${{ github.event.inputs.version }}
   METADATA_FILE: ${{ github.event.inputs.metadataFile }}
-  CHANNEL: ${{ github.event.inputs.channel }}
 jobs:
   bindist-install:
     name: linux-${{ matrix.image }}
@@ -42,12 +36,15 @@ jobs:
           - image: alpine:latest
             installCmd: apk update && apk add
             toolRequirements: binutils-gold curl gcc g++ gmp-dev libc-dev libffi-dev make musl-dev ncurses-dev perl tar xz
+          - image: debian:9
+            installCmd: apt-get update && apt-get install -y
+            toolRequirements: build-essential curl libffi-dev libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
           - image: debian:10
             installCmd: apt-get update && apt-get install -y
-            toolRequirements: build-essential curl libffi-dev libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5 libnuma-dev
+            toolRequirements: build-essential curl libffi-dev libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
           - image: debian:11
             installCmd: apt-get update && apt-get install -y
-            toolRequirements: build-essential curl libffi-dev  libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5 libnuma-dev
+            toolRequirements: build-essential curl libffi-dev  libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
           - image: ubuntu:18.04
             installCmd: apt-get update && apt-get install -y
             toolRequirements: build-essential curl libffi-dev libffi6 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
@@ -60,27 +57,9 @@ jobs:
           - image: archlinux:latest
             installCmd: pacman -Syu --noconfirm
             toolRequirements: which gcc gmp libffi make ncurses perl tar xz
-          - image: fedora:27
-            installCmd: dnf install -y
-            toolRequirements: which findutils gcc gcc-c++ gmp gmp-devel make ncurses ncurses-compat-libs xz perl
-          - image: fedora:36
+          - image: fedora:latest
             installCmd: dnf install -y
             toolRequirements: which gcc g++ gmp gmp-devel make ncurses ncurses-compat-libs xz perl
-          - image: rockylinux:8
-            installCmd: dnf install -y
-            toolRequirements: which findutils gcc gcc-c++ gmp gmp-devel make ncurses ncurses-compat-libs xz perl
-          - image: rockylinux:9
-            installCmd: dnf install -y --allowerasing
-            toolRequirements: which findutils gcc gcc-c++ gmp gmp-devel make ncurses xz perl
-          - image: linuxmintd/mint19.3-amd64
-            installCmd: apt-get update && apt-get install -y
-            toolRequirements: build-essential curl libffi-dev libffi6 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
-          - image: linuxmintd/mint20.2-amd64
-            installCmd: apt-get update && apt-get install -y
-            toolRequirements: build-essential curl libffi-dev libffi7 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
-          - image: linuxmintd/mint21.1-amd64
-            installCmd: apt-get update && apt-get install -y
-            toolRequirements: build-essential curl libffi-dev libffi7 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
     container:
       image: ${{ matrix.image }}
     steps:
@@ -88,134 +67,20 @@ jobs:
         shell: sh
         run: |
           ${{ matrix.installCmd }} curl bash git ${{ matrix.toolRequirements }}
-
       - uses: actions/checkout@v3
-
-      - name: Install ghcup and bindist
+      - name: Install ghcup and bindist for ${{ github.event.inputs.tool }} ${{ github.event.inputs.version }}
         run: .github/workflows/install-bindist.sh
-
-  bindist-install-mac-win:
-    name: Build non-linux
+  bindist-install-non-linux:
+    name: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: [self-hosted, macOS, ARM64]
-          - os: macos-11
-          - os: macos-12
-          - os: windows-latest
+        os:
+          - macos-11
+          - macos-12
+          - windows-latest
     runs-on: ${{ matrix.os }}
     steps:
-
       - uses: actions/checkout@v3
-
-      - if: ${{ github.event_name == 'workflow_dispatch' }}
-        name: Install ghcup and bindist
+      - name: Install ghcup and bindist for ${{ github.event.inputs.tool }} ${{ github.event.inputs.version }}
         run: .github/workflows/install-bindist.sh
-
-  bindist-install-arm:
-    name: Build ARM binary
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: [self-hosted, Linux, ARM64]
-            ARCH: ARM
-          - os: [self-hosted, Linux, ARM64]
-            ARCH: ARM64
-    steps:
-      - uses: docker://arm64v8/ubuntu:focal
-        name: Cleanup (aarch64 linux)
-        with:
-          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
-
-      - name: git config
-        run: |
-          git config --global --get-all safe.directory | grep '^\*$' || git config --global --add safe.directory "*"
-        shell: bash
-
-      - uses: actions/checkout@v3
-
-      - if: matrix.ARCH == 'ARM'
-        uses: docker://hasufell/arm32v7-ubuntu-haskell:focal
-        name: Run build (armv7 linux)
-        with:
-          args: sh -c '.github/workflows/install-bindist.sh'
-
-      - if: matrix.ARCH == 'ARM64'
-        uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
-        name: Run build (aarch64 linux)
-        with:
-          args: sh -c '.github/workflows/install-bindist.sh'
-
-  validate:
-    name: ghcup-gen check
-    runs-on: ubuntu-latest
-    env:
-      GHC: 9.2.8
-      CABAL: 3.10.1.0
-    steps:
-      - name: create ~/.local/bin
-        run: mkdir -p "$HOME/.local/bin"
-        shell: bash
-
-      - name: Add ~/.local/bin to PATH
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-        shell: bash
-
-      - name: install yamllint
-        run: pip install yamllint
-
-      - name: Update cabal cache
-        run: cabal update
-        shell: bash
-
-      - name: Install requirements
-        shell: sh
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          export TZ=Asia/Singapore
-          sudo apt-get update && sudo apt-get install -y curl bash git gnupg libarchive-dev
-
-      - uses: actions/checkout@v3
-
-      - name: Cache Cabal
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-cabal
-        with:
-          path: |
-            ~/.cabal/store
-            ~/.cabal/packages
-          key: v2-${{ runner.os }}-${{ env.GHC }}-${{ env.CABAL }}-build-${{ hashFiles('cabal.project') }}
-          restore-keys: |
-            v2-${{ runner.os }}-${{ env.GHC }}-${{ env.CABAL }}-build-${{ hashFiles('cabal.project') }}
-            v2-${{ runner.os }}-${{ env.GHC }}-${{ env.CABAL }}-build-
-            v2-${{ runner.os }}-${{ env.GHC }}
-
-      - name: Install ghcup-gen
-        run: |
-          ghcup run --cabal 3.10.1.0 --ghc 9.2.8 --install -- cabal install --installdir="$HOME/.local/bin" --overwrite-policy=always --install-method=copy ghcup-gen
-        shell: bash
-
-      - name: Check yaml
-        run: |
-          ghcup-gen -- check -f ${{ env.METADATA_FILE }} --channel ${{ env.CHANNEL }}
-          yamllint ${{ env.METADATA_FILE }}
-          python3 -c "import yaml ; stream = open('${{ env.METADATA_FILE }}', 'r') ; yaml.safe_load(stream)"
-        shell: bash
-
-  signature-test:
-    name: Test signatures
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install requirements
-        shell: sh
-        run: |
-          sudo apt-get update && sudo apt-get install -y curl bash git gnupg
-
-      - uses: actions/checkout@v3
-
-      - name: Test signatures
-        run: .github/workflows/test-sigs.sh

.github/workflows/common.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-if [ "${RUNNER_OS}" = "Windows" ] ; then
-	ext=".exe"
-else
-	ext=''
-fi
-
-echo_color() {
-  local color="$1"
-  local msg="$2"
-  echo -e "\033[${color}m${msg}\033[0m"
-}
-
-error() { echo_color "${RED}" "$1"; }
-warn() { echo_color "${LT_BROWN}" "$1"; }
-info() { echo_color "${LT_BLUE}" "$1"; }
-
-fail() { error "error: $1"; exit 1; }
-
-mktempdir() {
-	case "$(uname -s)" in
-		"Darwin"|"darwin")
-			mktemp -d -t hls_ci.XXXXXXX
-			;;
-		*)
-			mktemp -d
-			;;
-	esac
-}

.github/workflows/install-bindist.sh

@@ -1,114 +1,26 @@
 #!/usr/bin/env bash
-set -x
 set -eo pipefail
 
-. .github/workflows/common.sh
-
 export GHCUP_INSTALL_BASE_PREFIX=$RUNNER_TEMP/foobarbaz
 
 curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
 
-source "$GHCUP_INSTALL_BASE_PREFIX"/.ghcup/env || source "$HOME/.bashrc"
+source $GHCUP_INSTALL_BASE_PREFIX/.ghcup/env || source ~/.bashrc
 
 ghcup --version
 which ghcup | grep foobarbaz
 
-ghcup_fun() {
-	ghcup -v --url-source="file:$METADATA_FILE" "$@"
-}
+ghcup -v --url-source=file:$METADATA_FILE install $TOOL --set $VERSION
 
 case $TOOL in
-	ghcup)
-		ghcup_fun upgrade --force
-		;;
-	*) ghcup_fun install "$TOOL" --set "$VERSION"
-		;;
-esac
-
-mkdir -p /tmp/install-bindist-ci
-cp "$METADATA_FILE" /tmp/install-bindist-ci/
-cd /tmp/install-bindist-ci
-
-cat <<EOF > main.hs
-{- cabal:
-build-depends: base
--}
-
-main = print $ 1 + 1
-EOF
-
-case $TOOL in
-	ghcup)
-		ghcup_fun list
-		;;
 	hls)
-		ghcup_fun install cabal latest
-		ghcup_fun install ghc --set recommended
-		cabal update
-
-		test_package="bytestring-0.11.1.0"
-		test_module="Data/ByteString.hs"
-
-		create_cradle() {
-			echo "cradle:" > hie.yaml
-			echo "  cabal:" >> hie.yaml
-		}
-
-		enter_test_package() {
-			local tmp_dir
-			tmp_dir=$(mktempdir)
-			cd "$tmp_dir"
-			cabal unpack "${test_package}"
-			cd "${test_package}"
-			cp "/tmp/install-bindist-ci/${METADATA_FILE}" .
-		}
-
-		# For all HLS GHC versions and the wrapper, run 'typecheck'
-		# over the $test_module
-		test_all_hls() {
-			local bin
-			local bin_noexe
-			local bindir
-			local hls
-			bindir=$1
-
-			for hls in "${bindir}/"haskell-language-server-* ; do
-				bin=${hls##*/}
-				bin_noexe=${bin/.exe/}
-				if ! [[ "${bin_noexe}" =~ "haskell-language-server-wrapper" ]] && ! [[ "${bin_noexe}" =~ "~" ]] && ! [[ "${bin_noexe}" =~ ".shim" ]] ; then
-					if ghcup_fun install ghc --set "${bin_noexe/haskell-language-server-/}" ; then
-						"${hls}" typecheck "${test_module}" || fail "failed to typecheck with HLS for GHC ${bin_noexe/haskell-language-server-/}"
-					else
-						fail "GHCup failed to install GHC ${bin_noexe/haskell-language-server-/}"
-					fi
-					ghcup_fun rm ghc "${bin_noexe/haskell-language-server-/}"
-				fi
-			done
-			"$bindir/haskell-language-server-wrapper${ext}" typecheck "${test_module}" || fail "failed to typecheck with HLS wrapper"
-		}
-
-        enter_test_package
-        create_cradle
-		case "$(uname -s)" in
-			MSYS_*|MINGW*)
-				test_all_hls "$(dirname "$(which ghcup)")"
-				;;
-			*)
-				test_all_hls "$(ghcup whereis bindir)"
-			   ;;
-	    esac
+		haskell-language-server-wrapper --version
 		;;
     ghc)
 		ghc --version
-		ghc --info
-		ghc -prof main.hs
-		[[ $(./main +RTS -s) -eq 2 ]]
-		;;
-    cabal)
-		ghcup_fun install ghc --set "$(ghcup_fun list -t ghc -r -c available | tail -1 | awk '{ print $2 }')"
-		cabal --version
-		cabal update
-		[[ $(cabal --verbose=0 run --enable-profiling ./main.hs -- +RTS -s) -eq 2 ]]
+		echo 'main = print $ 1 + 1' > main.hs
+		ghc main.hs
+		[[ $(./main) -eq 2 ]]
 		;;
     *)
 		$TOOL --version

.github/workflows/sigs

@@ -1,6 +0,0 @@
-keys=(
-    7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C # Julian Ospald <maerwald@hasufell.de>
-    FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD # Ben Gamari <ben@well-typed.com>
-    88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 # Zubin Duggal <zubin@well-typed.com>
-    EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF # Hécate <hecate@glitchbra.in>
-)

.github/workflows/test-sigs.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -eo pipefail
-
-. .github/workflows/common.sh
-
-get_key() {
-	local key=$1
-	local server=$2
-	gpg --batch --keyserver "${server}" --recv-keys "${key}"
-	echo -e "${key}:6:" | gpg --import-ownertrust
-}
-
-# verify signature
-. .github/workflows/sigs
-
-for key in "${keys[@]}" ; do
-	get_key "${key}" keys.openpgp.org || get_key "${key}" keyserver.ubuntu.com
-done
-unset key
-gpg --verify "${METADATA_FILE}.sig"
-

.github/workflows/test.yaml

@@ -11,7 +11,7 @@ jobs:
     name: Test metadata
     runs-on: ${{ matrix.os }}
     env:
-      YAML_VER: 0.0.7
+      YAML_VER: 0.0.6
     strategy:
       matrix:
         ghc:
@@ -19,7 +19,7 @@ jobs:
         cabal:
           - '3.6.2.0'
         os:
-          - ubuntu-22.04
+          - ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -51,30 +51,18 @@ jobs:
         run: echo "$HOME/.local/bin" >> $GITHUB_PATH
         shell: bash
 
-      - name: install yamllint
-        run: pip install yamllint
-
       - name: Update cabal cache
         run: cabal update
         shell: bash
 
-      - name: Install some deps
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          export TZ=Asia/Singapore
-          sudo apt install -y libarchive-dev
-        shell: bash
-
       - name: Install ghcup-gen
         run: |
           cabal install --installdir="$HOME/.local/bin" --overwrite-policy=always --install-method=copy ghcup-gen
         shell: bash
 
-      - name: Check yaml
+      - name: Check
         run: |
           ghcup-gen -- check -f ghcup-${{ env.YAML_VER }}.yaml
-          yamllint ghcup-${{ env.YAML_VER }}.yaml
-          python3 -c "import yaml ; stream = open('ghcup-${{ env.YAML_VER }}.yaml', 'r') ; yaml.safe_load(stream)"
         shell: bash
 
       - name: Check tarballs

.yamllint

@@ -1,5 +0,0 @@
-extends: default
-
-rules:
-  line-length: disable
-  indentation: disable

README.md

@@ -1,26 +1,6 @@
 # GHCup metadata
 
-## For end users
-
-### Metadata variants (distribution channels)
-
-* `ghcup-A.B.C.yaml`: this is the main metadata and what ghcup uses by default
-* `ghcup-vanilla-A.B.C.yaml`: this is similar to `ghcup-A.B.C.yaml`, but only uses upstream bindists (no patches/fixes are applied, no missing platforms added)
-* `ghcup-prereleases-A.B.C.yaml`: this contains pre-releases of all tools
-* `ghcup-cross-A.B.C.yaml`: this contains (usually experimental) cross compilers
-
-### Using the metadata
-
-If you want access to both pre-releases and cross compilers, run:
-
-```
-ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml
-ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-cross-0.0.8.yaml
-```
-
-## For contributors
-
-### Adding a new GHC version
+## Adding a new GHC version
 
 1. open the latest `ghcup-<yaml-ver>.yaml`
 2. find the latest ghc version (in yaml tree e.g. `ghcupDownloads -> GHC -> 8.10.7`)
@@ -31,24 +11,3 @@ ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup
 7. run `cabal run ghcup-gen -- check-tarballs    -f ghcup-<yaml-ver>.yaml -u 'ghc-8\.10\.8'`
 8. run `cabal run ghcup-gen -- generate-hls-ghcs -f ghcup-<yaml-ver>.yaml --format json -o hls-metadata-0.0.1.json`
 9. run `cabal run ghcup-gen -- generate-table    -f ghcup-<yaml-ver>.yaml --stdout` and adjust [docs/install](https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/docs/install.md) tables
-
-### During a pull request
-
-* make sure to always add new versions to both `ghcup-A.B.C.yaml` and `ghcup-vanilla-A.B.C.yaml`
-* make sure to run the bindist action to check tool installation on all platforms: https://github.com/haskell/ghcup-metadata/actions/workflows/bindists.yaml
-  - this is a manual pipeline
-  - set the appropriate parameters
-* make sure to sign the yaml files you edited, e.g.: `gpg --detach-sign -u <your-email> ghcup-0.0.7.yaml` or ask a GHCup developer to sign
-  - PGP pubkeys need to be cross-signed by the GHCup team
-  - they need to be added to the CI: https://github.com/haskell/ghcup-metadata/blob/develop/.github/workflows/sigs
-  - and need to be documented on the homepage
-    * https://github.com/haskell/ghcup-hs/blob/master/docs/guide.md#gpg-verification
-	* https://github.com/haskell/ghcup-hs/blob/master/docs/install.md#unix
-
-### Understanding tags
-
-Tags are documented [here](https://github.com/haskell/ghcup-hs/blob/master/lib/GHCup/Types.hs). Search for `data Tag`.
-Some tags are unique. Uniqueness is checked by `cabal run ghcup-gen -- check -f ghcup-<yaml-ver>.yaml`.
-
-If you want to check prereleases, do: `cabal run ghcup-gen -- check -f ghcup-prereleases-<yaml-ver>.yaml --channel=prerelease`
-

cabal.project

@@ -2,18 +2,19 @@ packages: ./ghcup-gen/ghcup-gen.cabal
 
 package ghcup
     tests: False
-    flags: +tui +no-exe
+    flags: -tui +no-exe
 
 source-repository-package
   type: git
-  location: https://github.com/haskell/ghcup-hs.git
-  tag: e27fed09f3eb4b0b72ce7825c65f16a4202a2399
+  location: https://gitlab.haskell.org/haskell/ghcup-hs.git
+  tag: v0.1.17.8
 
 constraints: http-io-streams -brotli,
+             any.Cabal ==3.6.2.0,
              any.aeson >= 2.0.1.0
 
 package libarchive
-  flags: +system-libarchive
+  flags: -system-libarchive
 
 package aeson-pretty
   flags: +lib-only
@@ -24,5 +25,5 @@ package cabal-plan
 package aeson
   flags: +ordered-keymap
 
-package streamly
-  flags: +use-unliftio
+allow-newer: base, ghc-prim, template-haskell, language-c
+

ghcup-0.0.1.json

@@ -2132,39 +2132,43 @@
       }
     },
     "GHCup": {
-      "0.1.19.0": {
+      "0.1.17.5": {
         "viTags": [
           "Recommended",
           "Latest"
         ],
-        "viChangeLog": "https://github.com/haskell/ghcup-hs/blob/master/CHANGELOG.md",
+        "viChangeLog": "https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md",
         "viSourceDL": null,
         "viArch": {
           "A_64": {
             "Linux_UnknownLinux": {
               "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0",
-                "dlHash": "33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5",
+                "dlSubdir": null,
+                "dlHash": "7541bcf0b402f99d05cd1937f9fef69aec45c3153e42606671825be248484fb5"
               }
             },
             "Darwin": {
               "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0",
-                "dlHash": "416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-apple-darwin-ghcup-0.1.17.5",
+                "dlSubdir": null,
+                "dlHash": "8b5159775de08a5f268f4be217fbb6f427ff8d8977197af209211b81ca0fe27f"
               }
             },
             "FreeBSD": {
               "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0",
-                "dlHash": "dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-freebsd12-ghcup-0.1.17.5",
+                "dlSubdir": null,
+                "dlHash": "babb7366abb17bcb5d4fc1500039040f1b957073d618db3f1473b0bae6abc6bb"
               }
             }
           },
           "A_32": {
             "Linux_UnknownLinux": {
               "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0",
-                "dlHash": "0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.17.5/i386-linux-ghcup-0.1.17.5",
+                "dlSubdir": null,
+                "dlHash": "5a2b1d2ceb32857866689ee1a1e29c5747333882a4e952d80eccf49482d3daab"
               }
             }
           }

ghcup-0.0.2.json

@@ -2674,51 +2674,51 @@
       }
     },
     "GHCup": {
-      "0.1.19.0": {
+      "0.1.16.2": {
         "viTags": [
           "Recommended",
           "Latest"
         ],
-        "viChangeLog": "https://github.com/haskell/ghcup-hs/blob/master/CHANGELOG.md",
+        "viChangeLog": "https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md",
         "viSourceDL": null,
         "viArch": {
           "A_64": {
             "Linux_UnknownLinux": {
               "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0",
-                "dlHash": "33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2",
+                "dlHash": "d5e43b95ce1d42263376e414f7eb7c5dd440271c7c6cd9bad446fdeff3823893"
               }
             },
             "Darwin": {
               "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0",
-                "dlHash": "416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-apple-darwin-ghcup-0.1.16.2",
+                "dlHash": "a334620ccce7705211b2142882dde544003e6030af4b91a44c890542a90f879f"
               }
             },
             "FreeBSD": {
               "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0",
-                "dlHash": "dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-portbld-freebsd-ghcup-0.1.16.2",
+                "dlHash": "92359592a5694375e53b22628920086bf4bbf0faff5be018a0ed3e745a6426a9"
               }
             },
             "Linux_Alpine": {
               "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0",
-                "dlHash": "33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2",
+                "dlHash": "d5e43b95ce1d42263376e414f7eb7c5dd440271c7c6cd9bad446fdeff3823893"
               }
             }
           },
           "A_32": {
             "Linux_UnknownLinux": {
               "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0",
-                "dlHash": "0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.2/i386-linux-ghcup-0.1.16.2",
+                "dlHash": "01968ca6decac7b6e8ba6e2c817870d3fa47289a6507e0c1ab563f7b6eec0e38"
               }
             },
             "Linux_Alpine": {
               "unknown_versioning": {
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0",
-                "dlHash": "0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53"
+                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.16.2/i386-linux-ghcup-0.1.16.2",
+                "dlHash": "01968ca6decac7b6e8ba6e2c817870d3fa47289a6507e0c1ab563f7b6eec0e38"
               }
             }
           }

ghcup-0.0.2.yaml

@@ -1384,32 +1384,32 @@ ghcupDownloads:
               dlUri: https://oleg.fi/cabal-install-3.4.0.0-rc4/cabal-install-3.4.0.0-x86_64-freebsd-12.1-release.tar.xz
               dlHash: 9705e16d03497b46be4ad477e6c64d10890af853eafa8a9adf6dba89aa9e05f7
   GHCup:
-    0.1.19.0:
+    0.1.17.5:
       viTags:
       - Recommended
       - Latest
-      viChangeLog: https://github.com/haskell/ghcup-hs/blob/master/CHANGELOG.md
+      viChangeLog: https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md
       viSourceDL:
       viArch:
         A_64:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0
-              dlHash: 33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5
+              dlHash: 7541bcf0b402f99d05cd1937f9fef69aec45c3153e42606671825be248484fb5
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0
-              dlHash: 416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-apple-darwin-ghcup-0.1.17.5
+              dlHash: 8b5159775de08a5f268f4be217fbb6f427ff8d8977197af209211b81ca0fe27f
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0
-              dlHash: dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-freebsd12-ghcup-0.1.17.5
+              dlHash: babb7366abb17bcb5d4fc1500039040f1b957073d618db3f1473b0bae6abc6bb
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0
-              dlHash: 0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/i386-linux-ghcup-0.1.17.5
+              dlHash: 5a2b1d2ceb32857866689ee1a1e29c5747333882a4e952d80eccf49482d3daab
           Linux_Alpine:
             unknown_versioning: *ghcup-32

ghcup-0.0.3.yaml

@@ -1451,33 +1451,33 @@ ghcupDownloads:
               dlUri: https://oleg.fi/cabal-install-3.4.0.0-rc4/cabal-install-3.4.0.0-x86_64-freebsd-12.1-release.tar.xz
               dlHash: 9705e16d03497b46be4ad477e6c64d10890af853eafa8a9adf6dba89aa9e05f7
   GHCup:
-    0.1.19.0:
+    0.1.17.5:
       viTags:
       - Recommended
       - Latest
-      viChangeLog: https://github.com/haskell/ghcup-hs/blob/master/CHANGELOG.md
+      viChangeLog: https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md
       viSourceDL:
       viArch:
         A_64:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0
-              dlHash: 33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5
+              dlHash: 7541bcf0b402f99d05cd1937f9fef69aec45c3153e42606671825be248484fb5
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0
-              dlHash: 416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-apple-darwin-ghcup-0.1.17.5
+              dlHash: 8b5159775de08a5f268f4be217fbb6f427ff8d8977197af209211b81ca0fe27f
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0
-              dlHash: dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-freebsd12-ghcup-0.1.17.5
+              dlHash: babb7366abb17bcb5d4fc1500039040f1b957073d618db3f1473b0bae6abc6bb
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0
-              dlHash: 0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/i386-linux-ghcup-0.1.17.5
+              dlHash: 5a2b1d2ceb32857866689ee1a1e29c5747333882a4e952d80eccf49482d3daab
           Linux_Alpine:
             unknown_versioning: *ghcup-32
   HLS:

ghcup-0.0.4.yaml

@@ -1868,49 +1868,49 @@ 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.19.0:
+    0.1.17.7:
       viTags:
       - Recommended
       - Latest
-      viChangeLog: https://github.com/haskell/ghcup-hs/blob/master/CHANGELOG.md
+      viChangeLog: https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md
       viSourceDL:
       viArch:
         A_64:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0
-              dlHash: 33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7
+              dlHash: e16eaf59dab84be7aa6415b53a3497f211d05163a50584dc854569b2ef8a7a3a
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0
-              dlHash: 416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-apple-darwin-ghcup-0.1.17.7
+              dlHash: 9702f30c9374a122d79f7ef11170b34deb248a0f3cd92d671c0aab747be4add7
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0
-              dlHash: dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-freebsd12-ghcup-0.1.17.7
+              dlHash: d3d0644dc5d9b51ed1c345fc006e936e9284b3181e5a9cccf4cf70a7184398fe
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0
-              dlHash: 0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/i386-linux-ghcup-0.1.17.7
+              dlHash: 209f61872a5b401e85e4d542dd8d0c96437c1f1ad94b4fa5a28856f34ab0cab8
           Linux_Alpine:
             unknown_versioning: *ghcup-32
         A_ARM64:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/aarch64-linux-ghcup-0.1.19.0
-              dlHash: a546dcd23a7e56f31bc4d6afad0276f88d3f0b850a3d3c36369721797dc3c3d5
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/aarch64-linux-ghcup-0.1.17.7
+              dlHash: 392dc46ef3f98733b154188982866859d174a750e32c5b742e6a1cf60159954e
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/aarch64-apple-darwin-ghcup-0.1.19.0
-              dlHash: 69bd8e37cd07606d928dca9215c066564a264e0def3c81171b76d5747dc6507c
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/aarch64-apple-darwin-ghcup-0.1.17.7
+              dlHash: 102d808b31248f86cbf569162ba1b7955e6747a684b2b4200b0958d6e4c54267
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/armv7-linux-ghcup-0.1.19.0
-              dlHash: 58a170c1fb0b4e701ebb40f90a23f6ababe9e61291726aad82e18d4649aed908
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/armv7-linux-ghcup-0.1.17.7
+              dlHash: 8438e22241fab4bfde94066a34600ab003db2f4ecadfd54bfad4ae990e6549a1
   HLS:
     1.1.0:
       viTags:

ghcup-0.0.5.yaml

@@ -2025,53 +2025,53 @@ 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.19.0:
+    0.1.18.0:
       viTags:
       - Recommended
       - Latest
-      viChangeLog: https://github.com/haskell/ghcup-hs/blob/master/CHANGELOG.md
+      viChangeLog: https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md
       viSourceDL:
       viArch:
         A_64:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0
-              dlHash: 33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0
+              dlHash: 94559eb7c4569919446af1597d07675e803c20b150323edb7f9d8601c8bbda50
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0
-              dlHash: 416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-apple-darwin-ghcup-0.1.18.0
+              dlHash: b34ed98bc0cc6d2169974f8d03173f93c3e3f60607013f1af42c9882c1a0d6f0
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0
-              dlHash: dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-freebsd12-ghcup-0.1.18.0
+              dlHash: cc8378a53f3028331dc853acfb253e2258d720b0e18b618b294ed67182a7fa03
           Windows:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-mingw64-ghcup-0.1.19.0.exe
-              dlHash: c4e4a764b0844e351eb6939ff236452f33c34808aaca69f973ea82e18d3aa1ac
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-mingw64-ghcup-0.1.18.0.exe
+              dlHash: e2166a50437c677dfab3362749f676f92ff786aae1bfd7a2d289efa3544ee654
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0
-              dlHash: 0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/i386-linux-ghcup-0.1.18.0
+              dlHash: 222914720135261dcc644155bc8a5b15d1d4966c769d50686fe4f41547208759
           Linux_Alpine:
             unknown_versioning: *ghcup-32
         A_ARM64:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/aarch64-linux-ghcup-0.1.19.0
-              dlHash: a546dcd23a7e56f31bc4d6afad0276f88d3f0b850a3d3c36369721797dc3c3d5
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/aarch64-linux-ghcup-0.1.18.0
+              dlHash: 3e3ee4aa06e426373fb7e29f1770987ca1621e414925f261f325f9acb77e0bcb
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/aarch64-apple-darwin-ghcup-0.1.19.0
-              dlHash: 69bd8e37cd07606d928dca9215c066564a264e0def3c81171b76d5747dc6507c
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/aarch64-apple-darwin-ghcup-0.1.18.0
+              dlHash: 2d3aa19d6f012c1a4ebc5907a05b06cf0d43a1499107020f59847ea2638c8649
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/armv7-linux-ghcup-0.1.19.0
-              dlHash: 58a170c1fb0b4e701ebb40f90a23f6ababe9e61291726aad82e18d4649aed908
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/armv7-linux-ghcup-0.1.18.0
+              dlHash: 2e94920c772bc24c9fe41004dedf46840f5f036d28d3ed183679d3f34d2c50e0
   HLS:
     1.1.0:
       viTags: []

ghcup-0.0.6.yaml

@@ -2569,53 +2569,56 @@ ghcupDownloads:
               dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.2.0/cabal-install-3.6.2.0-armv7-linux-deb10.tar.xz
               dlHash: 694ba7c14f8d720c6e790ab0488dbff2d8a07d9c6de97b4deeba31088f825bc2
   GHCup:
-    0.1.19.0:
+    0.1.18.0:
       viTags:
       - Recommended
       - Latest
-      viChangeLog: https://github.com/haskell/ghcup-hs/blob/master/CHANGELOG.md
+      viChangeLog: https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md
       viSourceDL:
       viArch:
         A_64:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0
-              dlHash: 33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0
+              dlHash: 94559eb7c4569919446af1597d07675e803c20b150323edb7f9d8601c8bbda50
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0
-              dlHash: 416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-apple-darwin-ghcup-0.1.18.0
+              dlHash: b34ed98bc0cc6d2169974f8d03173f93c3e3f60607013f1af42c9882c1a0d6f0
           FreeBSD:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0
-              dlHash: dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62
+            '( >= 12 && < 13 )':
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-freebsd12-ghcup-0.1.18.0
+              dlHash: cc8378a53f3028331dc853acfb253e2258d720b0e18b618b294ed67182a7fa03
+            '( >= 13 )':
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-freebsd13-ghcup-0.1.18.0
+              dlHash: cc8378a53f3028331dc853acfb253e2258d720b0e18b618b294ed67182a7fa03
           Windows:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-mingw64-ghcup-0.1.19.0.exe
-              dlHash: c4e4a764b0844e351eb6939ff236452f33c34808aaca69f973ea82e18d3aa1ac
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-mingw64-ghcup-0.1.18.0.exe
+              dlHash: e2166a50437c677dfab3362749f676f92ff786aae1bfd7a2d289efa3544ee654
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0
-              dlHash: 0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/i386-linux-ghcup-0.1.18.0
+              dlHash: 222914720135261dcc644155bc8a5b15d1d4966c769d50686fe4f41547208759
           Linux_Alpine:
             unknown_versioning: *ghcup-32
         A_ARM64:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/aarch64-linux-ghcup-0.1.19.0
-              dlHash: a546dcd23a7e56f31bc4d6afad0276f88d3f0b850a3d3c36369721797dc3c3d5
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/aarch64-linux-ghcup-0.1.18.0
+              dlHash: 3e3ee4aa06e426373fb7e29f1770987ca1621e414925f261f325f9acb77e0bcb
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/aarch64-apple-darwin-ghcup-0.1.19.0
-              dlHash: 69bd8e37cd07606d928dca9215c066564a264e0def3c81171b76d5747dc6507c
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/aarch64-apple-darwin-ghcup-0.1.18.0
+              dlHash: 2d3aa19d6f012c1a4ebc5907a05b06cf0d43a1499107020f59847ea2638c8649
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/armv7-linux-ghcup-0.1.19.0
-              dlHash: 58a170c1fb0b4e701ebb40f90a23f6ababe9e61291726aad82e18d4649aed908
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/armv7-linux-ghcup-0.1.18.0
+              dlHash: 2e94920c772bc24c9fe41004dedf46840f5f036d28d3ed183679d3f34d2c50e0
   HLS:
     1.1.0:
       viTags:

ghcup-cross-0.0.8.yaml

@@ -1,42 +0,0 @@
----
-globalTools:
-  ShimGen:
-    dlUri: https://downloads.haskell.org/~ghcup/shimgen/shim-2.exe
-    dlHash: 7c55e201f71860c5babea886007c8fa44b861abf50d1c07e5677eb0bda387a70
-toolRequirements: {}
-ghcupDownloads:
-  GHC:
-    javascript-unknown-ghcjs-9.6.2:
-      viTags:
-      - base-4.18.0.0
-      viArch:
-        A_64:
-          Linux_UnknownLinux:
-            unknown_versioning:
-              dlHash: 4e12b602869206830eef1aa6a17a5a00fa887d6c98c3a552269c418ee7f736f8
-              dlSubdir: ghc-9.6.2-javascript-unknown-ghcjs
-              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/javascript-unknown-ghcjs-9.6.2/ghc-javascript-unknown-ghcjs-9.6.2-x86_64-linux-unknown.tar.xz
-          Darwin:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/javascript-unknown-ghcjs-9.6.2/ghc-javascript-unknown-ghcjs-9.6.2-x86_64-apple-darwin.tar.xz
-              dlHash: dddb0ee68857a79e67a52c4ab9b7230023a8684a5e826e9afbb9c5820abf47e1
-              dlSubdir: ghc-9.6.2-javascript-unknown-ghcjs
-        A_ARM64:
-          Darwin:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/javascript-unknown-ghcjs-9.6.2/ghc-javascript-unknown-ghcjs-9.6.2-aarch64-apple-darwin.tar.xz
-              dlHash: 0d65bb3940a820d95b4b33ea0cd61bf39670d48c4d8f747153ded01a7ef34821
-              dlSubdir: ghc-9.6.2-javascript-unknown-ghcjs
-    wasm32-wasi-9.6.2.20230523:
-      viTags:
-      - base-4.18.0.0
-      viArch:
-        A_64:
-          Linux_UnknownLinux:
-            unknown_versioning: &ghc-wasm32-wasi-64-static
-              dlHash: 85433ce296f2f95a5c60f78060cb4a3a8bf8b56bf83ddd75f1b23cb2e2378888
-              dlSubdir: ghc-9.6.2.20230523-wasm32-wasi
-              dlUri: https://gitlab.haskell.org/api/v4/projects/3223/jobs/1530829/artifacts/ghc-x86_64-linux-alpine3_12-cross_wasm32-wasi-release%2Bfully_static.tar.xz
-              dlOutput: ghc-9.6.2.20230523-x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static.tar.xz
-          Linux_Alpine:
-            unknown_versioning: *ghc-wasm32-wasi-64-static

ghcup-gen/Generate.hs

@@ -6,13 +6,11 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE ViewPatterns     #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE LambdaCase #-}
 
 module Generate where
 
 import           GHCup
 import           GHCup.Download
-import           GHCup.Requirements
 import           GHCup.Errors
 import           GHCup.Types
 import           GHCup.Types.Optics
@@ -41,7 +39,7 @@ import           System.Exit
 import           System.FilePath
 import           System.IO
 import           Text.Regex.Posix
-import           GHCup.Prelude.String.QQ
+import           GHCup.Utils.String.QQ
 
 import qualified Data.ByteString.Lazy          as BSL
 import qualified Data.Map.Strict               as M
@@ -49,12 +47,6 @@ import qualified Data.Text                     as T
 import qualified Data.Yaml.Pretty              as YAML
 import qualified Text.Megaparsec               as MP
 
-import           Data.Bifoldable                (bifoldMap)
-import           Data.Foldable                  (traverse_)
-import           Data.Text                      (Text)
-
-import           Text.PrettyPrint.HughesPJClass (pPrint)
-
 data Format = FormatJSON
             | FormatYAML
 
@@ -91,7 +83,6 @@ generateHLSGhc format output = do
                       , DownloadFailed
                       , UnknownArchive
                       , ArchiveResult
-                      , ContentLengthError
                       ] $ do
                fp <- liftE $ downloadCached dli Nothing
                let subd = _dlSubdir dli
@@ -153,18 +144,17 @@ generateTable output = do
   handle <- case output of
               StdOut -> pure stdout
               FileOutput fp -> liftIO $ openFile fp WriteMode
-
+              
   forM_ [GHC,Cabal,HLS,Stack] $ \tool -> do
     case tool of
       GHC -> liftIO $ hPutStrLn handle $ "<details> <summary>Show all supported <a href='https://www.haskell.org/ghc/'>GHC</a> versions</summary>"
       Cabal -> liftIO $ hPutStrLn handle $ "<details> <summary>Show all supported <a href='https://cabal.readthedocs.io/en/stable/'>cabal-install</a> versions</summary>"
       HLS -> liftIO $ hPutStrLn handle $ "<details> <summary>Show all supported <a href='https://haskell-language-server.readthedocs.io/en/stable/'>HLS</a> versions</summary>"
       Stack -> liftIO $ hPutStrLn handle $ "<details> <summary>Show all supported <a href='https://docs.haskellstack.org/en/stable/README/'>Stack</a> versions</summary>"
-      _ -> fail "no"
     liftIO $ hPutStrLn handle $ "<table>"
     liftIO $ hPutStrLn handle $ "<thead><tr><th>" <> show tool <> " Version</th><th>Tags</th></tr></thead>"
     liftIO $ hPutStrLn handle $ "<tbody>"
-    vers <- reverse <$> listVersions (Just tool) [] False False (Nothing, Nothing)
+    vers <- reverse <$> listVersions (Just tool) Nothing
     forM_ (filter (\ListResult{..} -> not lStray) vers) $ \ListResult{..} -> do
       liftIO $ hPutStrLn handle $
           "<tr><td>"
@@ -185,103 +175,3 @@ generateTable output = do
   printTag (Base       pvp'') = "base-" ++ T.unpack (prettyPVP pvp'')
   printTag (UnknownTag t    ) = t
   printTag Old                = ""
-
-
-generateSystemInfo :: ( MonadFail m
-                      , MonadMask m
-                      , Monad m
-                      , MonadReader env m
-                      , HasSettings env
-                      , HasDirs env
-                      , HasLog env
-                      , MonadThrow m
-                      , MonadIO m
-                      , HasPlatformReq env
-                      , HasGHCupInfo env
-                      , MonadUnliftIO m
-                      )
-                   => Output
-                   -> m ExitCode
-generateSystemInfo output = do
-  handle <- case output of
-              StdOut -> pure stdout
-              FileOutput fp -> liftIO $ openFile fp WriteMode
-
-  forM_ [ Linux Debian
-        , Linux Ubuntu
-        , Linux Fedora
-        , Linux CentOS
-        , Linux Alpine
-        , Linux UnknownLinux
-        , Darwin
-        , FreeBSD
-        , Windows
-        ] $ \plat -> do
-            GHCupInfo { .. } <- getGHCupInfo
-            (Just req) <- pure $ getCommonRequirements (PlatformResult plat Nothing) _toolRequirements
-            liftIO $ hPutStrLn handle $ "### " <> (prettyPlat plat) <> "\n"
-            liftIO $ hPutStrLn handle $ (T.unpack $ pretty' req) <> "\n"
-  pure ExitSuccess
- where
-  pretty' Requirements {..} =
-    let d = if not . null $ _distroPKGs
-          then "The following distro packages are required: " <> "`" <> T.intercalate " " _distroPKGs <> "`"
-          else ""
-        n = if not . T.null $ _notes then _notes else ""
-    in  if | T.null d -> n
-           | T.null n -> d
-           | otherwise -> d <> "\n" <> n
-
-  prettyPlat (Linux UnknownLinux) = "Linux (generic)"
-  prettyPlat p = show p
-
-
-generateSystemInfoWithDistroVersion :: ( MonadFail m
-                      , MonadMask m
-                      , Monad m
-                      , MonadReader env m
-                      , HasSettings env
-                      , HasDirs env
-                      , HasLog env
-                      , MonadThrow m
-                      , MonadIO m
-                      , HasPlatformReq env
-                      , HasGHCupInfo env
-                      , MonadUnliftIO m
-                      )
-                   => Output
-                   -> m ExitCode
-generateSystemInfoWithDistroVersion output = do
-  handle <- case output of
-              StdOut -> pure stdout
-              FileOutput fp -> liftIO $ openFile fp WriteMode
-
-  GHCupInfo { _toolRequirements = tr } <- getGHCupInfo
-  let ghcInfo = M.lookup Nothing <$> M.lookup GHC tr
-  liftIO $ traverse_ (\(key, value)  -> do
-                        liftIO $ hPutStrLn handle $ "### " <> prettyPlat key <> "\n"
-                        liftIO $ hPutStrLn handle $ T.unpack $ versionsAndRequirements value <> T.pack "\n")
-                      $ M.toList $ fromJust (fromJust ghcInfo)
-  pure ExitSuccess
-
-  where
-    pretty' Requirements {..} =
-      let d = if not . null $ _distroPKGs
-            then "The following distro packages are required: " <> "`" <> T.intercalate " " _distroPKGs <> "`" <> "\n"
-            else ""
-          n = if not . T.null $ _notes then _notes else ""
-      in  if | T.null d -> n
-             | T.null n -> d
-             | otherwise -> d <> "\n" <> n
-
-    versionsAndRequirements :: PlatformReqVersionSpec -> Text
-    versionsAndRequirements =
-      bifoldMap
-        ( \case
-            Nothing -> T.pack $ "#### Generic" <> "\n"
-            Just verz -> T.pack "#### Version " <> T.pack (show $ pPrint verz) <> "\n"
-        )
-        pretty'
-
-    prettyPlat (Linux UnknownLinux) = "Linux (generic)"
-    prettyPlat p = show p

ghcup-gen/Main.hs

@@ -11,7 +11,7 @@ import           GHCup.Types
 import           GHCup.Errors
 import           GHCup.Platform
 import           GHCup.Utils.Dirs
-import           GHCup.Prelude.Logger
+import           GHCup.Utils.Logger
 import           GHCup.Types.JSON               ( )
 
 import           Control.Exception              ( displayException )
@@ -65,7 +65,6 @@ data Command = ValidateYAML ValidateYAMLOpts
              | ValidateTarballs ValidateYAMLOpts TarballFilter
              | GenerateHlsGhc ValidateYAMLOpts Format Output
              | GenerateToolTable ValidateYAMLOpts Output
-             | GenerateSystemDepsInfo ValidateYAMLOpts Output
 
 
 fileOutput :: Parser Output
@@ -105,30 +104,11 @@ inputP :: Parser Input
 inputP = fileInput <|> stdInput
 
 data ValidateYAMLOpts = ValidateYAMLOpts
-  { vChannel :: DistributionChannel
-  , vInput   :: Maybe Input
+  { vInput :: Maybe Input
   }
 
 validateYAMLOpts :: Parser ValidateYAMLOpts
-validateYAMLOpts = ValidateYAMLOpts <$> channelParser <*> optional inputP
-
-channelParser :: Parser DistributionChannel
-channelParser =
-    option
-    (eitherReader chanP)
-          (long "channel" <> metavar "CHANNEL" <> help
-            "Signal which distribution channel the YAML denotes: (main | prerelease | nightly). Main is defaul."
-            <> value MainChan
-          )
- where
-  chanP :: String -> Either String DistributionChannel
-  chanP s' | t == T.pack "main"        = Right MainChan
-           | t == T.pack "prerelease"  = Right PrereleaseChan
-           | t == T.pack "prereleases" = Right PrereleaseChan
-           | t == T.pack "nightly"     = Right NightlyChan
-           | t == T.pack "nightlies"   = Right NightlyChan
-           | otherwise                 = Left ("Unknown channel value: " <> s')
-    where t = T.toLower (T.pack s')
+validateYAMLOpts = ValidateYAMLOpts <$> optional inputP
 
 tarballFilterP :: Parser TarballFilter
 tarballFilterP = option readm $
@@ -172,17 +152,11 @@ com = subparser
          (progDesc "Generate a list of HLS-GHC support")
        )
   <> command
-       "generate-tool-table"
+       "generate-table"
        (info
          ((GenerateToolTable <$> validateYAMLOpts <*> outputP) <**> helper)
          (progDesc "Generate a markdown table of available tool versions")
        )
-  <> command
-       "generate-system-deps-info"
-       (info
-         ((GenerateSystemDepsInfo <$> validateYAMLOpts <*> outputP) <**> helper)
-         (progDesc "Generate a markdown info for system dependencies")
-       )
   )
 
 
@@ -196,7 +170,7 @@ main = do
                                   , fancyColors   = not no_color
                                   }
   dirs <- liftIO getAllDirs
-  let leanAppstate = LeanAppState (Settings True 0 Lax False Never Curl True GHCupURL False GPGNone True Nothing (DM mempty)) dirs defaultKeyBindings loggerConfig
+  let leanAppstate = LeanAppState (Settings True 0 False Never Curl True GHCupURL False GPGNone True) dirs defaultKeyBindings loggerConfig
 
   pfreq <- (
     flip runReaderT leanAppstate . runE @'[NoCompatiblePlatform, NoCompatibleArch, DistroNotFound] $ platformRequest
@@ -206,7 +180,7 @@ main = do
               flip runReaderT leanAppstate $ logError $ T.pack $ prettyShow e
               liftIO $ exitWith (ExitFailure 2)
 
-  let appstate = AppState (Settings True 0 Lax False Never Curl True GHCupURL False GPGNone True Nothing (DM mempty)) dirs defaultKeyBindings (GHCupInfo mempty mempty mempty) pfreq loggerConfig
+  let appstate = AppState (Settings True 0 False Never Curl True GHCupURL False GPGNone True) dirs defaultKeyBindings (GHCupInfo mempty mempty mempty) pfreq loggerConfig
 
   let withValidateYamlOpts vopts f = case vopts of
         ValidateYAMLOpts { vInput = Nothing } ->
@@ -224,11 +198,10 @@ main = do
 
   _ <- customExecParser (prefs showHelpOnError) (info (opts <**> helper) idm)
     >>= \Options {..} -> case optCommand of
-          ValidateYAML vopts@ValidateYAMLOpts{ .. } -> withValidateYamlOpts vopts (validate vChannel)
+          ValidateYAML vopts -> withValidateYamlOpts vopts validate
           ValidateTarballs vopts tarballFilter -> withValidateYamlOpts vopts (validateTarballs tarballFilter)
           GenerateHlsGhc vopts format output -> withValidateYamlOpts vopts (generateHLSGhc format output)
           GenerateToolTable vopts output -> withValidateYamlOpts vopts (generateTable output)
-          GenerateSystemDepsInfo vopts output -> withValidateYamlOpts vopts (generateSystemInfoWithDistroVersion output)
   pure ()
 
  where

ghcup-gen/Validate.hs

@@ -15,8 +15,8 @@ import           GHCup.Errors
 import           GHCup.Types
 import           GHCup.Types.Optics
 import           GHCup.Utils
-import           GHCup.Prelude.Logger
-import           GHCup.Prelude.Version.QQ
+import           GHCup.Utils.Logger
+import           GHCup.Utils.Version.QQ
 
 import           Codec.Archive
 import           Control.Applicative
@@ -51,11 +51,6 @@ data ValidationError = InternalError String
 
 instance Exception ValidationError
 
-data DistributionChannel = MainChan
-                         | PrereleaseChan
-                         | NightlyChan
-  deriving (Show, Eq)
-
 
 addError :: (MonadReader (IORef Int) m, MonadIO m, Monad m) => m ()
 addError = do
@@ -71,9 +66,8 @@ validate :: ( Monad m
             , MonadUnliftIO m
             , HasGHCupInfo env
             )
-         => DistributionChannel
-         -> m ExitCode
-validate distroChannel = do
+         => m ExitCode
+validate = do
   GHCupInfo { _ghcupDownloads = dls } <- getGHCupInfo
 
   ref <- liftIO $ newIORef 0
@@ -87,7 +81,7 @@ validate distroChannel = do
     forM_ (M.toList dls) $ \(t, versions) ->
       forM_ (M.toList versions) $ \(v, vi) ->
         forM_ (M.toList $ _viArch vi) $ \(arch, pspecs) -> do
-          checkHasRequiredPlatforms t (_tvVersion v) (_viTags vi) arch (M.keys pspecs)
+          checkHasRequiredPlatforms t v (_viTags vi) arch (M.keys pspecs)
 
     checkGHCVerIsValid
     forM_ (M.toList dls) $ \(t, _) -> checkMandatoryTags t
@@ -101,36 +95,33 @@ validate distroChannel = do
         lift $ logInfo "All good"
         pure ExitSuccess
  where
-  checkHasRequiredPlatforms t v tags arch pspecs
-    -- relax requirements for prerelease and nightly channels
-    | distroChannel `elem` [PrereleaseChan, NightlyChan] = pure ()
-    | otherwise = do
-        let v' = prettyVer v
-            arch' = prettyShow arch
-        when (Linux UnknownLinux `notElem` pspecs) $ do
-          lift $ logError $
-            "Linux UnknownLinux missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
-          addError
-        when ((Darwin `notElem` pspecs) && arch == A_64) $ do
-          lift $ logError $ "Darwin missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
-          addError
-        when ((FreeBSD `notElem` pspecs) && arch == A_64) $ lift $ logWarn $
-          "FreeBSD missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
-        when (Windows `notElem` pspecs && arch == A_64) $ do
-          lift $ logError $ "Windows missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
-          addError
+  checkHasRequiredPlatforms t v tags arch pspecs = do
+    let v' = prettyVer v
+        arch' = prettyShow arch
+    when (Linux UnknownLinux `notElem` pspecs) $ do
+      lift $ logError $
+        "Linux UnknownLinux missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+      addError
+    when ((Darwin `notElem` pspecs) && arch == A_64) $ do
+      lift $ logError $ "Darwin missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+      addError
+    when ((FreeBSD `notElem` pspecs) && arch == A_64) $ lift $ logWarn $
+      "FreeBSD missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+    when (Windows `notElem` pspecs && arch == A_64) $ do
+      lift $ logError $ "Windows missing for for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack arch'
+      addError
 
-        -- alpine needs to be set explicitly, because
-        -- we cannot assume that "Linux UnknownLinux" runs on Alpine
-        -- (although it could be static)
-        when (Linux Alpine `notElem` pspecs) $
-          case t of
-            GHCup | arch `elem` [A_64, A_32] -> lift (logError $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch)) >> addError
-            Cabal | v > [vver|2.4.1.0|]
-                  , arch `elem` [A_64, A_32] -> lift (logError $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch)) >> addError
-            GHC | Latest `elem` tags || Recommended `elem` tags
-                , arch `elem` [A_64, A_32] -> lift (logError $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch))
-            _ -> lift $ logWarn $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch)
+    -- alpine needs to be set explicitly, because
+    -- we cannot assume that "Linux UnknownLinux" runs on Alpine
+    -- (although it could be static)
+    when (Linux Alpine `notElem` pspecs) $
+      case t of
+        GHCup | arch `elem` [A_64, A_32] -> lift (logError $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch)) >> addError
+        Cabal | v > [vver|2.4.1.0|]
+              , arch `elem` [A_64, A_32] -> lift (logError $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch)) >> addError
+        GHC | Latest `elem` tags || Recommended `elem` tags
+            , arch `elem` [A_64, A_32] -> lift (logError $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch))
+        _ -> lift $ logWarn $ "Linux Alpine missing for " <> T.pack (prettyShow t) <> " " <> v' <> " " <> T.pack (prettyShow arch)
 
   checkUniqueTags tool = do
     GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
@@ -154,19 +145,16 @@ validate distroChannel = do
         lift $ logError $ "Tags not unique for " <> T.pack (prettyShow tool) <> ": " <> T.pack (prettyShow xs)
         addError
    where
-    isUniqueTag Latest           = True
-    isUniqueTag Recommended      = True
-    isUniqueTag Old              = False
-    isUniqueTag Prerelease       = False
-    isUniqueTag LatestPrerelease = True
-    isUniqueTag Nightly          = False
-    isUniqueTag LatestNightly    = True
-    isUniqueTag (Base       _)   = False
-    isUniqueTag (UnknownTag _)   = False
+    isUniqueTag Latest         = True
+    isUniqueTag Recommended    = True
+    isUniqueTag Old            = False
+    isUniqueTag Prerelease     = False
+    isUniqueTag (Base       _) = False
+    isUniqueTag (UnknownTag _) = False
 
   checkGHCVerIsValid = do
     GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-    let ghcVers = toListOf (ix GHC % to M.keys % to (map _tvVersion) % folded) dls
+    let ghcVers = toListOf (ix GHC % to M.keys % folded) dls
     forM_ ghcVers $ \v ->
       case [ x | (x,"") <- readP_to_S V.parseVersion (T.unpack . prettyVer $ v) ] of
         [_] -> pure ()
@@ -178,28 +166,19 @@ validate distroChannel = do
   checkMandatoryTags tool = do
     GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
     let allTags = _viTags =<< M.elems (availableToolVersions dls tool)
-    forM_ (mandatoryTags tool) $ \t -> case t `elem` allTags of
+    forM_ [Latest, Recommended] $ \t -> case t `elem` allTags of
       False -> do
         lift $ logError $ "Tag " <> T.pack (prettyShow t) <> " missing from " <> T.pack (prettyShow tool)
         addError
       True -> pure ()
 
-  mandatoryTags tool
-    -- due to a quirk, even for ghcup prereleases we need the 'latest' tag
-    -- https://github.com/haskell/ghcup-hs/issues/891
-    | tool == GHCup = [Latest, Recommended]
-    | otherwise = case distroChannel of
-                    MainChan       -> [Latest, Recommended]
-                    PrereleaseChan -> [LatestPrerelease]
-                    NightlyChan    -> [LatestNightly]
-
   -- all GHC versions must have a base tag
   checkGHCHasBaseVersion = do
     GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
     let allTags = M.toList $ availableToolVersions dls GHC
     forM allTags $ \(ver, _viTags -> tags) -> case any isBase tags of
       False -> do
-        lift $ logError $ "Base tag missing from GHC ver " <> prettyVer (_tvVersion ver)
+        lift $ logError $ "Base tag missing from GHC ver " <> prettyVer ver
         addError
       True -> pure ()
 
@@ -231,11 +210,7 @@ validateTarballs (TarballFilter etool versionRegex) = do
   ref <- liftIO $ newIORef 0
 
    -- download/verify all tarballs
-  let dlis = either (const []) (\tool -> nubOrd $ dls ^.. each %& indices (maybe (const True) (==) tool)
-                                 %> each %& indices (matchTest versionRegex . T.unpack . prettyVer . _tvVersion)
-                                                  % (viTestDL % _Just `summing` viSourceDL % _Just `summing` viArch % each % each % each)
-                               )
-                               etool
+  let dlis = either (const []) (\tool -> nubOrd $ dls ^.. each %& indices (maybe (const True) (==) tool) %> each %& indices (matchTest versionRegex . T.unpack . prettyVer) % (viSourceDL % _Just `summing` viArch % each % each % each)) etool
   let gdlis = nubOrd $ gt ^.. each
   let allDls = either (const gdlis) (const dlis) etool
   when (null allDls) $ logError "no tarballs selected by filter" *> runReaderT addError ref
@@ -270,32 +245,32 @@ validateTarballs (TarballFilter etool versionRegex) = do
                , DownloadFailed
                , UnknownArchive
                , ArchiveResult
-               , ContentLengthError
                ]
       $ do
         case etool of
           Right (Just GHCup) -> do
             tmpUnpack <- lift mkGhcupTmpDir
-            _ <- liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) Nothing (fromGHCupPath tmpUnpack) Nothing False
+            _ <- liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) tmpUnpack Nothing False
             pure Nothing
           Right _ -> do
             p <- liftE $ downloadCached dli Nothing
-            fmap Just $ liftE
-                  . getArchiveFiles
-                  $ p
+            fmap (Just . head . splitDirectories . head)
+              . liftE
+              . getArchiveFiles
+              $ p
           Left ShimGen -> do
             tmpUnpack <- lift mkGhcupTmpDir
-            _ <- liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) Nothing (fromGHCupPath tmpUnpack) Nothing False
+            _ <- liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) tmpUnpack Nothing False
             pure Nothing
     case r of
-      VRight (Just entries) -> do
+      VRight (Just basePath) -> do
         case _dlSubdir dli of
           Just (RealDir prel) -> do
             logInfo
               $ " verifying subdir: " <> T.pack prel
-            when (normalise prel `notElem` fmap (normalise . takeDirectory) entries) $ do
+            when (basePath /= prel) $ do
               logError $
-                "Subdir doesn't match: expected " <> T.pack prel
+                "Subdir doesn't match: expected " <> T.pack prel <> ", got " <> T.pack basePath
               runReaderT addError ref
           Just (RegexDir regexString) -> do
             logInfo $
@@ -304,9 +279,9 @@ validateTarballs (TarballFilter etool versionRegex) = do
                   compIgnoreCase
                   execBlank
                   regexString
-            unless (or $ fmap (match regex. normalise) entries) $ do
+            unless (match regex basePath) $ do
               logError $
-                "Subdir doesn't match: expected regex " <> T.pack regexString
+                "Subdir doesn't match: expected regex " <> T.pack regexString <> ", got " <> T.pack basePath
               runReaderT addError ref
           Nothing -> pure ()
       VRight Nothing -> pure ()

ghcup-gen/ghcup-gen.cabal

@@ -47,14 +47,14 @@ executable ghcup-gen
   build-depends:
     , aeson-pretty          ^>=0.8.9
     , base                  >=4.13     && <5
-    , bytestring            ^>=0.11
+    , bytestring            ^>=0.10
     , containers            ^>=0.6
     , deepseq               ^>=1.4
     , filepath              ^>=1.4.2.1
-    , ghcup                 ^>=0.1.19.0
+    , ghcup                 ^>=0.1.17.3
     , haskus-utils-variant  ^>=3.2
     , libarchive            ^>=3.0.3.0
-    , megaparsec            >=8.0.0      && <9.3
+    , megaparsec            ^>=9.0
     , mtl                   ^>=2.2
     , optics                ^>=0.4
     , optparse-applicative  >=0.15.1.0 && <0.17
@@ -63,7 +63,7 @@ executable ghcup-gen
     , regex-posix           ^>=0.96
     , resourcet             ^>=1.2.2
     , safe-exceptions       ^>=0.1
-    , text                  ^>=2.0
+    , text                  ^>=1.2.4.0
     , transformers          ^>=0.5
     , versions              >=4.0.1    && <5.1
     , yaml-streamly         ^>=0.12.0

hls-metadata-0.0.1.json

@@ -608,740 +608,5 @@
                 "9.4.2"
             ]
         }
-    },
-    "1.9.0.0": {
-        "A_64": {
-            "Darwin": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.4.3",
-                "9.4.4"
-            ],
-            "Linux_CentOS": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.4.3",
-                "9.4.4"
-            ],
-            "Linux_Debian": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.4.3",
-                "9.4.4"
-            ],
-            "Linux_Fedora": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.4.3",
-                "9.4.4"
-            ],
-            "Linux_Mint": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.4.3",
-                "9.4.4"
-            ],
-            "Linux_Ubuntu": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.4.3",
-                "9.4.4"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.4.3",
-                "9.4.4"
-            ],
-            "Windows": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.4.3",
-                "9.4.4"
-            ]
-        },
-        "A_ARM64": {
-            "Darwin": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.4.3",
-                "9.4.4"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.4.3",
-                "9.4.4"
-            ]
-        }
-    },
-	"1.9.1.0": {
-        "A_64": {
-            "Darwin": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ],
-            "FreeBSD": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6"
-            ],
-            "Linux_CentOS": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ],
-            "Linux_Debian": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ],
-            "Linux_Fedora": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ],
-            "Linux_Mint": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ],
-            "Linux_RedHat": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ],
-            "Linux_Ubuntu": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ],
-            "Windows": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ]
-        },
-        "A_ARM64": {
-            "Darwin": [
-                "8.10.7",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.6",
-                "9.4.4"
-            ]
-        }
-    },
-	"1.10.0.0": {
-        "A_64": {
-            "Darwin": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ],
-            "FreeBSD": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.7"
-            ],
-            "Linux_CentOS": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ],
-            "Linux_Debian": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ],
-            "Linux_Fedora": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ],
-            "Linux_Mint": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ],
-            "Linux_RedHat": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ],
-            "Linux_Ubuntu": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ],
-            "Windows": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ]
-        },
-        "A_ARM64": {
-            "Darwin": [
-                "8.10.7",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.4",
-                "9.6.1"
-            ]
-        }
-    },
-    "2.0.0.0": {
-        "A_64": {
-            "Darwin": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ],
-            "FreeBSD": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.7"
-            ],
-            "Linux_CentOS": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ],
-            "Linux_Debian": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ],
-            "Linux_Fedora": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ],
-            "Linux_Mint": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ],
-            "Linux_RedHat": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ],
-            "Linux_Ubuntu": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ],
-            "Windows": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ]
-        },
-        "A_ARM64": {
-            "Darwin": [
-                "8.10.7",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.4.5",
-                "9.6.1"
-            ]
-        }
-    },
-    "2.0.0.1": {
-        "A_64": {
-            "Darwin": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.2.8",
-                "9.4.5",
-                "9.6.2"
-            ],
-            "FreeBSD": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.7"
-            ],
-            "Linux_CentOS": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.2.8",
-                "9.4.5",
-                "9.6.2"
-            ],
-            "Linux_Debian": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.2.8",
-                "9.4.5",
-                "9.6.2"
-            ],
-            "Linux_Fedora": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.2.8",
-                "9.4.5",
-                "9.6.2"
-            ],
-            "Linux_Mint": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.2.8",
-                "9.4.5",
-                "9.6.2"
-            ],
-            "Linux_RedHat": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.2.8",
-                "9.4.5",
-                "9.6.2"
-            ],
-            "Linux_Ubuntu": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.2.8",
-                "9.4.5",
-                "9.6.2"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.2.8",
-                "9.4.5",
-                "9.6.2"
-            ],
-            "Windows": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.2.8",
-                "9.4.5",
-                "9.6.2"
-            ]
-        },
-        "A_ARM64": {
-            "Darwin": [
-                "8.10.7",
-                "9.2.7",
-                "9.2.8",
-                "9.4.5",
-                "9.6.2"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.7",
-                "9.2.8",
-                "9.6.2"
-            ]
-        }
-    },
-    "2.1.0.0": {
-        "A_64": {
-            "Darwin": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ],
-            "FreeBSD": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.7"
-            ],
-            "Linux_CentOS": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ],
-            "Linux_Debian": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ],
-            "Linux_Fedora": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ],
-            "Linux_Mint": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ],
-            "Linux_RedHat": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ],
-            "Linux_Ubuntu": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ],
-            "Windows": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ]
-        },
-        "A_ARM64": {
-            "Darwin": [
-                "8.10.7",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.6.2"
-            ]
-        }
-    },
-    "2.2.0.0": {
-        "A_64": {
-            "Darwin": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ],
-            "FreeBSD": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.7"
-            ],
-            "Linux_CentOS": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ],
-            "Linux_Debian": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ],
-            "Linux_Fedora": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ],
-            "Linux_Mint": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ],
-            "Linux_RedHat": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ],
-            "Linux_Ubuntu": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ],
-            "Windows": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ]
-        },
-        "A_ARM64": {
-            "Darwin": [
-                "8.10.7",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ],
-            "Linux_UnknownLinux": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.8",
-                "9.4.5",
-                "9.4.6",
-                "9.4.7",
-                "9.6.2"
-            ]
-        }
-    },
-   "2.3.0.0": {
-        "A_64": {
-            "Darwin": [
-                "9.0.2",
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ],
-            "FreeBSD": [
-                "8.10.7",
-                "9.0.2",
-                "9.2.5",
-                "9.2.7"
-            ],
-            "Linux_CentOS": [
-                "9.0.2",
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ],
-            "Linux_Debian": [
-                "9.0.2",
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ],
-            "Linux_Fedora": [
-                "9.0.2",
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ],
-            "Linux_Mint": [
-                "9.0.2",
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ],
-            "Linux_RedHat": [
-                "9.0.2",
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ],
-            "Linux_Ubuntu": [
-                "9.0.2",
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ],
-            "Linux_UnknownLinux": [
-                "9.0.2",
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ],
-            "Windows": [
-                "9.0.2",
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ]
-        },
-        "A_ARM64": {
-            "Darwin": [
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ],
-            "Linux_UnknownLinux": [
-                "9.0.2",
-                "9.2.8",
-                "9.4.7",
-                "9.6.2",
-                "9.6.3"
-            ]
-        }
     }
 }