From d9827056837463dd09a8fbea4848ab31b92a3253 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 10 Apr 2024 16:08:25 +0800 Subject: [PATCH 1/3] More awesome tool requirements --- ghcup-0.0.7.yaml | 41 +++++++++++++++++-------- ghcup-0.0.8.yaml | 80 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 97 insertions(+), 24 deletions(-) diff --git a/ghcup-0.0.7.yaml b/ghcup-0.0.7.yaml index fba71e3..efaaf6c 100644 --- 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: diff --git a/ghcup-0.0.8.yaml b/ghcup-0.0.8.yaml index 0b07271..585fa32 100644 --- 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,24 @@ 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: [] From 99f30b697285dfe608b91467838adfd4d49120c2 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 10 Apr 2024 16:08:43 +0800 Subject: [PATCH 2/3] Re-sign --- ghcup-0.0.7.yaml.sig | Bin 682 -> 682 bytes ghcup-0.0.8.yaml.sig | Bin 682 -> 682 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ghcup-0.0.7.yaml.sig b/ghcup-0.0.7.yaml.sig index 06e98b9419600493dfa9db859b4af49d5b121ac6..b3129223e021ed690acce8a0b3c55e66eac536b7 100644 GIT binary patch delta 533 zcmV+w0_y#$1*!#*BmzkWktTqDpvVvap&|~9AOXNnxv2$TtQ$f_+Mu++J0-a%705le zG&9zuHYm7XpAm=?Ps4bo$wT@)#*Z){tKI++LkLzQmfjPfBDu z`yGT=N(Xp=1XWB90i@E*#~icG!zOu=0?b`xjN6%bf70Aw9+b-_-7GDC4W_zUFOoiY zkK#bTx>EVDwGENkU1V@3*{?O?F4oSh9PvR0v=DT?*DdKoXSodncOO=NxrUsGiF!sdX?%879LGKf%2hd z)n5yirxTv5RfrZUBaH5zuUDc&F;Y34(ButyZpi7xisTjH?mj=mbTdw?k z$#8ca0Nn#MyZOF~D^VG2 zwXIH=ib<;=8~|@EzeoMFL9rnyE_Crj9XEJFNXB~tGtyC`?)isPhBe2Lmseo6>tge> zfXbN=rFZOckzWpRG$f@y7XZ%C@Ei=*I0yc8_+-5-4&JV0SC}JztUhu11B%9QdX>oj z37_|uIPvTsE>1->ICjA7z5&6A(xd9bueO?G_qqfsNeX>))B1-U5G@f3QCF5BrWxht zT_{9EnZm_3J+^(wgvXm-ZHjgGQTlftDs*WQR?o{-fv7~M`Cn-0`qkDL2@!CnagMOA Xl#(Mp2&k2WW4>ev#=dmghDZlInx_Tu diff --git a/ghcup-0.0.8.yaml.sig b/ghcup-0.0.8.yaml.sig index 12fa11ed5d0ddd7228630a7cab6598ca9872dce2..8367f726c3d26447e93160ae6e9c823db02929fa 100644 GIT binary patch delta 533 zcmV+w0_y#$1*!#*BmzkYktTqD`@;|ZI*a`JZ`)JL+ta5nW?eFNK_Ez_8G}84vUm^F@_6MbQ+?*3s0}iJL3+IbgUma)`}UkBxjCxWJGh zFE9chu^mhxueyL6d!OD+$hXg)H;EmSp))|M&`kGHm`sv}2UD3AWv>bNE5aDI=6SAr XXfak>h|@~I?a-YFyC-&wun&BNYN`*u delta 533 zcmV+w0_y#$1*!#*BmzOvktTqDr*;qkiuTHuy0JvcZzoy}vc)6_9opVKV$qLJM_zYL z{r6z>Q&7f3%>-U+v|^XbqO|1z0bh?`gWS{quqb*M(+}LGax?*5q8sT?L5xK{JIgo# zc!o_Z+}yI)8S;Wu%jNnlU#`Qz`p$1-T6)x~ z{j^~TW3w_2DLWFi?U-_ZW=JU(mX;WZbOp%i(FhAy`6Q2Q%_D+U z`LAuu!|2ty z?sR}{Mw*dZQ?n*1>lIdl2rJMyH$X>{kTbV9EQ`OVlWOU;AFQ)lG+X8Ly*kotrBv6y zsaVWU2)^ARXuHJR582)v!M+57O|sV%&s2py XGSWUIP5lV3Mf!ONQ&9yXV;wQ}lb{fJ From 7d12752e39da841d5c787685e8a6518508acc534 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 10 Apr 2024 16:11:01 +0800 Subject: [PATCH 3/3] Add void glibc to bindist installation --- .github/workflows/bindists.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/bindists.yaml b/.github/workflows/bindists.yaml index 1123950..4ee71be 100644 --- 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: