Fix GHC #18774

See ghc#18774 (closed).

Closes ghc#18774 (closed). Closes #1 (closed).

ghc-toolchain.py

@@ -11,7 +11,9 @@ import shutil
 Arch = NewType('Arch', str)
 Url = str
 
-UPSTREAM_URL = 'http://repo.msys2.org/mingw'
+#UPSTREAM_URL = 'http://repo.msys2.org/mingw'
+UPSTREAM_URL = 'https://mirror.selfnet.de/msys2/mingw'
+
 CHECK_SIGNATURES = False
 JAILBREAK = Path('ghc-jailbreak')
 
@@ -30,7 +32,7 @@ def package(name: str, archs: List[Arch] = ARCHS, ext: str = 'zst') -> Dict[Arch
 # Version numbers
 crt_ver = '8.0.0.5905.066f1b3c'
 winpthreads_ver = '8.0.0.5904.1278c953'
-gcc_ver = '10.1.0'
+gcc_ver = '10.2.0'
 
 # type: List[Dict[Arch, Url]]
 packages = [
@@ -45,10 +47,10 @@ packages = [
     package('zstd-1.4.5-1'),
     package('binutils-2.34-2'),
     package('libidn2-2.3.0-1', ext='xz'),
-    package(f'gcc-{gcc_ver}-2'),
+    package(f'gcc-{gcc_ver}-3'),
     package('mpc-1.1.0-1', ext='xz'),
     package('windows-default-manifest-6.4-3', ext='xz'),
-    package(f'gcc-libs-{gcc_ver}-2', archs=['i686', 'x86_64']),
+    package(f'gcc-libs-{gcc_ver}-3', archs=['i686', 'x86_64']),
 ]
 
 def download(url: str, dest: Path):