Fix armv7

Fix CI
Fix CI for cabal
2023-03-12 18:25:52 +08:00 · 2023-03-12 18:17:00 +08:00 · 2023-03-12 18:10:21 +08:00 · 2023-03-12 18:02:59 +08:00 · 2023-03-12 18:02:44 +08:00 · 2023-03-12 18:02:35 +08:00
8 changed files with 298 additions and 19 deletions
--- a/.github/workflows/bindists.yaml
+++ b/.github/workflows/bindists.yaml
@@ -117,7 +117,7 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: [self-hosted, Linux, ARM64, aarch32-linux]
+          - os: [self-hosted, Linux, ARM64]
            ARCH: ARM
          - os: [self-hosted, Linux, ARM64]
            ARCH: ARM64
--- a/.github/workflows/install-bindist.sh
+++ b/.github/workflows/install-bindist.sh
@@ -13,15 +13,20 @@ source "$GHCUP_INSTALL_BASE_PREFIX"/.ghcup/env || source "$HOME/.bashrc"
 ghcup --version
 which ghcup | grep foobarbaz

+ghcup_fun() {
+	ghcup -v --url-source=file:$METADATA_FILE "$@"
+}
+
 case $TOOL in
 	ghcup)
-		ghcup -v --url-source=file:$METADATA_FILE upgrade --force
+		ghcup_fun upgrade --force
 		;;
-	*) ghcup -v --url-source=file:$METADATA_FILE install $TOOL --set $VERSION
+	*) 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
@@ -34,11 +39,11 @@ EOF

 case $TOOL in
 	ghcup)
-		ghcup --verbose list
+		ghcup_fun list
 		;;
 	hls)
-		ghcup install cabal latest
-		ghcup install ghc --set recommended
+		ghcup_fun install cabal latest
+		ghcup_fun install ghc --set recommended
 		cabal update

 		test_package="bytestring-0.11.1.0"
@@ -70,12 +75,12 @@ case $TOOL in
 				bin=${hls##*/}
 				bin_noexe=${bin/.exe/}
 				if ! [[ "${bin_noexe}" =~ "haskell-language-server-wrapper" ]] && ! [[ "${bin_noexe}" =~ "~" ]] && ! [[ "${bin_noexe}" =~ ".shim" ]] ; then
-					if ghcup install ghc --set "${bin_noexe/haskell-language-server-/}" ; 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 rm ghc "${bin_noexe/haskell-language-server-/}"
+					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"
@@ -99,6 +104,7 @@ case $TOOL in
 		[[ $(./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 ]]
--- a/ghcup-0.0.7.yaml
+++ b/ghcup-0.0.7.yaml
@@ -3497,8 +3497,7 @@ 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
    3.8.1.0:
-      viTags:
-        - Latest
+      viTags: []
      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.8.1.0.md
      viArch:
        A_64:
@@ -3542,6 +3541,51 @@ ghcupDownloads:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.8.1.0/armv7-linux-cabal-3.8.1.0.tar.xz
              dlHash: 836d89aa1c98a3a848b8b691f9b99123f260dcd4cc1163cb77435a31559475fe
+    3.10.1.0:
+      viTags:
+        - Latest
+      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.10.1.0.md
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning: &cabal-31010-64
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.10.1.0/cabal-install-3.10.1.0-x86_64-linux-alpine.tar.xz
+              dlHash: 187fa3d6e69bd8647aea121e469a1c8e4688a704ab88df54e9547c571e1cdd99
+          Linux_Alpine:
+            unknown_versioning: *cabal-31010-64
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.10.1.0/cabal-install-3.10.1.0-x86_64-darwin.tar.xz
+              dlHash: 893a316bd634cbcd08861306efdee86f66ec634f9562a8c59dc616f7e2e14ffa
+          Windows:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.10.1.0/cabal-install-3.10.1.0-x86_64-windows.zip
+              dlHash: 31ca1cd173d4da675bc9790746d6b492cbe204e0332b282141d7ecc8ae43997b
+          FreeBSD:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.10.1.0/cabal-install-3.10.1.0-x86_64-freebsd12.tar.xz
+              dlHash: 135334d4fd6fb6c6afcef17bb54d9c417629ab3f9463814ef9f97e71f3055d90
+        A_32:
+          Linux_UnknownLinux:
+            unknown_versioning: &cabal-31010-32
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.10.1.0/cabal-install-3.10.1.0-i386-linux-deb9.tar.xz
+              dlHash: 3c4a43a3ac1ef80e66953c2a8f83bb51298c21aeb7328ce06534600a7259a866
+          Linux_Alpine:
+            unknown_versioning: *cabal-31010-32
+        A_ARM64:
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.10.1.0/cabal-install-3.10.1.0-aarch64-darwin.tar.xz
+              dlHash: fdabdc4dca42688a97f2b837165af42fcfd4c111d42ddb0d4df7bbebd5c8750e
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.10.1.0/cabal-install-3.10.1.0-aarch64-linux-deb10.tar.xz
+              dlHash: b497e363dcc585e3f4c7c38f574a77d964c2183ded17c51b7d6d34f2863c4e4b
+        A_ARM:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.10.1.0/cabal-install-3.10.1.0-armv7-linux-deb10.tar.xz
+              dlHash: 18a45df098810c7789944b1a7a5858dd73cdb5f963464f119b6f6b0c38c5a79f
  GHCup:
    0.1.19.2:
      viTags:
--- a/ghcup-0.0.7.yaml.sig
+++ b/ghcup-0.0.7.yaml.sig
--- a/ghcup-prereleases-0.0.7.yaml
+++ b/ghcup-prereleases-0.0.7.yaml
@@ -735,9 +735,109 @@ ghcupDownloads:
        dlSubdir: ghc-9.6.0.20230210
        dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230210/ghc-9.6.0.20230210-testsuite.tar.xz
      viTags:
-      - LatestPrerelease
+      - Prerelease
      - base-4.18.0.0

+    9.6.0.20230302:
+      viArch:
+        A_32:
+          Linux_Debian:
+            <10: &ghc-961rc1-32-debian10
+              dlHash: a4a0df9b980da59aaf4d121bddad20e750b17d45f90e8c5cdaa3fd94479087ea
+              dlSubdir: ghc-9.6.0.20230302-i386-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-i386-deb9-linux.tar.xz
+            unknown_versioning: *ghc-961rc1-32-debian10
+          Linux_Mint:
+            unknown_versioning: *ghc-961rc1-32-debian10
+          Linux_Ubuntu:
+            unknown_versioning: *ghc-961rc1-32-debian10
+          Linux_UnknownLinux:
+            unknown_versioning: *ghc-961rc1-32-debian10
+        A_64:
+          Darwin:
+            unknown_versioning:
+              dlHash: 8a291d92b470d412ba531b485b8a7692780334ae7690a3257f666d04ca374733
+              dlSubdir: ghc-9.6.0.20230302-x86_64-apple-darwin
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-apple-darwin.tar.xz
+          Linux_Alpine:
+            unknown_versioning:
+              dlHash: abb24cbd934333d660221ec872c3f11acbd295607c3b6183266fce9fe3158fb0
+              dlSubdir: ghc-9.6.0.20230302-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-alpine3_12-linux-static-int_native.tar.xz
+          Linux_CentOS:
+            ( >= 7 && < 8 ): &ghc-961rc1-64-centos7
+              dlHash: 76b0921881427e49fc0fe9460ca67b6df4236e33b1a64cca88b06f2f0510ffd1
+              dlSubdir: ghc-9.6.0.20230302-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-centos7-linux.tar.xz
+            unknown_versioning: *ghc-961rc1-64-centos7
+          Linux_Debian:
+            (>= 10 && < 11):
+              dlHash: fd7834d8d2615be2620cf657ff3d37fd6d699aaa96175e3e984e50c84414ffa1
+              dlSubdir: ghc-9.6.0.20230302-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-deb10-linux.tar.xz
+            < 10:
+              dlHash: 4aa4ba419265b790277acf8c6169e694d8b419077ed281e65d3461a2a2eafd00
+              dlSubdir: ghc-9.6.0.20230302-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-deb9-linux.tar.xz
+            '>= 11': &ghc-961rc1-64-debian11
+              dlHash: 5137596a6956b779f2e1a9e05cde9dd00b9d68944d2f818f6a95d489dc62d248
+              dlSubdir: ghc-9.6.0.20230302-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-deb11-linux.tar.xz
+            unknown_versioning: *ghc-961rc1-64-debian11
+          Linux_Fedora:
+            '>= 33':
+              dlHash: dd4b1eff940fb2e3b2203b1a6e3e32182fcff9f32c5dfaa9675d72665fac82b4
+              dlSubdir: ghc-9.6.0.20230302-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-fedora33-linux.tar.xz
+            unknown_versioning: *ghc-961rc1-64-centos7
+          Linux_Mint:
+            < 20: &ghc-961rc1-64-ubuntu1804
+              dlHash: 5ea801852c74ecc41dda80f574eaa00f059adac502e6e8c611abc5f6606c7237
+              dlSubdir: ghc-9.6.0.20230302-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-ubuntu18_04-linux.tar.xz
+            '>= 20': &ghc-961rc1-64-ubuntu2004
+              dlHash: 7004f93625c649eed1b44ede3530ccbab3baaaca5cd2f597cfd31051a2615510
+              dlSubdir: ghc-9.6.0.20230302-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-ubuntu20_04-linux.tar.xz
+          Linux_RedHat:
+            unknown_versioning: *ghc-961rc1-64-centos7
+          Linux_Ubuntu:
+            ( >= 16 && < 19 ): *ghc-961rc1-64-ubuntu1804
+            unknown_versioning: *ghc-961rc1-64-ubuntu2004
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlHash: 326397dfa23eee2698dd2491dd57ea5fc3de398cb979d7ed88058eb92d54c730
+              dlSubdir: ghc-9.6.0.20230302-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-rocky8-linux.tar.xz
+          Windows:
+            unknown_versioning:
+              dlHash: 8b669a2ce7f36732aeedcaa9189f8aa9e57c61a0ecc59b3a96d7d4652e23e810
+              dlSubdir: ghc-9.6.0.20230302-x86_64-unknown-mingw32
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-x86_64-unknown-mingw32.tar.xz
+        A_ARM64:
+          Darwin:
+            unknown_versioning:
+              dlHash: ad1c63895bff6fd6e4c206271c481e388f417f086d22172c57b0514e104c2bbc
+              dlSubdir: ghc-9.6.0.20230302-aarch64-apple-darwin
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-aarch64-apple-darwin.tar.xz
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlHash: 45ad27a9d03cb364b9d55da1e96e3b5da8f1f6ad3b472f94df6ec9c9c8621099
+              dlSubdir: ghc-9.6.0.20230302-aarch64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-aarch64-deb10-linux.tar.xz
+      viChangeLog: https://downloads.haskell.org/~ghc/9.6.0.20230302/docs/users_guide/9.6.1-notes.html
+      viSourceDL:
+        dlHash: 5658ff1357a82ffecf52c602b1aade4c63d1184bcbcd8b633dcc6c61a4a636f3
+        dlSubdir: ghc-9.6.0.20230302
+        dlUri: https://downloads.haskell.org/~ghc/9.6.0.20230302/ghc-9.6.0.20230302-src.tar.xz
+      viTags:
+      - base-4.18.0.0
+      - LatestPrerelease
+      viTestDL:
+        dlHash: 50950baf5bee33eb59c0d55913f283fd55d0c739a5bfed4badc42aa094e15f03
+        dlSubdir: ghc-9.6.0.20230302
+        dlUri: https://downloads.haskell.org/ghc/9.6.0.20230302/ghc-9.6.0.20230302-testsuite.tar.xz
+
  Stack:
    2.9.2.1:
      viTags:
--- a/ghcup-prereleases-0.0.7.yaml.sig
+++ b/ghcup-prereleases-0.0.7.yaml.sig
--- a/ghcup-vanilla-0.0.7.yaml
+++ b/ghcup-vanilla-0.0.7.yaml
@@ -2407,7 +2407,6 @@ ghcupDownloads:
              dlHash: 8cf8408544a1a43adf1bbbb0dd6b074efadffc68bfa1a792947c52e825171224
    9.2.5:
      viTags:
-      - Recommended
      - base-4.16.4.0
      viChangeLog: https://downloads.haskell.org/~ghc/9.2.5/docs/html/users_guide/index.html
      viSourceDL:
@@ -2766,7 +2765,6 @@ ghcupDownloads:
              dlHash: 531c0a4708655bc8707ba88b8a72d34b5958fddc519a12359613f6db62f0eb82
    9.4.4:
      viTags:
-      - Latest
      - base-4.17.0.0
      viChangeLog: https://downloads.haskell.org/~ghc/9.4.4/docs/users_guide/9.4.4-notes.html
      viSourceDL:
@@ -2854,6 +2852,106 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghc/9.4.4/ghc-9.4.4-aarch64-apple-darwin.tar.xz
              dlSubdir: ghc-9.4.4-aarch64-apple-darwin
              dlHash: b50507b229e0c418b32e4b6cc060288ba9497fdd912962e3b0707d0a2b003658
+    9.6.1:
+      viArch:
+        A_32:
+          Linux_Debian:
+            <10: &ghc-961-32-deb9
+              dlHash: 5c0a14ec107a99aa084e18cb595cc2d445d6c2fdc5365bbf3b82248205638a85
+              dlSubdir: ghc-9.6.1-i386-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-i386-deb9-linux.tar.xz
+            unknown_versioning: *ghc-961-32-deb9
+          Linux_Mint:
+            unknown_versioning: *ghc-961-32-deb9
+          Linux_Ubuntu:
+            unknown_versioning: *ghc-961-32-deb9
+          Linux_UnknownLinux:
+            unknown_versioning: *ghc-961-32-deb9
+        A_64:
+          Darwin:
+            unknown_versioning:
+              dlHash: 3dcca5e83795b5b7c0af636216dc2ef9c40c70fb368bc7feb2a74921c81445ff
+              dlSubdir: ghc-9.6.1-x86_64-apple-darwin
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-apple-darwin.tar.xz
+          Linux_Alpine:
+            unknown_versioning:
+              dlHash: d2eac4b74b57ad5840cd7f4c7ee2fe11ede74679b71b66a4e784c02eaa059d7f
+              dlSubdir: ghc-9.6.1-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-alpine3_12-linux-static-int_native.tar.xz
+          Linux_CentOS:
+            ( >= 7 && < 8 ): &ghc-961-64-centos7
+              dlHash: c7fb1b5acd69cf0b940bcd4548b423cd5d7ca219f244cee6807fe307e0f08c4e
+              dlSubdir: ghc-9.6.1-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-centos7-linux.tar.xz
+            unknown_versioning: *ghc-961-64-centos7
+          Linux_Debian:
+            (>= 10 && < 11):
+              dlHash: 48d533c88ba2d852c50eaf98859a7779844512d05577f1ced17cc68cc63f4d03
+              dlSubdir: ghc-9.6.1-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-deb10-linux.tar.xz
+            < 10:
+              dlHash: 3c727e93a82ff039fbedd6645518859849130a0fc93b7181cd69a41800aa639c
+              dlSubdir: ghc-9.6.1-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-deb9-linux.tar.xz
+            '>= 11': &ghc-961-64-deb11
+              dlHash: 73222632a1154fd2e54c6920609cb68ddee2915675f04d74b08b24f9cc492ee6
+              dlSubdir: ghc-9.6.1-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-deb11-linux.tar.xz
+            unknown_versioning: *ghc-961-64-deb11
+          Linux_Fedora:
+            '>= 33':
+              dlHash: 5405b5fd66ab30e19c69bfb0eb27ac62069ee2d5af9d413ece835b8ad1e3c15d
+              dlSubdir: ghc-9.6.1-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-fedora33-linux.tar.xz
+            unknown_versioning: *ghc-961-64-centos7
+          Linux_Mint:
+            < 20: &ghc-961-64-ubuntu1804
+              dlHash: 5c9dd525e2cc8a1aed75dbf0676ab51fbcf555960fca9734cbd0a39d0850f64d
+              dlSubdir: ghc-9.6.1-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-ubuntu18_04-linux.tar.xz
+            '>= 20': &ghc-961-64-ubuntu2004
+              dlHash: 95cfd9d1144eb14a01b43474c2ebfe8a50373a8d8ea53ebac461d4fa4878e4ed
+              dlSubdir: ghc-9.6.1-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-ubuntu20_04-linux.tar.xz
+          Linux_RedHat:
+            unknown_versioning: *ghc-961-64-centos7
+          Linux_Ubuntu:
+            ( >= 16 && < 19 ): *ghc-961-64-ubuntu1804
+            unknown_versioning: *ghc-961-64-ubuntu2004
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlHash: 97172efe434bfe27c112f16b3ab3708c1fb3defb5c1d1319c738c7afea95901d
+              dlSubdir: ghc-9.6.1-x86_64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-rocky8-linux.tar.xz
+          Windows:
+            unknown_versioning:
+              dlHash: 6121a889839d8b409f082169365bbfb6ed9e6a1f6ff0531d577ef7c2a9a417fb
+              dlSubdir: ghc-9.6.1-x86_64-unknown-mingw32
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-x86_64-unknown-mingw32.tar.xz
+        A_ARM64:
+          Darwin:
+            unknown_versioning:
+              dlHash: 1729e8cec960879c620917d935a673e54197fa2ee87c62e45c44fad2e522960a
+              dlSubdir: ghc-9.6.1-aarch64-apple-darwin
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-aarch64-apple-darwin.tar.xz
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlHash: 0fd57fdc9e7b9c0850350492deea1c00016d751c89c11478cfe6b6038da0c6db
+              dlSubdir: ghc-9.6.1-aarch64-unknown-linux
+              dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-aarch64-deb10-linux.tar.xz
+      viChangeLog: https://downloads.haskell.org/~ghc/9.6.1/docs/users_guide/9.6.1-notes.html
+      viSourceDL:
+        dlHash: fe5ac909cb8bb087e235de97fa63aff47a8ae650efaa37a2140f4780e21f34cb
+        dlSubdir: ghc-9.6.1
+        dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-src.tar.xz
+      viTags:
+      - Latest
+      - Recommended
+      - base-4.18.0.0
+      viTestDL:
+        dlHash: 8bfa74d102da570cb87fbbc3465c7f778a4e6dc76606fef80207de7e8b64114f
+        dlSubdir: ghc-9.6.1
+        dlUri: https://downloads.haskell.org/~ghc/9.6.1/ghc-9.6.1-testsuite.tar.xz
  Cabal:
    2.4.1.0:
      viTags:
@@ -3090,8 +3188,7 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-armv7-linux-deb10.tar.xz
              dlHash: 12fb9f3d449159fba57108d07b798bd66eb53451782474176580c96cb8663513
    3.6.2.0:
-      viTags:
-        - Recommended
+      viTags: []
      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.2.0.md
      viArch:
        A_64:
@@ -3139,8 +3236,7 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/cabal/cabal-install-3.6.2.0/cabal-install-3.6.2.0-armv7-linux-deb10.tar.xz
              dlHash: 94477e9f318053a9d806fd3f7188014ee4c803d367a943097e5ec4c68536609b
    3.8.1.0:
-      viTags:
-        - Latest
+      viTags: []
      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.8.1.0.md
      viArch:
        A_64:
@@ -3168,6 +3264,39 @@ ghcupDownloads:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.8.1.0/cabal-install-3.8.1.0-aarch64-darwin.tar.xz
              dlHash: f75b129c19cf3aa88cf9885cbf5da6d16f9972c7f770c528ca765b9f0563ada3
+    3.10.1.0:
+      viTags:
+        - Latest
+        - Recommended
+      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.10.1.0.md
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning: &cabal-31010-64
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.10.1.0/cabal-install-3.10.1.0-x86_64-linux-alpine.tar.xz
+              dlHash: 187fa3d6e69bd8647aea121e469a1c8e4688a704ab88df54e9547c571e1cdd99
+          Linux_Alpine:
+            unknown_versioning: *cabal-31010-64
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.10.1.0/cabal-install-3.10.1.0-x86_64-darwin.tar.xz
+              dlHash: 893a316bd634cbcd08861306efdee86f66ec634f9562a8c59dc616f7e2e14ffa
+          Windows:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.10.1.0/cabal-install-3.10.1.0-x86_64-windows.zip
+              dlHash: 31ca1cd173d4da675bc9790746d6b492cbe204e0332b282141d7ecc8ae43997b
+        A_32:
+          Linux_UnknownLinux:
+            unknown_versioning: &cabal-31010-32
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.10.1.0/cabal-install-3.10.1.0-i386-linux-deb9.tar.xz
+              dlHash: 3c4a43a3ac1ef80e66953c2a8f83bb51298c21aeb7328ce06534600a7259a866
+          Linux_Alpine:
+            unknown_versioning: *cabal-31010-32
+        A_ARM64:
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.10.1.0/cabal-install-3.10.1.0-aarch64-darwin.tar.xz
+              dlHash: fdabdc4dca42688a97f2b837165af42fcfd4c111d42ddb0d4df7bbebd5c8750e
  GHCup:
    0.1.19.2:
      viTags:
@@ -3586,8 +3715,7 @@ ghcupDownloads:
              dlSubdir: haskell-language-server-1.8.0.0
              dlHash: 89baeb96588e05785d1e75687ea220c03ceb8a513e5b28ee042f2ed5acb448b8
    1.9.0.0:
-      viTags:
-        - Recommended
+      viTags: []
      viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md
      viPostInstall: *hls-post-install
      viSourceDL:
@@ -3657,6 +3785,7 @@ ghcupDownloads:
    1.9.1.0:
      viTags:
        - Latest
+        - Recommended
      viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md
      viPostInstall: *hls-post-install
      viSourceDL:
--- a/ghcup-vanilla-0.0.7.yaml.sig
+++ b/ghcup-vanilla-0.0.7.yaml.sig
Author	SHA1	Message	Date
Julian Ospald	96b1c8e3e9	Fix armv7	2023-03-12 18:25:52 +08:00
Julian Ospald	60a30d8522	Fix CI	2023-03-12 18:17:00 +08:00
Julian Ospald	7de9fd3a8c	Fix CI for cabal	2023-03-12 18:10:21 +08:00
Julian Ospald	b8606ec3b7	Sign	2023-03-12 18:02:59 +08:00
Julian Ospald	d19cc1d0f0	Clean up empty dlSubdir	2023-03-12 18:02:44 +08:00
Julian Ospald	b703c55991	Add cabal 3.10.1.0 proper	2023-03-12 18:02:35 +08:00
Julian Ospald	8b95d10664	Make latest and recommended match in vanilla channel	2023-03-12 16:25:10 +08:00
Julian Ospald	d5c7e708d8	Add GHC-9.6.1 to vanilla channel	2023-03-12 16:24:06 +08:00
Julian Ospald	fea14b9a06	Add cabal-3.10.1.0 to vanilla channel	2023-03-11 23:32:30 +08:00
Julian Ospald	eadf9b61ba	Fixup prereleases	2023-03-04 12:19:44 +08:00
Julian Ospald	594bd5490d	Merge remote-tracking branch 'origin/pr/82' into develop	2023-03-03 23:51:25 +08:00
Ben Gamari	1fa98afb67	Add ghc-9.6.1-rc1	2023-03-03 10:36:30 -05:00