From 5cb8c8056bd70885e7de96f46079e660fb1816fc Mon Sep 17 00:00:00 2001 From: Zenithal Date: Mon, 10 Oct 2022 21:44:22 +0800 Subject: [PATCH] stackage: update 7z url Caused by https://github.com/commercialhaskell/stackage-content/commit/19cf2332409df372f03d1e4f259429ad2d15750d Ref to https://github.com/tuna/issues/issues/1595 --- github-raw.py | 2 -- stackage.py | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/github-raw.py b/github-raw.py index a7cce04..17f7e88 100755 --- a/github-raw.py +++ b/github-raw.py @@ -28,8 +28,6 @@ def delete_line_with_gbpdistro(s: str) -> str: REPOS = [ # owner/repo, tree, tree, tree, blob ## for stackage - ["fpco/minghc", "master", "bin", "7z.exe"], - ["fpco/minghc", "master", "bin", "7z.dll"], ["fpco/stackage-content", "master", "stack", "global-hints.yaml"], ## for rosdep { "path": ["ros/rosdistro", "master", "rosdep", "sources.list.d", "20-default.list"], "filter": [ raw_to_mirror, delete_line_with_gbpdistro ] }, diff --git a/stackage.py b/stackage.py index 8150867..da75bfd 100755 --- a/stackage.py +++ b/stackage.py @@ -65,10 +65,14 @@ class StackageSession(object): 'https://mirrors.tuna.tsinghua.edu.cn/github-release/commercialhaskell/stackage-content/') if 'sevenzexe-info' in d: - d['sevenzexe-info']['url'] = 'https://mirrors.tuna.tsinghua.edu.cn/github-raw/fpco/minghc/master/bin/7z.exe' + d['sevenzexe-info']['url'] = d['sevenzexe-info']['url'].replace( + 'https://github.com/commercialhaskell/stackage-content/releases/download/', + 'https://mirrors.tuna.tsinghua.edu.cn/github-release/commercialhaskell/stackage-content/') if 'sevenzdll-info' in d: - d['sevenzdll-info']['url'] = 'https://mirrors.tuna.tsinghua.edu.cn/github-raw/fpco/minghc/master/bin/7z.dll' + d['sevenzdll-info']['url'] = d['sevenzdll-info']['url'].replace( + 'https://github.com/commercialhaskell/stackage-content/releases/download/', + 'https://mirrors.tuna.tsinghua.edu.cn/github-release/commercialhaskell/stackage-content/') for i in ['portable-git', 'stack', 'ghcjs']: del d[i]