Re-sign

Bindist javascript-unknown-ghcjs-9.10.0.20240413
only compiles if emscripten 3.1.57 is installed.
Other versions of emscripten will lead to failure
during installation.

.github/scripts/brew.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -eux
+
+# shellcheck disable=SC1091
+. .github/scripts/env.sh
+
+if [ -e "$HOME/.brew" ] ; then
+	(
+	cd "$HOME/.brew"
+	git fetch --depth 1
+	git reset --hard origin/master
+	)
+else
+	git clone --depth=1 https://github.com/Homebrew/brew "$HOME/.brew"
+fi
+export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
+
+mkdir -p "$CI_PROJECT_DIR/.brew_cache"
+export HOMEBREW_CACHE="$CI_PROJECT_DIR/.brew_cache"
+mkdir -p "$CI_PROJECT_DIR/.brew_logs"
+export HOMEBREW_LOGS="$CI_PROJECT_DIR/.brew_logs"
+mkdir -p /private/tmp/.brew_tmp
+export HOMEBREW_TEMP=/private/tmp/.brew_tmp
+
+#brew update
+brew install ${1+"$@"}
+

.github/scripts/build.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+set -eux
+
+# shellcheck disable=SC1091
+. .github/scripts/env.sh
+# shellcheck disable=SC1091
+. .github/scripts/common.sh
+
+uname -a
+uname -p
+uname
+pwd
+env
+
+# ensure ghcup
+install_ghcup
+
+# build
+ghcup install ghc "${GHC_VERSION}"
+ghcup set ghc "${GHC_VERSION}"
+sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
+ecabal update
+ecabal user-config diff
+ecabal user-config init -f
+"ghc-${GHC_VERSION}" --info
+"ghc" --info
+
+# https://github.com/haskell/cabal/issues/7313#issuecomment-811851884
+if [ "$(getconf LONG_BIT)" == "32" ] || [ "${DISTRO}" == "CentOS" ] ; then
+    echo 'constraints: lukko -ofd-locking' >> cabal.project.release.local
+fi
+
+# shellcheck disable=SC2206
+args=(
+    -w "ghc-$GHC_VERSION"
+    --disable-profiling
+    --enable-executable-stripping
+    --project-file=cabal.project.release
+    ${ADD_CABAL_ARGS}
+)
+
+run cabal v2-build "${args[@]}" cabal-install
+
+mkdir -p "$CI_PROJECT_DIR/out"
+# shellcheck disable=SC2154
+cp "$(cabal list-bin "${args[@]}" cabal-install:exe:cabal)" "$CI_PROJECT_DIR/out/cabal$ext"
+cp dist-newstyle/cache/plan.json "$CI_PROJECT_DIR/out/plan.json"
+cd "$CI_PROJECT_DIR/out/"
+
+# create tarball/zip
+TARBALL_PREFIX="cabal-install-$("$CI_PROJECT_DIR/out/cabal" --numeric-version)"
+case "${TARBALL_EXT}" in
+    zip)
+        zip "${TARBALL_PREFIX}-${ARTIFACT}.${TARBALL_EXT}" "cabal${ext}" plan.json
+        ;;
+    tar.xz)
+        tar caf "${TARBALL_PREFIX}-${ARTIFACT}.${TARBALL_EXT}" "cabal${ext}" plan.json
+        ;;
+    *)
+        fail "Unknown TARBALL_EXT: ${TARBALL_EXT}"
+        ;;
+esac
+
+rm cabal plan.json
+

.github/scripts/common.sh

@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+. .github/scripts/env.sh
+
+# Colors
+RED="0;31"
+LT_BROWN="1;33"
+LT_BLUE="1;34"
+
+ecabal() {
+	cabal "$@"
+}
+
+nonfatal() {
+	"$@" || "$* failed"
+}
+
+sha_sum() {
+	if [ "${RUNNER_OS}" = "FreeBSD" ] ; then
+		sha256 "$@"
+	else
+		sha256sum "$@"
+	fi
+}
+
+git_describe() {
+	git config --global --get-all safe.directory | grep '^\*$' || git config --global --add safe.directory "*"
+	git describe --always
+}
+
+install_ghcup() {
+	# find "$GHCUP_INSTALL_BASE_PREFIX"
+	mkdir -p "$GHCUP_BIN"
+	mkdir -p "$GHCUP_BIN"/../cache
+
+	if [ "${RUNNER_OS}" = "FreeBSD" ] ; then
+		curl -o ghcup https://downloads.haskell.org/ghcup/tmp/x86_64-portbld-freebsd-ghcup-0.1.18.1
+		chmod +x ghcup
+		mv ghcup "$HOME/.local/bin/ghcup"
+	else
+		curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_MINIMAL=1 sh
+		source "$(dirname "${GHCUP_BIN}")/env"
+		ghcup install cabal --set "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
+	fi
+}
+
+strip_binary() {
+	(
+	set -e
+	local binary=$1
+	case "$(uname -s)" in
+		"Darwin"|"darwin")
+			;;
+		MSYS_*|MINGW*)
+			;;
+		*)
+			strip -s "${binary}"
+		   ;;
+   esac
+	)
+}
+
+# GitLab Pipelines log section delimiters
+# https://gitlab.com/gitlab-org/gitlab-foss/issues/14664
+start_section() {
+  name="$1"
+  echo -e "section_start:$(date +%s):$name\015\033[0K"
+}
+
+end_section() {
+  name="$1"
+  echo -e "section_end:$(date +%s):$name\015\033[0K"
+}
+
+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; }
+
+run() {
+  info "Running $*..."
+  "$@" || ( error "$* failed"; return 1; )
+}
+
+emake() {
+	if command -v gmake >/dev/null 2>&1 ; then
+		gmake "$@"
+	else
+		make "$@"
+	fi
+}
+
+mktempdir() {
+	case "$(uname -s)" in
+		"Darwin"|"darwin")
+			mktemp -d -t cabal_ci.XXXXXXX
+			;;
+		*)
+			mktemp -d
+			;;
+	esac
+}

.github/scripts/env.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+mkdir -p "$HOME"/.local/bin
+
+if [ "${RUNNER_OS}" = "Windows" ] ; then
+	ext=".exe"
+else
+	# shellcheck disable=SC2034
+	ext=''
+fi
+
+export PATH="$HOME/.local/bin:$PATH"
+
+export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
+export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.6.2.0-p2}"
+export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=no
+export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes
+export BOOTSTRAP_HASKELL_ADJUST_BASHRC=1
+
+if [ "${RUNNER_OS}" = "Windows" ] ; then
+    # on windows use pwd to get unix style path
+    CI_PROJECT_DIR="$(pwd)"
+    export CI_PROJECT_DIR
+    export GHCUP_INSTALL_BASE_PREFIX="/c"
+    export GHCUP_BIN="$GHCUP_INSTALL_BASE_PREFIX/ghcup/bin"
+    export PATH="$GHCUP_BIN:$PATH"
+    export CABAL_DIR="C:\\Users\\runneradmin\\AppData\\Roaming\\cabal"
+else
+    export CI_PROJECT_DIR="${GITHUB_WORKSPACE}"
+    export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR"
+    export GHCUP_BIN="$GHCUP_INSTALL_BASE_PREFIX/.ghcup/bin"
+    export PATH="$GHCUP_BIN:$PATH"
+    export CABAL_DIR="$CI_PROJECT_DIR/cabal"
+    export CABAL_CACHE="$CI_PROJECT_DIR/cabal-cache"
+fi
+
+export DEBIAN_FRONTEND=noninteractive
+export TZ=Asia/Singapore

.github/workflows/bindists.yaml

@@ -3,10 +3,6 @@ defaults:
   run:
     shell: bash
 on:
-  pull_request:
-    types: [opened]
-  issue_comment:
-    types: [created]
   workflow_dispatch:
     inputs:
       tool:
@@ -20,7 +16,12 @@ on:
       metadataFile:
         description: Metadata file
         required: true
-        default: ghcup-0.0.7.yaml
+        default: ghcup-0.0.8.yaml
+        type: string
+      channel:
+        description: Distribution channel (main|prerelease|nightly)
+        required: true
+        default: Main
         type: string
 env:
   BOOTSTRAP_HASKELL_NONINTERACTIVE: 1
@@ -29,6 +30,7 @@ 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 }}
@@ -40,15 +42,21 @@ 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
+            toolRequirements: build-essential curl libffi-dev libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5 libnuma-dev
           - image: debian:11
             installCmd: apt-get update && apt-get install -y
-            toolRequirements: build-essential curl libffi-dev  libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
+            toolRequirements: build-essential curl libffi-dev  libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5 libnuma-dev
+          - image: debian:12
+            installCmd: apt-get update && apt-get install -y
+            toolRequirements: build-essential curl libffi-dev  libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5 libnuma-dev
+          - image: debian:unstable
+            installCmd: apt-get update && apt-get install -y
+            toolRequirements: build-essential curl libffi-dev  libgmp-dev libgmp10 libncurses-dev libncurses6 libtinfo6 libnuma-dev
+          - image: ubuntu:16.04
+            installCmd: apt-get update && apt-get install -y
+            toolRequirements: build-essential curl libffi-dev libffi6 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
@@ -64,15 +72,27 @@ jobs:
           - 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:37
             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
+          - image: linuxmintd/mint20.3-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.3-amd64
+            installCmd: apt-get update && apt-get install -y
+            toolRequirements: build-essential curl libffi-dev libffi7 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
+          - image: ghcr.io/void-linux/void-glibc-full:latest
+            installCmd: xbps-install -Suy && xbps-install -y
+            toolRequirements: binutils curl gcc gmp-devel glibc-devel libffi-devel make ncurses-devel ncurses-libtinfo-libs perl tar xz
     container:
       image: ${{ matrix.image }}
     steps:
@@ -81,186 +101,142 @@ jobs:
         run: |
           ${{ matrix.installCmd }} curl bash git ${{ matrix.toolRequirements }}
 
-      - if: ${{ github.event_name != 'workflow_dispatch' }}
-        uses: shpingalet007/pull-request-comment-trigger@696de492b50cee0ba671934893c91c5805a403b9
-        id: check
-        with:
-          trigger: '@bindistTest ** ** **'
-          reaction: rocket
-          allow_arguments: true
-        env:
-          GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}'
+      - uses: actions/checkout@v3
 
-      - if: ${{ github.event_name != 'workflow_dispatch' }}
-        uses: shpingalet007/pull-request-comment-trigger@696de492b50cee0ba671934893c91c5805a403b9
-        id: checkRef
-        with:
-          trigger: '@bindistTestRef ** ** ** **'
-          reaction: rocket
-          allow_arguments: true
-        env:
-          GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}'
+      - name: Install ghcup and bindist
+        run: .github/workflows/install-bindist.sh
 
-      - if: ${{ steps.checkRef.outputs.triggered == 'true' }}
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ fromJson(steps.checkRef.outputs.arguments)[3] }}
-
-      - if: ${{ steps.checkRef.outputs.triggered != 'true' }}
-        uses: actions/checkout@v3
-
-      - if: ${{ github.event_name != 'workflow_dispatch' && steps.check.outputs.triggered == 'true' }}
-        continue-on-error: true
-        name: Install ghcup and bindist
-        run: |
-          export TOOL=${{ fromJson(steps.check.outputs.arguments)[0] }}
-          export VERSION=${{ fromJson(steps.check.outputs.arguments)[1] }}
-          export METADATA_FILE=${{ fromJson(steps.check.outputs.arguments)[2] }}
-          .github/workflows/install-bindist.sh
-          echo SUCCESS=true >> $GITHUB_ENV
-
-      - if: ${{ github.event_name != 'workflow_dispatch' && steps.check.outputs.triggered != 'true' && steps.checkRef.outputs.triggered == 'true' }}
-        continue-on-error: true
-        name: Install ghcup and bindist
-        run: |
-          export TOOL=${{ fromJson(steps.checkRef.outputs.arguments)[0] }}
-          export VERSION=${{ fromJson(steps.checkRef.outputs.arguments)[1] }}
-          export METADATA_FILE=${{ fromJson(steps.checkRef.outputs.arguments)[2] }}
-          .github/workflows/install-bindist.sh
-          echo SUCCESS=true >> $GITHUB_ENV
-
-      - if: ${{ github.event_name == 'workflow_dispatch' }}
-        name: Install ghcup and bindist
-        run: |
-          .github/workflows/install-bindist.sh
-          echo SUCCESS=true >> $GITHUB_ENV
-
-      - run: |
-          if [ "${{ env.SUCCESS }}" = "true" ] ; then
-            echo "true" > message-linux.txt
-          else
-            echo "false" > message-linux.txt
-          fi
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: artifacts
-          path: |
-            ./message-linux.txt
-
-  bindist-install-non-linux:
-    name: ${{ matrix.os }}
+  bindist-install-mac-win:
+    name: Build non-linux
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - macos-11
-          - macos-12
-          - windows-latest
+        include:
+          - os: [self-hosted, macOS, ARM64]
+          - os: macos-11
+          - os: macos-12
+          - os: windows-latest
     runs-on: ${{ matrix.os }}
     steps:
-      - if: ${{ github.event_name != 'workflow_dispatch' }}
-        uses: shpingalet007/pull-request-comment-trigger@696de492b50cee0ba671934893c91c5805a403b9
-        id: check
-        with:
-          trigger: '@bindistTest ** ** **'
-          reaction: rocket
-          allow_arguments: true
-        env:
-          GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}'
 
-      - if: ${{ github.event_name != 'workflow_dispatch' }}
-        uses: shpingalet007/pull-request-comment-trigger@696de492b50cee0ba671934893c91c5805a403b9
-        id: checkRef
-        with:
-          trigger: '@bindistTestRef ** ** ** **'
-          reaction: rocket
-          allow_arguments: true
-        env:
-          GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}'
-
-      - if: ${{ steps.checkRef.outputs.triggered == 'true' }}
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ fromJson(steps.checkRef.outputs.arguments)[3] }}
-
-      - if: ${{ steps.checkRef.outputs.triggered != 'true' }}
-        uses: actions/checkout@v3
-
-      - if: ${{ github.event_name != 'workflow_dispatch' && steps.check.outputs.triggered == 'true' }}
-        continue-on-error: true
-        name: Install ghcup and bindist
-        run: |
-          export TOOL=${{ fromJson(steps.check.outputs.arguments)[0] }}
-          export VERSION=${{ fromJson(steps.check.outputs.arguments)[1] }}
-          export METADATA_FILE=${{ fromJson(steps.check.outputs.arguments)[2] }}
-          .github/workflows/install-bindist.sh
-          echo SUCCESS=true >> $GITHUB_ENV
-
-      - if: ${{ github.event_name != 'workflow_dispatch' && steps.check.outputs.triggered != 'true' && steps.checkRef.outputs.triggered == 'true' }}
-        continue-on-error: true
-        name: Install ghcup and bindist
-        run: |
-          export TOOL=${{ fromJson(steps.checkRef.outputs.arguments)[0] }}
-          export VERSION=${{ fromJson(steps.checkRef.outputs.arguments)[1] }}
-          export METADATA_FILE=${{ fromJson(steps.checkRef.outputs.arguments)[2] }}
-          .github/workflows/install-bindist.sh
-          echo SUCCESS=true >> $GITHUB_ENV
+      - uses: actions/checkout@v3
 
       - if: ${{ github.event_name == 'workflow_dispatch' }}
         name: Install ghcup and bindist
-        run: |
-          .github/workflows/install-bindist.sh
-          echo SUCCESS=true >> $GITHUB_ENV
+        run: .github/workflows/install-bindist.sh
 
-      - run: |
-          if [ "${{ env.SUCCESS }}" = "true" ] ; then
-            echo "true" > message.txt
-          else
-            echo "false" > message.txt
-          fi
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
+  bindist-install-arm:
+    name: Build ARM binary
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: [self-hosted, Linux, ARM64, maerwald]
+            ARCH: ARM
+          - os: [self-hosted, Linux, ARM64, maerwald]
+            ARCH: ARM64
+    steps:
+      - uses: docker://arm64v8/ubuntu:focal
+        name: Cleanup (aarch64 linux)
         with:
-          name: artifacts
-          path: |
-            ./message.txt
+          args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
 
-  comment:
-    name: comment
-    needs: ["bindist-install", "bindist-install-non-linux"]
+      - 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'
+
+  bindist-install-freebsd:
+    name: Install FreeBSD binary
+    runs-on: [self-hosted, FreeBSD, X64]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Run build
+        run: .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: Download artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: artifacts
-
-      - run: |
-          if [ "$(cat message.txt)" == "true" ] && [ "$(cat message-linux.txt)" == "true" ] ; then
-            echo "SUCCESS=true" >> $GITHUB_ENV
-          else
-            echo "SUCCESS=false" >> $GITHUB_ENV
-          fi
-
-      - id: message
+      - name: Install requirements
+        shell: sh
         run: |
-          if [ "${{ env.SUCCESS }}" = "true" ] ; then
-            echo 'MESSAGE=Bindist check success :+1:' >> $GITHUB_OUTPUT
-          else
-            echo 'MESSAGE=Bindist check failure :-1:' >> $GITHUB_OUTPUT
-          fi
+          sudo apt-get update && sudo apt-get install -y curl bash git gnupg
 
-      - if: ${{ github.event_name == 'pull_request' }}
-        name: Comment PR
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: |
-            ${{ steps.message.outputs.MESSAGE }}
-
-      - name: Check on failures
-        if: env.SUCCESS != 'true'
-        run: exit 1
+      - uses: actions/checkout@v3
 
+      - name: Test signatures
+        run: .github/workflows/test-sigs.sh

.github/workflows/common.sh

@@ -0,0 +1,30 @@
+#!/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

@@ -2,25 +2,41 @@
 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
+curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/haskell/ghcup-hs/master/scripts/bootstrap/bootstrap-haskell | sh
 
-source $GHCUP_INSTALL_BASE_PREFIX/.ghcup/env || source ~/.bashrc
+source "$GHCUP_INSTALL_BASE_PREFIX"/.ghcup/env || source "$HOME/.bashrc"
 
 ghcup --version
 which ghcup | grep foobarbaz
 
-# oh no
-if [ "${TOOL}" = "hls" ] ; then
-	ghcup -v --url-source=file:$METADATA_FILE install ghc --set 9.2.4
-fi
+ghcup_fun() {
+	case "$(uname -s)" in
+		MSYS_*|MINGW*)
+			ghcup -v --url-source="file:${GITHUB_WORKSPACE//\\//}/$METADATA_FILE" "$@"
+			;;
+		*)
+			ghcup -v --url-source="file://${GITHUB_WORKSPACE}/$METADATA_FILE" "$@"
+			;;
+	esac
+}
 
-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 /tmp/install-bindist-ci
+mkdir -p /tmp/install-bindist-ci
 cd /tmp/install-bindist-ci
 
+trap 'rm -rf -- /tmp/install-bindist-ci' EXIT
+
 cat <<EOF > main.hs
 {- cabal:
 build-depends: base
@@ -30,17 +46,96 @@ main = print $ 1 + 1
 EOF
 
 case $TOOL in
+	ghcup)
+		ghcup_fun list
+		;;
 	hls)
-		haskell-language-server-wrapper --version
-		haskell-language-server-wrapper typecheck main.hs
+		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}"
+		}
+
+		# 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
+			ghcup_fun install ghc --set recommended
+			"$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
 		;;
     ghc)
 		ghc --version
 		ghc --info
 		ghc -prof main.hs
 		[[ $(./main +RTS -s) -eq 2 ]]
+		ghcup install cabal recommended
+		cabal --version
+		cabal update
+		case "${CHANNEL}" in
+			Prerelease|prereleasee)
+				cabal install --lib --package-env=. --allow-newer clock
+				# https://github.com/haskell/ghcup-hs/issues/966
+				cabal install --lib --package-env=. --allow-newer --constraint='filepath <1.5' hashable
+				;;
+			*)
+				cabal install --lib --package-env=. clock
+				# https://github.com/haskell/ghcup-hs/issues/966
+				cabal install --lib --package-env=. hashable
+				;;
+		esac
+		case "$(uname -s)" in
+			MSYS_*|MINGW*)
+				;;
+			*)
+		        [[ -e "$(ghcup whereis --directory ghc "$VERSION")/../share/man/man1/ghc.1" ]]
+			   ;;
+	    esac
 		;;
     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 ]]

.github/workflows/sigs

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,27 @@
+#!/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"
+
+for f in ghcup-*.json ghcup-*.yaml hls-metadata-*.json ; do
+	gpg --verify "${f}.sig"
+done
+

.github/workflows/test.yaml

@@ -11,7 +11,7 @@ jobs:
     name: Test metadata
     runs-on: ${{ matrix.os }}
     env:
-      YAML_VER: 0.0.6
+      YAML_VER: 0.0.7
     strategy:
       matrix:
         ghc:
@@ -19,7 +19,7 @@ jobs:
         cabal:
           - '3.6.2.0'
         os:
-          - ubuntu-latest
+          - ubuntu-22.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -51,18 +51,30 @@ 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
+      - name: Check yaml
         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

.gitignore

@@ -12,6 +12,6 @@ tags
 TAGS
 /tmp/
 .entangled
-release/
-releases/
+/release/
+/releases/
 site/

.yamllint

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

README.md

@@ -1,6 +1,34 @@
 # GHCup metadata
 
-## Adding a new GHC version
+## 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 experimental cross compilers. See https://www.haskell.org/ghcup/guide/#cross-support for details.
+
+### 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
+```
+
+If you want **only** vanilla upstream bindists and opt out of all unofficial stuff, you'd run:
+
+```sh
+ghcup config set url-source https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-vanilla-0.0.8.yaml
+```
+
+Also check the [config.yaml documentation](https://github.com/haskell/ghcup-hs/blob/master/data/config.yaml).
+
+## For contributors
+
+### 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`)
@@ -11,3 +39,24 @@
 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,19 +2,18 @@ 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://gitlab.haskell.org/haskell/ghcup-hs.git
-  tag: v0.1.17.8
+  location: https://github.com/haskell/ghcup-hs.git
+  tag: 91ef2c7666d118bc6bd7d2fc2eeb7754081a9f3d
 
 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
@@ -25,5 +24,5 @@ package cabal-plan
 package aeson
   flags: +ordered-keymap
 
-allow-newer: base, ghc-prim, template-haskell, language-c
-
+package streamly
+  flags: +use-unliftio

ghcup-0.0.1.json

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

ghcup-0.0.2.json

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

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.17.5:
+    0.1.19.0:
       viTags:
       - Recommended
       - Latest
-      viChangeLog: https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md
+      viChangeLog: https://github.com/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.17.5/x86_64-linux-ghcup-0.1.17.5
-              dlHash: 7541bcf0b402f99d05cd1937f9fef69aec45c3153e42606671825be248484fb5
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0
+              dlHash: 33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-apple-darwin-ghcup-0.1.17.5
-              dlHash: 8b5159775de08a5f268f4be217fbb6f427ff8d8977197af209211b81ca0fe27f
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0
+              dlHash: 416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-freebsd12-ghcup-0.1.17.5
-              dlHash: babb7366abb17bcb5d4fc1500039040f1b957073d618db3f1473b0bae6abc6bb
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0
+              dlHash: dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/i386-linux-ghcup-0.1.17.5
-              dlHash: 5a2b1d2ceb32857866689ee1a1e29c5747333882a4e952d80eccf49482d3daab
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0
+              dlHash: 0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53
           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.17.5:
+    0.1.19.0:
       viTags:
       - Recommended
       - Latest
-      viChangeLog: https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md
+      viChangeLog: https://github.com/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.17.5/x86_64-linux-ghcup-0.1.17.5
-              dlHash: 7541bcf0b402f99d05cd1937f9fef69aec45c3153e42606671825be248484fb5
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0
+              dlHash: 33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-apple-darwin-ghcup-0.1.17.5
-              dlHash: 8b5159775de08a5f268f4be217fbb6f427ff8d8977197af209211b81ca0fe27f
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0
+              dlHash: 416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/x86_64-freebsd12-ghcup-0.1.17.5
-              dlHash: babb7366abb17bcb5d4fc1500039040f1b957073d618db3f1473b0bae6abc6bb
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0
+              dlHash: dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.5/i386-linux-ghcup-0.1.17.5
-              dlHash: 5a2b1d2ceb32857866689ee1a1e29c5747333882a4e952d80eccf49482d3daab
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0
+              dlHash: 0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53
           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.17.7:
+    0.1.19.0:
       viTags:
       - Recommended
       - Latest
-      viChangeLog: https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md
+      viChangeLog: https://github.com/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.17.7/x86_64-linux-ghcup-0.1.17.7
-              dlHash: e16eaf59dab84be7aa6415b53a3497f211d05163a50584dc854569b2ef8a7a3a
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0
+              dlHash: 33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-apple-darwin-ghcup-0.1.17.7
-              dlHash: 9702f30c9374a122d79f7ef11170b34deb248a0f3cd92d671c0aab747be4add7
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0
+              dlHash: 416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-freebsd12-ghcup-0.1.17.7
-              dlHash: d3d0644dc5d9b51ed1c345fc006e936e9284b3181e5a9cccf4cf70a7184398fe
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0
+              dlHash: dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/i386-linux-ghcup-0.1.17.7
-              dlHash: 209f61872a5b401e85e4d542dd8d0c96437c1f1ad94b4fa5a28856f34ab0cab8
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0
+              dlHash: 0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53
           Linux_Alpine:
             unknown_versioning: *ghcup-32
         A_ARM64:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/aarch64-linux-ghcup-0.1.17.7
-              dlHash: 392dc46ef3f98733b154188982866859d174a750e32c5b742e6a1cf60159954e
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/aarch64-linux-ghcup-0.1.19.0
+              dlHash: a546dcd23a7e56f31bc4d6afad0276f88d3f0b850a3d3c36369721797dc3c3d5
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/aarch64-apple-darwin-ghcup-0.1.17.7
-              dlHash: 102d808b31248f86cbf569162ba1b7955e6747a684b2b4200b0958d6e4c54267
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/aarch64-apple-darwin-ghcup-0.1.19.0
+              dlHash: 69bd8e37cd07606d928dca9215c066564a264e0def3c81171b76d5747dc6507c
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.17.7/armv7-linux-ghcup-0.1.17.7
-              dlHash: 8438e22241fab4bfde94066a34600ab003db2f4ecadfd54bfad4ae990e6549a1
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/armv7-linux-ghcup-0.1.19.0
+              dlHash: 58a170c1fb0b4e701ebb40f90a23f6ababe9e61291726aad82e18d4649aed908
   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.18.0:
+    0.1.19.0:
       viTags:
       - Recommended
       - Latest
-      viChangeLog: https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md
+      viChangeLog: https://github.com/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.18.0/x86_64-linux-ghcup-0.1.18.0
-              dlHash: 94559eb7c4569919446af1597d07675e803c20b150323edb7f9d8601c8bbda50
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0
+              dlHash: 33ee6a758ee06e3b520be176905e6192e31f5fa2e2acdc525b1bea77ca368a12
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-apple-darwin-ghcup-0.1.18.0
-              dlHash: b34ed98bc0cc6d2169974f8d03173f93c3e3f60607013f1af42c9882c1a0d6f0
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-apple-darwin-ghcup-0.1.19.0
+              dlHash: 416de8509092fd95f97ee19a5f3def91fbd6e6fa4fa630a5c5e7226f49a83af7
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-freebsd12-ghcup-0.1.18.0
-              dlHash: cc8378a53f3028331dc853acfb253e2258d720b0e18b618b294ed67182a7fa03
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-portbld-freebsd-ghcup-0.1.19.0
+              dlHash: dadf49f8ac045946ccea7369d0c80cf3a5221b2282d8f9943cc3dc86e8516a62
           Windows:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-mingw64-ghcup-0.1.18.0.exe
-              dlHash: e2166a50437c677dfab3362749f676f92ff786aae1bfd7a2d289efa3544ee654
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/x86_64-mingw64-ghcup-0.1.19.0.exe
+              dlHash: c4e4a764b0844e351eb6939ff236452f33c34808aaca69f973ea82e18d3aa1ac
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/i386-linux-ghcup-0.1.18.0
-              dlHash: 222914720135261dcc644155bc8a5b15d1d4966c769d50686fe4f41547208759
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/i386-linux-ghcup-0.1.19.0
+              dlHash: 0308ebed4431241ef2886a9d374feb20a795d97ef3a24dd38b6bc7dd69e81e53
           Linux_Alpine:
             unknown_versioning: *ghcup-32
         A_ARM64:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/aarch64-linux-ghcup-0.1.18.0
-              dlHash: 3e3ee4aa06e426373fb7e29f1770987ca1621e414925f261f325f9acb77e0bcb
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/aarch64-linux-ghcup-0.1.19.0
+              dlHash: a546dcd23a7e56f31bc4d6afad0276f88d3f0b850a3d3c36369721797dc3c3d5
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/aarch64-apple-darwin-ghcup-0.1.18.0
-              dlHash: 2d3aa19d6f012c1a4ebc5907a05b06cf0d43a1499107020f59847ea2638c8649
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/aarch64-apple-darwin-ghcup-0.1.19.0
+              dlHash: 69bd8e37cd07606d928dca9215c066564a264e0def3c81171b76d5747dc6507c
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/armv7-linux-ghcup-0.1.18.0
-              dlHash: 2e94920c772bc24c9fe41004dedf46840f5f036d28d3ed183679d3f34d2c50e0
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.19.0/armv7-linux-ghcup-0.1.19.0
+              dlHash: 58a170c1fb0b4e701ebb40f90a23f6ababe9e61291726aad82e18d4649aed908
   HLS:
     1.1.0:
       viTags: []

ghcup-0.0.6.yaml

@@ -2569,56 +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.18.0:
+    0.1.22.0:
       viTags:
       - Recommended
       - Latest
-      viChangeLog: https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/CHANGELOG.md
+      viChangeLog: https://github.com/haskell/ghcup-hs/blob/master/CHANGELOG.md
       viSourceDL:
+        dlUri: https://downloads.haskell.org/~ghcup/0.1.22.0/ghcup-0.1.22.0-src.tar.gz
+        dlSubdir: ghcup-0.1.22.0
+        dlHash: 8309058a58e7b65e41cf045e555fd2f4e9e651c32d85c63fef09330b827d2478
       viArch:
         A_64:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0
-              dlHash: 94559eb7c4569919446af1597d07675e803c20b150323edb7f9d8601c8bbda50
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.22.0/x86_64-linux-ghcup-0.1.22.0
+              dlHash: bf213f4dfd2271b46ca52e2f14e96850ce32e9115e5acc90f1dc5a4e815e32af
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-apple-darwin-ghcup-0.1.18.0
-              dlHash: b34ed98bc0cc6d2169974f8d03173f93c3e3f60607013f1af42c9882c1a0d6f0
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.22.0/x86_64-apple-darwin-ghcup-0.1.22.0
+              dlHash: e588fe2c6a065afb56eca257c4ff19b83f192e95ee74d9601976ce5c05991b06
           FreeBSD:
-            '( >= 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
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.22.0/x86_64-portbld-freebsd-ghcup-0.1.22.0
+              dlHash: ce87fcebd2db01adcb3e57635e611437a96dd8ba98932a436f45ac71c4ae2e8a
           Windows:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/x86_64-mingw64-ghcup-0.1.18.0.exe
-              dlHash: e2166a50437c677dfab3362749f676f92ff786aae1bfd7a2d289efa3544ee654
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.22.0/x86_64-mingw64-ghcup-0.1.22.0.exe
+              dlHash: 92d3827cd369112a7e3c328807e1748db8da3df1661227d473d4cf019fb01e46
           Linux_Alpine:
             unknown_versioning: *ghcup-64
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/i386-linux-ghcup-0.1.18.0
-              dlHash: 222914720135261dcc644155bc8a5b15d1d4966c769d50686fe4f41547208759
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.22.0/i386-linux-ghcup-0.1.22.0
+              dlHash: 1fd4fa989653a127d33f90cb4cc11fd024ea4085e795c0b0f6ed97afc5e8b634
           Linux_Alpine:
             unknown_versioning: *ghcup-32
         A_ARM64:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/aarch64-linux-ghcup-0.1.18.0
-              dlHash: 3e3ee4aa06e426373fb7e29f1770987ca1621e414925f261f325f9acb77e0bcb
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.22.0/aarch64-linux-ghcup-0.1.22.0
+              dlHash: 3eda556959462579b73558616646c9fc01a583acc7a4611bb21a32706deae142
           Darwin:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/aarch64-apple-darwin-ghcup-0.1.18.0
-              dlHash: 2d3aa19d6f012c1a4ebc5907a05b06cf0d43a1499107020f59847ea2638c8649
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.22.0/aarch64-apple-darwin-ghcup-0.1.22.0
+              dlHash: d39a8dbbd6d76ce87ad91cee6ecc9c680af5339ab25e8789af5b7e717564fc95
         A_ARM:
           Linux_UnknownLinux:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.18.0/armv7-linux-ghcup-0.1.18.0
-              dlHash: 2e94920c772bc24c9fe41004dedf46840f5f036d28d3ed183679d3f34d2c50e0
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.22.0/armv7-linux-ghcup-0.1.22.0
+              dlHash: 7c66253e52c5fb627a4d4b203a69e69f4d7732348ad6a830a41d7e2d79a61c5d
   HLS:
     1.1.0:
       viTags:

ghcup-cross-0.0.8.yaml

@@ -0,0 +1,140 @@
+---
+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
+    javascript-unknown-ghcjs-9.10.0.20240413:
+      viPreInstall: |
+        To use this bindist, you have to use emscripten version 3.1.57
+        Also see: https://www.haskell.org/ghcup/guide/#ghc-js-cross-bindists-experimental
+      viTags:
+      - base-4.20.0.0
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/javascript-unknown-ghcjs-9.10.0.20240413/ghc-javascript-unknown-ghcjs-9.10.0.20240413-x86_64-linux-rocky-8.9-2024-04-16-dc318739.tar.xz
+              dlSubdir: ghc-9.10.0.20240413-javascript-unknown-ghcjs
+              dlHash: dc318739b1ec4f1051dd4b38793b5fbc8eb4dea56b6177d1fe212edcf9e28b30
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/javascript-unknown-ghcjs-9.10.0.20240413/ghc-javascript-unknown-ghcjs-9.10.0.20240413-x86_64-darwin-2024-04-16-a819da18.tar.xz
+              dlSubdir: ghc-9.10.0.20240413-javascript-unknown-ghcjs
+              dlHash: a819da1875e9763da5732c37dc7f36eb6e9eb6d33ddc6ea11894df9cfa18a6ee
+        A_ARM64:
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/javascript-unknown-ghcjs-9.10.0.20240413/ghc-javascript-unknown-ghcjs-9.10.0.20240413-aarch64-darwin-2024-04-16-c946719b.tar.xz
+              dlSubdir: ghc-9.10.0.20240413-javascript-unknown-ghcjs
+              dlHash: c946719b31f9249e899fdc15351b86a4297e66857ce4063743b1bcbd62cf9e0e
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/javascript-unknown-ghcjs-9.10.0.20240413/ghc-javascript-unknown-ghcjs-9.10.0.20240413-aarch64-linux-debian-12-2024-04-16-5f63452c.tar.xz
+              dlSubdir: ghc-9.10.0.20240413-javascript-unknown-ghcjs
+              dlHash: 5f63452c8bee2fcc1282645158bcd20bae7ff93181f3e5d5dc8b2aa8d15f4696
+    wasm32-wasi-9.6.3.20230927:
+      viTags:
+      - base-4.18.1.0
+      viPreInstall: &old-wasm-pre-install |
+        To use this bindist, you need to use the commit c0aa3bb7d88bb6ec809210e17658dd1ed64ba66c of ghc-wasm-meta repository.
+        Also see: https://www.haskell.org/ghcup/guide/#ghc-wasm-cross-bindists-experimental
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning: &ghc-wasm32-wasi-963-64-static
+              dlHash: 2e1d363320c03e35fd9048a252a0cfed8f7b87da76c063c7fc52122c390f42c3
+              dlSubdir: ghc-9.6.3.20230927-wasm32-wasi
+              dlUri: https://github.com/amesgen/ghc-wasm-bindists/releases/download/20231001T201511/wasm32-wasi-ghc-9.6.tar.xz
+              dlOutput: ghc-9.6.3.20230927-x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static.tar.xz
+          Linux_Alpine:
+            unknown_versioning: *ghc-wasm32-wasi-963-64-static
+    wasm32-wasi-9.6.4:
+      viTags:
+      - base-4.18.2.0
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning: &ghc-wasm32-wasi-964-64-static
+              dlHash: 9eebb42c40d880ec777f729e24b9b52e8aa51d76994f386bd79893d065f5239a
+              dlSubdir: ghc-9.6.4-wasm32-wasi
+              dlUri: https://github.com/amesgen/ghc-wasm-bindists/releases/download/20240218T031934/wasm32-wasi-ghc-9.6.tar.xz
+              dlOutput: ghc-9.6.4-x86_64-linux-alpine3_18-wasm-cross_wasm32-wasi-release+fully_static.tar.xz
+          Linux_Alpine:
+            unknown_versioning: *ghc-wasm32-wasi-964-64-static
+    wasm32-wasi-9.8.0.20230927:
+      viTags:
+      - base-4.19.0.0
+      viPreInstall: *old-wasm-pre-install
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning: &ghc-wasm32-wasi-980-64-static
+              dlHash: bad3393b6eba103230c62f050ffd9d458916c6238e5d5fa031d3eee5d995305a
+              dlSubdir: ghc-9.8.0.20230927-wasm32-wasi
+              dlUri: https://github.com/amesgen/ghc-wasm-bindists/releases/download/20231001T201511/wasm32-wasi-ghc-9.8.tar.xz
+              dlOutput: ghc-9.8.0.20230927-x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static.tar.xz
+          Linux_Alpine:
+            unknown_versioning: *ghc-wasm32-wasi-980-64-static
+    wasm32-wasi-9.8.1:
+      viTags:
+      - base-4.19.0.0
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning: &ghc-wasm32-wasi-981-64-static
+              dlHash: b1714d54468754e3a4353661bec883fef8b5d27398db53b5955753db7453da3e
+              dlSubdir: ghc-9.8.1-wasm32-wasi
+              dlUri: https://github.com/amesgen/ghc-wasm-bindists/releases/download/20240218T031934/wasm32-wasi-ghc-9.8.tar.xz
+              dlOutput: ghc-9.8.1-x86_64-linux-alpine3_18-wasm-cross_wasm32-wasi-release+fully_static.tar.xz
+          Linux_Alpine:
+            unknown_versioning: *ghc-wasm32-wasi-981-64-static
+    wasm32-wasi-9.10.0.20240313:
+      viTags:
+      - base-4.20.0.0
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning: &ghc-wasm32-wasi-9101-64-static
+              dlHash: e2ee5a0417f3617a93f8ca8df2b455c17e50dd5fb750b2fbe37e75982c3a4917
+              dlSubdir: ghc-9.10.0.20240313-wasm32-wasi
+              dlUri: https://github.com/amesgen/ghc-wasm-bindists/releases/download/20240318T183143/wasm32-wasi-ghc-9.10.tar.xz
+              dlOutput: ghc-9.10.0.20240313-x86_64-linux-alpine3_18-wasm-cross_wasm32-wasi-release+fully_static.tar.xz
+          Linux_Alpine:
+            unknown_versioning: *ghc-wasm32-wasi-9101-64-static
+    wasm32-wasi-9.10.0.20240412:
+      viTags:
+      - base-4.20.0.0
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning: &ghc-wasm32-wasi-9101-a3-64-static
+              dlHash: e7648d84f7948d53dcd6935a0358967dc8d5d68ee3a60c0706f4b5a94a0fb628
+              dlSubdir: ghc-9.10.0.20240412-wasm32-wasi
+              dlUri: https://github.com/amesgen/ghc-wasm-bindists/releases/download/20240414T232345/wasm32-wasi-ghc-9.10.tar.xz
+              dlOutput: ghc-9.10.0.20240412-x86_64-linux-alpine3_18-wasm-cross_wasm32-wasi-release+fully_static.tar.xz
+          Linux_Alpine:
+            unknown_versioning: *ghc-wasm32-wasi-9101-a3-64-static

ghcup-gen/Generate.hs

@@ -6,6 +6,7 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE ViewPatterns     #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE LambdaCase #-}
 
 module Generate where
 
@@ -40,7 +41,7 @@ import           System.Exit
 import           System.FilePath
 import           System.IO
 import           Text.Regex.Posix
-import           GHCup.Utils.String.QQ
+import           GHCup.Prelude.String.QQ
 
 import qualified Data.ByteString.Lazy          as BSL
 import qualified Data.Map.Strict               as M
@@ -48,6 +49,12 @@ 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
 
@@ -84,6 +91,7 @@ generateHLSGhc format output = do
                       , DownloadFailed
                       , UnknownArchive
                       , ArchiveResult
+                      , ContentLengthError
                       ] $ do
                fp <- liftE $ downloadCached dli Nothing
                let subd = _dlSubdir dli
@@ -156,7 +164,7 @@ generateTable output = do
     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) Nothing
+    vers <- reverse <$> listVersions (Just tool) [] False False (Nothing, Nothing)
     forM_ (filter (\ListResult{..} -> not lStray) vers) $ \ListResult{..} -> do
       liftIO $ hPutStrLn handle $
           "<tr><td>"
@@ -227,3 +235,53 @@ generateSystemInfo output = do
   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.Utils.Logger
+import           GHCup.Prelude.Logger
 import           GHCup.Types.JSON               ( )
 
 import           Control.Exception              ( displayException )
@@ -105,26 +105,43 @@ inputP :: Parser Input
 inputP = fileInput <|> stdInput
 
 data ValidateYAMLOpts = ValidateYAMLOpts
-  { vInput :: Maybe Input
+  { vChannel :: DistributionChannel
+  , vInput   :: Maybe Input
   }
 
 validateYAMLOpts :: Parser ValidateYAMLOpts
-validateYAMLOpts = ValidateYAMLOpts <$> optional inputP
+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')
 
 tarballFilterP :: Parser TarballFilter
 tarballFilterP = option readm $
   long "tarball-filter" <> short 'u' <> metavar "<tool>-<version>" <> value def
     <> help "Only check certain tarballs (format: <tool>-<version>)"
   where
-    def = TarballFilter (Right Nothing) (makeRegex ("" :: String))
+    def = TarballFilter Nothing (makeRegex ("" :: String))
     readm = do
       s <- str
       case span (/= '-') s of
         (_, []) -> fail "invalid format, missing '-' after the tool name"
         (t, v) | [tool] <- [ tool | tool <- [minBound..maxBound], low (show tool) == low t ] ->
-          pure (TarballFilter $ Right $ Just tool) <*> makeRegexOptsM compIgnoreCase execBlank (drop 1 v)
-        (t, v) | [tool] <- [ tool | tool <- [minBound..maxBound], low (show tool) == low t ] ->
-          pure (TarballFilter $ Left tool) <*> makeRegexOptsM compIgnoreCase execBlank (drop 1 v)
+          pure (TarballFilter $ Just tool) <*> makeRegexOptsM compIgnoreCase execBlank (drop 1 v)
         _ -> fail "invalid tool"
     low = fmap toLower
 
@@ -177,7 +194,7 @@ main = do
                                   , fancyColors   = not no_color
                                   }
   dirs <- liftIO getAllDirs
-  let leanAppstate = LeanAppState (Settings True 0 False Never Curl True GHCupURL False GPGNone True) dirs defaultKeyBindings loggerConfig
+  let leanAppstate = LeanAppState (Settings True 0 Lax False Never Curl True GHCupURL False GPGNone True Nothing (DM mempty)) dirs defaultKeyBindings loggerConfig
 
   pfreq <- (
     flip runReaderT leanAppstate . runE @'[NoCompatiblePlatform, NoCompatibleArch, DistroNotFound] $ platformRequest
@@ -187,7 +204,7 @@ main = do
               flip runReaderT leanAppstate $ logError $ T.pack $ prettyShow e
               liftIO $ exitWith (ExitFailure 2)
 
-  let appstate = AppState (Settings True 0 False Never Curl True GHCupURL False GPGNone True) dirs defaultKeyBindings (GHCupInfo mempty mempty mempty) pfreq loggerConfig
+  let appstate = AppState (Settings True 0 Lax False Never Curl True GHCupURL False GPGNone True Nothing (DM mempty)) dirs defaultKeyBindings (GHCupInfo mempty mempty Nothing) pfreq loggerConfig
 
   let withValidateYamlOpts vopts f = case vopts of
         ValidateYAMLOpts { vInput = Nothing } ->
@@ -205,11 +222,11 @@ main = do
 
   _ <- customExecParser (prefs showHelpOnError) (info (opts <**> helper) idm)
     >>= \Options {..} -> case optCommand of
-          ValidateYAML vopts -> withValidateYamlOpts vopts validate
+          ValidateYAML vopts@ValidateYAMLOpts{ .. } -> withValidateYamlOpts vopts (validate vChannel)
           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 (generateSystemInfo 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.Utils.Logger
-import           GHCup.Utils.Version.QQ
+import           GHCup.Prelude.Logger
+import           GHCup.Prelude.Version.QQ
 
 import           Codec.Archive
 import           Control.Applicative
@@ -51,6 +51,11 @@ 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
@@ -66,8 +71,9 @@ validate :: ( Monad m
             , MonadUnliftIO m
             , HasGHCupInfo env
             )
-         => m ExitCode
-validate = do
+         => DistributionChannel
+         -> m ExitCode
+validate distroChannel = do
   GHCupInfo { _ghcupDownloads = dls } <- getGHCupInfo
 
   ref <- liftIO $ newIORef 0
@@ -81,7 +87,7 @@ validate = do
     forM_ (M.toList dls) $ \(t, versions) ->
       forM_ (M.toList versions) $ \(v, vi) ->
         forM_ (M.toList $ _viArch vi) $ \(arch, pspecs) -> do
-          checkHasRequiredPlatforms t v (_viTags vi) arch (M.keys pspecs)
+          checkHasRequiredPlatforms t (_tvVersion v) (_viTags vi) arch (M.keys pspecs)
 
     checkGHCVerIsValid
     forM_ (M.toList dls) $ \(t, _) -> checkMandatoryTags t
@@ -95,33 +101,36 @@ validate = do
         lift $ logInfo "All good"
         pure ExitSuccess
  where
-  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
+  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
 
-    -- 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
@@ -145,16 +154,19 @@ validate = 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 (Base       _) = False
-    isUniqueTag (UnknownTag _) = False
+    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
 
   checkGHCVerIsValid = do
     GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
-    let ghcVers = toListOf (ix GHC % to M.keys % folded) dls
+    let ghcVers = toListOf (ix GHC % to M.keys % to (map _tvVersion) % folded) dls
     forM_ ghcVers $ \v ->
       case [ x | (x,"") <- readP_to_S V.parseVersion (T.unpack . prettyVer $ v) ] of
         [_] -> pure ()
@@ -166,19 +178,28 @@ validate = do
   checkMandatoryTags tool = do
     GHCupInfo { _ghcupDownloads = dls } <- lift getGHCupInfo
     let allTags = _viTags =<< M.elems (availableToolVersions dls tool)
-    forM_ [Latest, Recommended] $ \t -> case t `elem` allTags of
+    forM_ (mandatoryTags tool) $ \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 ver
+        lift $ logError $ "Base tag missing from GHC ver " <> prettyVer (_tvVersion ver)
         addError
       True -> pure ()
 
@@ -186,7 +207,7 @@ validate = do
   isBase _        = False
 
 data TarballFilter = TarballFilter
-  { tfTool    :: Either GlobalTool (Maybe Tool)
+  { tfTool    :: Maybe Tool
   , tfVersion :: Regex
   }
 
@@ -205,16 +226,16 @@ validateTarballs :: ( Monad m
                     )
                  => TarballFilter
                  -> m ExitCode
-validateTarballs (TarballFilter etool versionRegex) = do
-  GHCupInfo { _ghcupDownloads = dls, _globalTools = gt } <- getGHCupInfo
+validateTarballs (TarballFilter mtool versionRegex) = do
+  GHCupInfo { _ghcupDownloads = dls } <- getGHCupInfo
   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) % (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
-  forM_ allDls (downloadAll ref)
+  let dlis = nubOrd $ dls ^.. each %& indices (maybe (const True) (==) mtool)
+                    %> each %& indices (matchTest versionRegex . T.unpack . prettyVer . _tvVersion)
+                    % (viTestDL % _Just `summing` viSourceDL % _Just `summing` viArch % each % each % each)
+  when (null dlis) $ logError "no tarballs selected by filter" *> runReaderT addError ref
+  forM_ dlis (downloadAll ref)
 
   -- exit
   e <- liftIO $ readIORef ref
@@ -245,32 +266,28 @@ validateTarballs (TarballFilter etool versionRegex) = do
                , DownloadFailed
                , UnknownArchive
                , ArchiveResult
+               , ContentLengthError
                ]
       $ do
-        case etool of
-          Right (Just GHCup) -> do
+        case mtool of
+          (Just GHCup) -> do
             tmpUnpack <- lift mkGhcupTmpDir
-            _ <- liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) tmpUnpack Nothing False
+            _ <- liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) Nothing (fromGHCupPath tmpUnpack) Nothing False
             pure Nothing
-          Right _ -> do
+          _ -> do
             p <- liftE $ downloadCached dli Nothing
-            fmap (Just . head . splitDirectories . head)
-              . liftE
-              . getArchiveFiles
-              $ p
-          Left ShimGen -> do
-            tmpUnpack <- lift mkGhcupTmpDir
-            _ <- liftE $ download (_dlUri dli) Nothing (Just (_dlHash dli)) tmpUnpack Nothing False
-            pure Nothing
+            fmap Just $ liftE
+                  . getArchiveFiles
+                  $ p
     case r of
-      VRight (Just basePath) -> do
+      VRight (Just entries) -> do
         case _dlSubdir dli of
           Just (RealDir prel) -> do
             logInfo
               $ " verifying subdir: " <> T.pack prel
-            when (basePath /= prel) $ do
+            when (normalise prel `notElem` fmap (normalise . takeDirectory) entries) $ do
               logError $
-                "Subdir doesn't match: expected " <> T.pack prel <> ", got " <> T.pack basePath
+                "Subdir doesn't match: expected " <> T.pack prel
               runReaderT addError ref
           Just (RegexDir regexString) -> do
             logInfo $
@@ -279,9 +296,9 @@ validateTarballs (TarballFilter etool versionRegex) = do
                   compIgnoreCase
                   execBlank
                   regexString
-            unless (match regex basePath) $ do
+            unless (or $ fmap (match regex. normalise) entries) $ do
               logError $
-                "Subdir doesn't match: expected regex " <> T.pack regexString <> ", got " <> T.pack basePath
+                "Subdir doesn't match: expected regex " <> T.pack regexString
               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.10
+    , bytestring            ^>=0.11
     , containers            ^>=0.6
     , deepseq               ^>=1.4
     , filepath              ^>=1.4.2.1
-    , ghcup                 ^>=0.1.17.3
-    , haskus-utils-variant  ^>=3.2
+    , ghcup                 ^>=0.1.19.0
+    , haskus-utils-variant  ^>=3.3
     , libarchive            ^>=3.0.3.0
-    , megaparsec            ^>=9.0
+    , megaparsec            >=8.0.0      && <9.3
     , 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                  ^>=1.2.4.0
+    , text                  ^>=2.0
     , transformers          ^>=0.5
-    , versions              >=4.0.1    && <5.1
+    , versions              >=6.0.0
     , yaml-streamly         ^>=0.12.0