Re-sign

Set cabal 3.10.3.0 as recommended
Re-sign
2024-04-10 16:46:25 +08:00 · 2024-04-10 16:45:56 +08:00 · 2024-04-10 16:24:55 +08:00 · 2024-04-10 16:24:35 +08:00 · 2024-04-10 16:17:38 +08:00 · 2024-04-10 16:11:01 +08:00
5 changed files with 102 additions and 28 deletions
--- a/.github/workflows/bindists.yaml
+++ b/.github/workflows/bindists.yaml
@@ -90,6 +90,9 @@ jobs:
          - 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:
--- a/ghcup-0.0.7.yaml
+++ b/ghcup-0.0.7.yaml
@@ -43,6 +43,32 @@ toolRequirements:
          - libncurses6
          - libtinfo6
          notes: ''
+      Linux_Mint:
+        "( >= 20 && < 21 )":
+          distroPKGs:
+          - build-essential
+          - curl
+          - libffi-dev
+          - libffi7
+          - libgmp-dev
+          - libgmp10
+          - libncurses-dev
+          - libncurses5
+          - libtinfo5
+          notes: ''
+        ">= 21": &linux-mint-req21
+          distroPKGs:
+          - build-essential
+          - curl
+          - libffi-dev
+          - libffi8
+          - libgmp-dev
+          - libgmp10
+          - libncurses-dev
+          - libncurses5
+          - libtinfo5
+          notes: ''
+        unknown_versioning: *linux-mint-req21
      Linux_Ubuntu:
        "( >= 20.04 && < 20.10 )":
          distroPKGs:
@@ -68,7 +94,7 @@ toolRequirements:
          - libncurses5
          - libtinfo5
          notes: ''
-        ">= 23":
+        ">= 23": &linux-ubuntu-req23
          distroPKGs:
          - build-essential
          - curl
@@ -78,18 +104,7 @@ toolRequirements:
          - libgmp10
          - libncurses-dev
          notes: ''
-        unknown_versioning:
-          distroPKGs:
-          - build-essential
-          - curl
-          - libffi-dev
-          - libffi6
-          - libgmp-dev
-          - libgmp10
-          - libncurses-dev
-          - libncurses5
-          - libtinfo5
-          notes: ''
+        unknown_versioning: *linux-ubuntu-req23
      Linux_CentOS:
        '( >= 7 && < 8 )':
          distroPKGs:
@@ -4979,8 +4994,7 @@ ghcupDownloads:
            unknown_versioning: *cabal-31020-arm64
    3.10.2.1:
      viPostInstall: "cabal run is currently partially broken on Windows, please see https://github.com/haskell/cabal/issues/9334"
-      viTags:
-        - Recommended
+      viTags: []
      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.10.2.0.md
      viArch:
        A_64:
@@ -5081,6 +5095,7 @@ ghcupDownloads:
    3.10.3.0:
      viTags:
        - Latest
+        - Recommended
      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.10.3.0.md
      viArch:
        A_64:
--- a/ghcup-0.0.7.yaml.sig
+++ b/ghcup-0.0.7.yaml.sig
--- a/ghcup-0.0.8.yaml
+++ b/ghcup-0.0.8.yaml
@@ -43,6 +43,32 @@ toolRequirements:
          - libncurses6
          - libtinfo6
          notes: ''
+      Linux_Mint:
+        "( >= 20 && < 21 )":
+          distroPKGs:
+          - build-essential
+          - curl
+          - libffi-dev
+          - libffi7
+          - libgmp-dev
+          - libgmp10
+          - libncurses-dev
+          - libncurses5
+          - libtinfo5
+          notes: ''
+        ">= 21": &linux-mint-req21
+          distroPKGs:
+          - build-essential
+          - curl
+          - libffi-dev
+          - libffi8
+          - libgmp-dev
+          - libgmp10
+          - libncurses-dev
+          - libncurses5
+          - libtinfo5
+          notes: ''
+        unknown_versioning: *linux-mint-req21
      Linux_Ubuntu:
        "( >= 20.04 && < 20.10 )":
          distroPKGs:
@@ -68,7 +94,7 @@ toolRequirements:
          - libncurses5
          - libtinfo5
          notes: ''
-        ">= 23":
+        ">= 23": &linux-ubuntu-req23
          distroPKGs:
          - build-essential
          - curl
@@ -78,18 +104,32 @@ toolRequirements:
          - libgmp10
          - libncurses-dev
          notes: ''
-        unknown_versioning:
+        unknown_versioning: *linux-ubuntu-req23
+      Linux_Rocky:
+        '( >= 8 && < 9)':
          distroPKGs:
-          - build-essential
-          - curl
-          - libffi-dev
-          - libffi6
-          - libgmp-dev
-          - libgmp10
-          - libncurses-dev
-          - libncurses5
-          - libtinfo5
+          - gcc
+          - gcc-c++
+          - gmp
+          - gmp-devel
+          - make
+          - ncurses
+          - ncurses-compat-libs
+          - xz
+          - perl
          notes: ''
+        '>= 9': &linux-rocky-req9
+          distroPKGs:
+          - gcc
+          - gcc-c++
+          - gmp
+          - gmp-devel
+          - make
+          - ncurses
+          - xz
+          - perl
+          notes: ''
+        unknown_versioning: *linux-rocky-req9
      Linux_CentOS:
        '( >= 7 && < 8 )':
          distroPKGs:
@@ -144,6 +184,22 @@ toolRequirements:
          - tar
          - xz
          notes: ''
+      Linux_Void:
+        unknown_versioning:
+          distroPKGs:
+          - binutils
+          - curl
+          - gcc
+          - gmp-devel
+          - glibc-devel
+          - libffi-devel
+          - make
+          - ncurses-devel
+          - ncurses-libtinfo-libs
+          - perl
+          - tar
+          - xz
+          notes: These instructions are for glibc based Void. If you use musl flavor, check out https://www.haskell.org/ghcup/install/#void-linux
      Linux_UnknownLinux:
        unknown_versioning:
          distroPKGs: []
@@ -4985,8 +5041,7 @@ ghcupDownloads:
            unknown_versioning: *cabal-31020-arm64
    3.10.2.1:
      viPostInstall: "cabal run is currently partially broken on Windows, please see https://github.com/haskell/cabal/issues/9334"
-      viTags:
-        - Recommended
+      viTags: []
      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.10.2.0.md
      viArch:
        A_64:
@@ -5097,6 +5152,7 @@ ghcupDownloads:
    3.10.3.0:
      viTags:
        - Latest
+        - Recommended
      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.10.3.0.md
      viArch:
        A_64:
--- a/ghcup-0.0.8.yaml.sig
+++ b/ghcup-0.0.8.yaml.sig
Author	SHA1	Message	Date
Julian Ospald	75ff83159f	Re-sign	2024-04-10 16:46:25 +08:00
Julian Ospald	27259a5371	Set cabal 3.10.3.0 as recommended	2024-04-10 16:45:56 +08:00
Julian Ospald	dac355d04e	Re-sign	2024-04-10 16:24:55 +08:00
Julian Ospald	89515a5e88	Don't do newline in tool requirement notes	2024-04-10 16:24:35 +08:00
Julian Ospald	9ff4c6722e	Merge branch 'issue-182' into develop	2024-04-10 16:17:38 +08:00
Julian Ospald	7d12752e39	Add void glibc to bindist installation	2024-04-10 16:11:01 +08:00
Julian Ospald	99f30b6972	Re-sign	2024-04-10 16:08:43 +08:00
Julian Ospald	d982705683	More awesome tool requirements	2024-04-10 16:08:25 +08:00
Julian Ospald	c0e640eaf4	Merge branch 'libffi8' into develop	2024-04-10 16:04:56 +08:00