From 159705f7d2699f09e53764ca4cd59fedf8ef9c9e Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 29 Mar 2024 16:06:24 -0400 Subject: [PATCH 1/5] Add GHC 9.10.1-alpha2 --- ghcup-prereleases-0.0.8.yaml | 114 ++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/ghcup-prereleases-0.0.8.yaml b/ghcup-prereleases-0.0.8.yaml index d3c0e7d..e3ae504 100644 --- a/ghcup-prereleases-0.0.8.yaml +++ b/ghcup-prereleases-0.0.8.yaml @@ -1503,12 +1503,124 @@ ghcupDownloads: dlSubdir: ghc-9.10.0.20240313 dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240313/ghc-9.10.0.20240313-src.tar.xz viTags: - - LatestPrerelease - base-4.20.0.0 viTestDL: dlHash: 25f6ab18123e76bc54b612a306f70707357742cffbd39b78d234d952389ef0d3 dlSubdir: ghc-9.10.0.20240313/testsuite dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240313/ghc-9.10.0.20240313-testsuite.tar.xz + 9.10.0.20240328: + viArch: + A_32: + Linux_Debian: + unknown_versioning: &ghc9101alpha2-i386-deb10 + dlHash: 74a3b7ee82e575174dd16e00ed56902e463a1b1b94b0932896678f3c88dd4dbf + dlOutput: ghc-9.10.0.20240328-i386-linux-deb10.tar.xz + dlSubdir: ghc-9.10.0.20240328-i386-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-i386-deb10-linux.tar.xz + Linux_Mint: + unknown_versioning: *ghc9101alpha2-i386-deb10 + Linux_Ubuntu: + unknown_versioning: *ghc9101alpha2-i386-deb10 + Linux_UnknownLinux: + unknown_versioning: *ghc9101alpha2-i386-deb10 + A_64: + Darwin: + unknown_versioning: + dlHash: 66bdac991e19fc3d72f9452282e533a99c477d2de92de4bd9771f46fdaf3ca07 + dlOutput: ghc-9.10.0.20240328-x86_64-darwin.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-apple-darwin + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-apple-darwin.tar.xz + Linux_Alpine: + unknown_versioning: + dlHash: 63545a41bd69a68606085a7c8049a9ea724584a99d596fa1128892717a1dc2f8 + dlOutput: ghc-9.10.0.20240328-x86_64-linux-alpine3_12.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-alpine3_12-linux.tar.xz + Linux_CentOS: + ( >= 7 && < 8 ): &ghc9101alpha2-x86_64-centos7 + dlHash: 288594a0ff4bc1068cf67f5e39b8f23074a8ef747c9dea444ba85366da73d11f + dlOutput: ghc-9.10.0.20240328-x86_64-linux-centos7.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-centos7-linux.tar.xz + unknown_versioning: *ghc9101alpha2-x86_64-centos7 + Linux_Debian: + (>= 10 && < 11): + dlHash: d15658f8810c1818fadeb27acd6c8e86dbf5574fb42cac4217fc50e22f9ad33b + dlOutput: ghc-9.10.0.20240328-x86_64-linux-deb10.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-deb10-linux.tar.xz + < 10: + dlHash: 734eeb3bb1ecf408102bbc0ef3c541eea1a75f75076dc79bcf8a5585c3c82546 + dlOutput: ghc-9.10.0.20240328-x86_64-linux-deb9.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-deb9-linux.tar.xz + '>= 11': &ghc9101alpha2-x86_64-deb11 + dlHash: 5c83c548ff2969218d3d6a3ab58412a98673333dcfcb7d4b0974d13f384cb7e4 + dlOutput: ghc-9.10.0.20240328-x86_64-linux-deb11.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-deb11-linux.tar.xz + unknown_versioning: *ghc9101alpha2-x86_64-deb11 + Linux_Fedora: + '>= 33': + dlHash: aea39c0070a453f72c42659512770f2069aecbd93cc33cd61f5ea1ae54c2ea8c + dlOutput: ghc-9.10.0.20240328-x86_64-linux-fedora33.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-fedora33-linux.tar.xz + unknown_versioning: *ghc9101alpha2-x86_64-centos7 + Linux_Mint: + < 20: &ghc9101alpha2-x86_64-ubuntu18_04 + dlHash: 81d7db8bd54dace45fe626eb6f588f8f0b9bfd2bd2a6eb7d87101ba12c4fd03c + dlOutput: ghc-9.10.0.20240328-x86_64-linux-ubuntu18_04.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-ubuntu18_04-linux.tar.xz + '>= 20': &ghc9101alpha2-x86_64-ubuntu20_04 + dlHash: 6302e8c2c53d9c77678872384ce6ef86ec96900240559148118e4fa7c942221e + dlOutput: ghc-9.10.0.20240328-x86_64-linux-ubuntu20_04.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-ubuntu20_04-linux.tar.xz + Linux_RedHat: + unknown_versioning: *ghc9101alpha2-x86_64-centos7 + Linux_Ubuntu: + ( >= 16 && < 19 ): *ghc9101alpha2-x86_64-ubuntu18_04 + unknown_versioning: *ghc9101alpha2-x86_64-ubuntu20_04 + Linux_UnknownLinux: + unknown_versioning: + dlHash: 1bc645fec34867ce79aea75e21841a2849ef7d0326bcdc0e18231ba8c2db8863 + dlOutput: ghc-9.10.0.20240328-x86_64-linux-rocky8.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-rocky8-linux.tar.xz + Windows: + unknown_versioning: + dlHash: eedb3bb582e7ee4696d711d844c821e61cbbcdfb0b4aa841c51493efc5c4faf8 + dlOutput: ghc-9.10.0.20240328-x86_64-windows.tar.xz + dlSubdir: ghc-9.10.0.20240328-x86_64-unknown-mingw32 + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-x86_64-unknown-mingw32.tar.xz + A_ARM64: + Darwin: + unknown_versioning: + dlHash: bb8f9c26661f8cec6d2b18494c7a0883e172ba60cd82b89de99b5dd9077148ef + dlOutput: ghc-9.10.0.20240328-aarch64-darwin.tar.xz + dlSubdir: ghc-9.10.0.20240328-aarch64-apple-darwin + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-aarch64-apple-darwin.tar.xz + Linux_UnknownLinux: + unknown_versioning: + dlHash: f42ef12e9cd7cb17fd3fbcc3b65952020704ea4872d0f0124f314badcab0e9c5 + dlOutput: ghc-9.10.0.20240328-aarch64-linux-deb10.tar.xz + dlSubdir: ghc-9.10.0.20240328-aarch64-unknown-linux + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-aarch64-deb10-linux.tar.xz + viChangeLog: https://downloads.haskell.org/~ghc/9.10.0.20240328/docs/users_guide/9.10.1-notes.html + viReleaseDay: '2024-03-28' + viSourceDL: + dlHash: 8b22016002e60dd78bc8ee9292e23fccc8289c0b0612f7430066d06533dfe1d7 + dlSubdir: ghc-9.10.0.20240328 + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-src.tar.xz + viTags: + - LatestPrerelease + - base-4.20.0.0 + viTestDL: + dlHash: a994208264c4eac62eb7129e1a6b7ecbfb25c1a76eba51b69508b97726b020c9 + dlSubdir: ghc-9.10.0.20240328/testsuite + dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240328/ghc-9.10.0.20240328-testsuite.tar.xz Stack: 2.9.2.1: From 8d3f759a52844405ee7443a10762aff1675613e6 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 29 Mar 2024 16:12:32 -0400 Subject: [PATCH 2/5] Re-sign --- ghcup-prereleases-0.0.8.yaml.sig | Bin 682 -> 586 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ghcup-prereleases-0.0.8.yaml.sig b/ghcup-prereleases-0.0.8.yaml.sig index 07031e5ed46458e3b9260badf0292da206896443..590858d27d6d47eeaf3f1593668263c0f227b34a 100644 GIT binary patch literal 586 zcmV-Q0=4~#0!IV@0SEvw79j-x>wM@Q7NcuEE$weD;7v}K+hnZ;0%ivwqZ1rrWo|%s zWo&FMba`-PWG-WGZ2$@h5G~+MPM6zcty~rl|4s|BWx8AABw(r)H*Tza>Nls%?|0{n z&c?VXFWX}=bu{>tZd!UVO=)lmf_YZRB1{4@UZx!b^w6jMnxBqUlR!xQFU)PP+xtiW zmZijRhmkv>r{i#fdc1ynxJdZ_a)ROp0vw9M51iDHH+X znyK{+CtHz0VRwqoHfcib0H4G-R!trU+*`1l5UI&ZFQ^;I+utncPlyW(pxn7qaq#ne zZ}a^g7nlwkt0hP3IeSJA37Bk!z)sqGav(O^0*Aga`*SHhxj#zgnMMfI8POx>Lqt9& z3#e(vw|P%XQAw}de_p?=m=`MaIQffHU7*|^0Z*OE%d{a7>jT=K_RltRmvwfH?^97E zDVv7`v7ZcCjbq!5vh5D>d@0w1HGCegLCnb`c#A>~&`Y78jtlbcZyyt8mjmYC38_?s YbUGeCz=zNwL^LutHA6%}HbF8uLPbP0GZP$WVRLn6Wo&FfaBp*T zWp6HIWdI5Z5JGj$rlOneL!2TH|3~LVCXwJ{rczJ1z6D*fsNJvmW(~r7BZYdwF$4G+10c;YP;mwOpxN*MhBHqM-!GvomjW{cT z$&988ic2KBl~LN10W#hwSP5*RUuqtLb%5=|nV4}l5~DD{^p4fIt`POU%X$Gfk_A9f z4CYE$YYIKlE^d{n2YhA)fXWbV=9POe1#{xYfmWU8MkTQ;XNXwPZ0cKUFi%R`g$HnF zP7d80>&>jt@qgO%I3XKZ9a6y(ZCmfMCMOOWP9@t=o&5~LcQwNrtq1yeO!dEp#|=KI z$nKn3UTD}VIweefluAq5MZ2EG7$xfBR=FM;|_15xH8*=KV&1GwG0e70TOf;$f@Sjj8l6pPwTTgk(`B&^m|I#m&Ljiu8o z2xv07h^{I}&EJt3or72WpfUXBPZNz+C4^r8M@Nlop^4H^2FgiXkPi(Wq`J38w0$s5%=a28ZI!exEki> Q0WA$SV+U5IY^~jA4|IMo&;S4c From b9809328e8257f35177b33ab71f8e5a990ff265f Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 30 Mar 2024 14:24:45 +0800 Subject: [PATCH 3/5] Make sure GHC prerelease pipeline works --- .github/workflows/install-bindist.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/install-bindist.sh b/.github/workflows/install-bindist.sh index 2268ea3..a6c3f1f 100755 --- a/.github/workflows/install-bindist.sh +++ b/.github/workflows/install-bindist.sh @@ -111,12 +111,21 @@ case $TOOL in ghc --info ghc -prof main.hs [[ $(./main +RTS -s) -eq 2 ]] - ghcup_fun install cabal recommended + ghcup install cabal recommended cabal --version cabal update - cabal install --lib --package-env=. clock - # https://github.com/haskell/ghcup-hs/issues/966 - cabal install --lib --package-env=. hashable + 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*) ;; From 237788718c6ba3b33be0da63911ca61164e24462 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 30 Mar 2024 14:32:01 +0800 Subject: [PATCH 4/5] Fix tags in prereleases --- ghcup-prereleases-0.0.8.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ghcup-prereleases-0.0.8.yaml b/ghcup-prereleases-0.0.8.yaml index e3ae504..4571d06 100644 --- a/ghcup-prereleases-0.0.8.yaml +++ b/ghcup-prereleases-0.0.8.yaml @@ -1406,6 +1406,7 @@ ghcupDownloads: dlSubdir: ghc-9.8.0.20230929 dlUri: https://downloads.haskell.org/~ghc/9.8.0.20230929/ghc-9.8.0.20230929-src.tar.xz viTags: + - Prerelease - base-4.19.0.0 viTestDL: dlHash: b0afd2912ba91914519739907ede6008857871668a138829410d72948c3c359e @@ -1503,6 +1504,7 @@ ghcupDownloads: dlSubdir: ghc-9.10.0.20240313 dlUri: https://downloads.haskell.org/~ghc/9.10.0.20240313/ghc-9.10.0.20240313-src.tar.xz viTags: + - Prerelease - base-4.20.0.0 viTestDL: dlHash: 25f6ab18123e76bc54b612a306f70707357742cffbd39b78d234d952389ef0d3 From 98bf80ea7c1dbb7f2ff49cf66fc7ea9fa95c7ae1 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 30 Mar 2024 14:32:10 +0800 Subject: [PATCH 5/5] Re-sign --- ghcup-prereleases-0.0.8.yaml.sig | Bin 586 -> 682 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ghcup-prereleases-0.0.8.yaml.sig b/ghcup-prereleases-0.0.8.yaml.sig index 590858d27d6d47eeaf3f1593668263c0f227b34a..854cc02afef4bf352e13ab5999a96efff879dd6e 100644 GIT binary patch literal 682 zcmV;b0#*Hq0;dE30SW+-79j-eq)%EGF51~g^PW9IbwL^LutHA6%}HbF8uLPbP0GZP$WVRLn6Wo&FfaBp*T zWp6HIWdI5Z5JGj$rlOneLoXc=0GO`1JcYo&<0$^RvEo0+{X2_F@#jtDp|u_REA9J! z2?b2wnc0+jWqUY9b+s&VWNtQ_+Al$MXRMUKpo#6hU|#k*YJ}3Q2ni0q(4c_s(>ugC zoB9i0M=FtV=BC(YCklTZwbO_GL7>s%i2aG2rj7WB6Q}8RLmQ1>!9Csv!@7hpp|#nP z6>M#yMl5o=NhRKU15Vs8Ls2yYI_(6h8L1-g29F)p&*h3pK)ZV}wyv}G8qA^&Aqb9c zu2G$C4^_lx=a9(D%ITG~pf%V;CBzlgBc3Gzkl+ojfv_YRmqV%KOEqkQUxVH?FL4=ym*EZhvH%M zj++X(7|st0CI>0;0K`{bz^y%3IgT=^9-Tb1Xg0q2dSfL{KNw#_PnQ1p5`J`H<5&8b z7IXFpL(Cy3!OEL}p^xisz$iyKl z%2k9$vVMKG8&bSx>1*Lb9d!@n?P$0m1lieX-&$4U0rEGEF^y~cW%`!zsP=OWn#}Pj zj@Vr)CcUI0NkbqnXRVQZi3CkhV$OVJ)R!(>not1EvHBFS@tvXcwswkrDJBj_T0{%3 QlEt)*^uo*4pcnv`8HOAwM@Q7NcuEE$weD;7v}K+hnZ;0%ivwqZ1rrWo|%s zWo&FMba`-PWG-WGZ2$@h5G~+MPM6zcty~rl|4s|BWx8AABw(r)H*Tza>Nls%?|0{n z&c?VXFWX}=bu{>tZd!UVO=)lmf_YZRB1{4@UZx!b^w6jMnxBqUlR!xQFU)PP+xtiW zmZijRhmkv>r{i#fdc1ynxJdZ_a)ROp0vw9M51iDHH+X znyK{+CtHz0VRwqoHfcib0H4G-R!trU+*`1l5UI&ZFQ^;I+utncPlyW(pxn7qaq#ne zZ}a^g7nlwkt0hP3IeSJA37Bk!z)sqGav(O^0*Aga`*SHhxj#zgnMMfI8POx>Lqt9& z3#e(vw|P%XQAw}de_p?=m=`MaIQffHU7*|^0Z*OE%d{a7>jT=K_RltRmvwfH?^97E zDVv7`v7ZcCjbq!5vh5D>d@0w1HGCegLCnb`c#A>~&`Y78jtlbcZyyt8mjmYC38_?s YbUGeCz=zN