From 8fca6dc6fc5ab7473b17f08ddbf2a5e89feca8ed Mon Sep 17 00:00:00 2001 From: Jingbei Li Date: Fri, 24 May 2019 13:48:38 +0800 Subject: [PATCH 01/16] updated help for arch4edu added instructions to import gpg key --- _posts/help/2019-03-18-arch4edu.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/_posts/help/2019-03-18-arch4edu.md b/_posts/help/2019-03-18-arch4edu.md index 81073da..239e0a3 100644 --- a/_posts/help/2019-03-18-arch4edu.md +++ b/_posts/help/2019-03-18-arch4edu.md @@ -15,7 +15,22 @@ Arch4edu 是面向高校用户推出的非官方软件仓库， ### 使用方法 -在 `/etc/pacman.conf` 文件末尾添加以下内容： +* 导入 GPG key + +``` +$ pacman-key --recv-keys 7931B6D628C8D3BA +$ pacman-key --finger 7931B6D628C8D3BA +$ pacman-key --lsign-key 7931B6D628C8D3BA +``` + +* 在 `/etc/pacman.conf` 文件末尾添加以下内容： + +``` +[arch4edu] +Server = https://mirrors.tuna.tsinghua.edu.cn/arch4edu/$arch +``` + +* [**不推荐**] 不导入 GPG key，并直接在 `/etc/pacman.conf` 文件末尾添加以下内容： ``` [arch4edu] From 8f05714ac87216e53de1d1ae5195c057902707eb Mon Sep 17 00:00:00 2001 From: zyx Date: Sat, 15 Jun 2019 10:39:35 +0800 Subject: [PATCH 02/16] fix date field Signed-off-by: zyx --- _posts/news/2019-06-15-restore-anaconda.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/news/2019-06-15-restore-anaconda.md b/_posts/news/2019-06-15-restore-anaconda.md index d1e540c..0d3366f 100644 --- a/_posts/news/2019-06-15-restore-anaconda.md +++ b/_posts/news/2019-06-15-restore-anaconda.md @@ -1,7 +1,7 @@ --- layout: news title: "Anaconda 镜像即将恢复" -date: 2019-04-16 +date: 2019-06-15 author: Xavier Yao category: news --- @@ -10,4 +10,4 @@ category: news 根据我们的理解，Anaconda, Inc. 方面 **有意愿** 在镜像站同意提供流量信息的前提下将镜像权限开放给教育科研机构。但请有意愿架设 Anaconda 镜像站（包括成为 TUNA 下游）的个人及团体注意，根据 Anaconda [软件源](https://repo.continuum.io/pkgs/)上的说明，Anaconda 和 Miniconda 是 Anaconda, Inc. 的商标，任何未经授权的公开镜像都是不允许的。**请严格遵循 Anaconda, Inc. 官方正式公布的规定进行镜像**，TUNA不对因此产生的法律后果负责。 -感谢您的理解与支持！ \ No newline at end of file +感谢您的理解与支持！ From 5cb90db430527c58b1b3b28c5a2b2c9db66ffd05 Mon Sep 17 00:00:00 2001 From: Wang Kang Date: Thu, 20 Jun 2019 17:44:25 +0800 Subject: [PATCH 03/16] Update 1970-01-01-raspbian.md --- _posts/help/1970-01-01-raspbian.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/help/1970-01-01-raspbian.md b/_posts/help/1970-01-01-raspbian.md index 06cd8db..bd6cf2a 100644 --- a/_posts/help/1970-01-01-raspbian.md +++ b/_posts/help/1970-01-01-raspbian.md @@ -67,7 +67,7 @@ deb http://mirrors.tuna.tsinghua.edu.cn/raspbian/raspbian/ {{release_name}} main deb-src http://mirrors.tuna.tsinghua.edu.cn/raspbian/raspbian/ {{release_name}} main non-free contrib # 编辑 `/etc/apt/sources.list.d/raspi.list` 文件，删除原文件所有内容，用以下内容取代： -deb http://mirrors.tuna.tsinghua.edu.cn/raspberrypi/ {{release_name}} main +deb http://mirrors.tuna.tsinghua.edu.cn/raspberrypi/ {{release_name}} main ui {% endraw %} From d5034b4b17489355646b42f6a104a2b5bddc4092 Mon Sep 17 00:00:00 2001 From: KspLite <47049071+KspLite@users.noreply.github.com> Date: Tue, 25 Jun 2019 13:02:58 +0800 Subject: [PATCH 04/16] add help --- _posts/help/2019-6-25-solus.md | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 _posts/help/2019-6-25-solus.md diff --git a/_posts/help/2019-6-25-solus.md b/_posts/help/2019-6-25-solus.md new file mode 100644 index 0000000..7f5db3a --- /dev/null +++ b/_posts/help/2019-6-25-solus.md @@ -0,0 +1,35 @@ +--- +category: help +layout: help +mirrorid: solus +--- + +## Solus 镜像使用帮助 + +Solus 是一个界面美观，对新手友好的 Linux 发行版，使用 `eopkg` 作为包管理器。 + +* 项目地址： +*  镜像地址： + +### 使用方法 + +执行以下命令 + +``` +sudo eopkg add-repo Tuna https://mirrors.tuna.tsinghua.edu.cn/solus/shannon/eopkg-index.xml.xz +``` + +此后，之行以下命令以启用 Tuna 源，禁用官方源 + +``` +sudo eopkg enable-repo Tuna +sudo eopkg disable-repo Solus +``` + +或者用 Tuna 源直接覆盖官方源 + +``` +sudo eopkg add-repo Solus https://mirrors.tuna.tsinghua.edu.cn/solus/shannon/eopkg-index.xml.xz +``` + +关于 `eopkg` 命令的详细用法，请执行 `eopkg help` 查看帮助。 From d4c60b8bf13a09dc55536d70df80bbdc2fc6dec5 Mon Sep 17 00:00:00 2001 From: KspLite <47049071+KspLite@users.noreply.github.com> Date: Tue, 25 Jun 2019 13:03:38 +0800 Subject: [PATCH 05/16] add help page --- _posts/help/{2019-6-25-solus.md => 2019-06-25-solus.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename _posts/help/{2019-6-25-solus.md => 2019-06-25-solus.md} (100%) diff --git a/_posts/help/2019-6-25-solus.md b/_posts/help/2019-06-25-solus.md similarity index 100% rename from _posts/help/2019-6-25-solus.md rename to _posts/help/2019-06-25-solus.md From 227b015333a3ef26985deb93b5811738b593245c Mon Sep 17 00:00:00 2001 From: KspLite <47049071+KspLite@users.noreply.github.com> Date: Tue, 25 Jun 2019 13:06:07 +0800 Subject: [PATCH 06/16] replace 'SolusOS' with 'Solus' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SolusOS 与 Solus 是两个不同的发行版。 --- _data/mirror_desc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/mirror_desc.json b/_data/mirror_desc.json index 432f990..72d2682 100644 --- a/_data/mirror_desc.json +++ b/_data/mirror_desc.json @@ -577,7 +577,7 @@ }, { "name": "solus", - "desc": "SolusOS 的软件仓库，致力于制作对新手友好的发行版" + "desc": "Solus 的软件仓库，致力于制作对新手友好的发行版" }, { "name": "stackage", From 6abb834e53924129085c268a75acdce902692fa4 Mon Sep 17 00:00:00 2001 From: DHuan Date: Fri, 5 Jul 2019 13:10:01 +0800 Subject: [PATCH 07/16] Update docs for stack v2.1.1 . --- _posts/help/1970-01-01-hackage.md | 32 +++++++++++++++++++++++++++--- _posts/help/1970-01-01-stackage.md | 16 +++++++++++++-- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/_posts/help/1970-01-01-hackage.md b/_posts/help/1970-01-01-hackage.md index a7d8d5a..52c4eee 100644 --- a/_posts/help/1970-01-01-hackage.md +++ b/_posts/help/1970-01-01-hackage.md @@ -4,9 +4,9 @@ layout: help mirrorid: hackage --- -## hackage 镜像使用帮助 +# hackage 镜像使用帮助 -### 初次使用 +## 在`cabel`中初次使用 先执行 @@ -53,7 +53,33 @@ remote-repo: mirrors.tuna.tsinghua.edu.cn:http://mirrors.tuna.tsinghua.edu.cn/ha 再执行`cabal update`, 即可使用`cabal`安装包了。 -### 在 [`stack`](https://github.com/commercialhaskell/stack) 中使用 +## 在 [`stack`](https://github.com/commercialhaskell/stack) 中使用 + +### stack > v2.1.1 + +修改`~/.stack/config.yaml`, 加上: + +```yaml +package-indices: + - download-prefix: http://mirrors.tuna.tsinghua.edu.cn/hackage + hackage-security: + keyids: + - 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d + - 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42 + - 280b10153a522681163658cb49f632cde3f38d768b736ddbc901d99a1a772833 + - 2a96b1889dc221c17296fcc2bb34b908ca9734376f0f361660200935916ef201 + - 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3 + - 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921 + - 772e9f4c7db33d251d5c6e357199c819e569d130857dc225549b40845ff0890d + - aa315286e6ad281ad61182235533c41e806e5a787e0b6d1e7eef3f09d137d2e9 + - fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0 + key-threshold: 3 # number of keys required + + # ignore expiration date, see https://github.com/commercialhaskell/stack/pull/4614 + ignore-expiry: no +``` + +### stack < v2.1.1 修改`~/.stack/config.yaml`, 加上: diff --git a/_posts/help/1970-01-01-stackage.md b/_posts/help/1970-01-01-stackage.md index 98586d4..e34e724 100644 --- a/_posts/help/1970-01-01-stackage.md +++ b/_posts/help/1970-01-01-stackage.md @@ -6,6 +6,20 @@ mirrorid: stackage ## stackage 镜像使用帮助 +本镜像推荐与 TUNA 的 [Hackage 镜像](https://mirrors.tuna.tsinghua.edu.cn/help/hackage/)配合使用。 + +### stack >= v2.1.1 + +修改`~/.stack/config.yaml`（在 Windows 下是 `%APPDATA%\stack\config.yaml`）, 加上: + +```yaml +setup-info: "http://mirrors.tuna.tsinghua.edu.cn/stackage/stack-setup.yaml" +urls: + latest-snapshot: http://mirrors.tuna.tsinghua.edu.cn/stackage/snapshots.json +``` + +### stack < v2.1.1 + 修改`~/.stack/config.yaml`（在 Windows 下是 `%APPDATA%\stack\config.yaml`）, 加上: ```yaml @@ -15,5 +29,3 @@ urls: lts-build-plans: http://mirrors.tuna.tsinghua.edu.cn/stackage/lts-haskell/ nightly-build-plans: http://mirrors.tuna.tsinghua.edu.cn/stackage/stackage-nightly/ ``` - -推荐与 TUNA 的 [Hackage 镜像](https://mirrors.tuna.tsinghua.edu.cn/help/hackage/)配合使用。 From 8ccba360364377d04f67efdfc35edffd5fab2f3f Mon Sep 17 00:00:00 2001 From: DHuan Date: Fri, 5 Jul 2019 21:17:01 +0800 Subject: [PATCH 08/16] Update _posts/help/1970-01-01-hackage.md Co-Authored-By: dramforever --- _posts/help/1970-01-01-hackage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/help/1970-01-01-hackage.md b/_posts/help/1970-01-01-hackage.md index 52c4eee..dadea05 100644 --- a/_posts/help/1970-01-01-hackage.md +++ b/_posts/help/1970-01-01-hackage.md @@ -61,7 +61,7 @@ remote-repo: mirrors.tuna.tsinghua.edu.cn:http://mirrors.tuna.tsinghua.edu.cn/ha ```yaml package-indices: - - download-prefix: http://mirrors.tuna.tsinghua.edu.cn/hackage + - download-prefix: http://mirrors.tuna.tsinghua.edu.cn/hackage/ hackage-security: keyids: - 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d From 79bd979dca78a0892d2f56f57e4abd9a92b3e66f Mon Sep 17 00:00:00 2001 From: DHuan Date: Sun, 7 Jul 2019 21:51:09 +0800 Subject: [PATCH 09/16] Update 1970-01-01-hackage.md Fix typo. --- _posts/help/1970-01-01-hackage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/help/1970-01-01-hackage.md b/_posts/help/1970-01-01-hackage.md index dadea05..15098dd 100644 --- a/_posts/help/1970-01-01-hackage.md +++ b/_posts/help/1970-01-01-hackage.md @@ -6,7 +6,7 @@ mirrorid: hackage # hackage 镜像使用帮助 -## 在`cabel`中初次使用 +## 在`cabal`中初次使用 先执行 From 525df93f4c93b4f6dc5786cd31b2a176c6f16350 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Mon, 8 Jul 2019 14:08:50 +0800 Subject: [PATCH 11/16] hackage: fix stack 2.1.1 version not in range bug --- _posts/help/1970-01-01-hackage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/help/1970-01-01-hackage.md b/_posts/help/1970-01-01-hackage.md index 15098dd..fc79c3d 100644 --- a/_posts/help/1970-01-01-hackage.md +++ b/_posts/help/1970-01-01-hackage.md @@ -55,7 +55,7 @@ remote-repo: mirrors.tuna.tsinghua.edu.cn:http://mirrors.tuna.tsinghua.edu.cn/ha ## 在 [`stack`](https://github.com/commercialhaskell/stack) 中使用 -### stack > v2.1.1 +### stack >= v2.1.1 修改`~/.stack/config.yaml`, 加上: From 73ad52fb02c3da34d80490d33b3c9e975081924e Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Mon, 8 Jul 2019 10:55:34 +0200 Subject: [PATCH 12/16] Update homebrew instructions Allow homebrew changes from any directory and remove mirrors of empty homebrew taps. --- _posts/help/1970-01-01-homebrew.md | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/_posts/help/1970-01-01-homebrew.md b/_posts/help/1970-01-01-homebrew.md index 533e303..207572a 100644 --- a/_posts/help/1970-01-01-homebrew.md +++ b/_posts/help/1970-01-01-homebrew.md @@ -11,25 +11,9 @@ mirrorid: homebrew ### 替换现有上游 ``` -cd "$(brew --repo)" -git remote set-url origin https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/brew.git +git -C "$(brew --repo)" remote set-url origin https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/brew.git -cd "$(brew --repo)/Library/Taps/homebrew/homebrew-core" -git remote set-url origin https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/homebrew-core.git - -brew update -``` - -### 使用homebrew-science或者homebrew-python - -(已经deprecated了) - -``` -cd "$(brew --repo)/Library/Taps/homebrew/homebrew-science" -git remote set-url origin https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/homebrew-science.git - -cd "$(brew --repo)/Library/Taps/homebrew/homebrew-python" -git remote set-url origin https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/homebrew-python.git +git -C "$(brew --repo homebrew/core)" remote set-url origin https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/homebrew-core.git brew update ``` @@ -39,11 +23,9 @@ brew update _(感谢Snowonion Lee提供说明)_ ``` -cd "$(brew --repo)" -git remote set-url origin https://github.com/Homebrew/brew.git +git -C "$(brew --repo)" remote set-url origin https://github.com/Homebrew/brew.git -cd "$(brew --repo)/Library/Taps/homebrew/homebrew-core" -git remote set-url origin https://github.com/Homebrew/homebrew-core +git -C "$(brew --repo homebrew/core)" remote set-url origin https://github.com/Homebrew/homebrew-core brew update ``` From a0d64b1b2fe9fb0d14d3dc4cecd5d9aaa837b65e Mon Sep 17 00:00:00 2001 From: paizi Date: Thu, 11 Jul 2019 00:09:29 +0800 Subject: [PATCH 13/16] Add raspbian buster to raspbian help --- _posts/help/1970-01-01-raspbian.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/_posts/help/1970-01-01-raspbian.md b/_posts/help/1970-01-01-raspbian.md index bd6cf2a..bb53f69 100644 --- a/_posts/help/1970-01-01-raspbian.md +++ b/_posts/help/1970-01-01-raspbian.md @@ -39,6 +39,8 @@ Raspbian 是树莓派的开发与维护机构 The Raspbeery Pi Foundation *  wheezy *  jessie +* stretch +* buster 注：Raspbian 系统由于从诞生开始就基于（为了armhf，也必须基于）当时还是 testing 版本的 7.0/wheezy，所以 Raspbian 不倾向于使用 stable/testing @@ -53,7 +55,8 @@ testing 版本的 7.0/wheezy，所以 Raspbian 不倾向于使用 stable/testing From a9942902ec1c3b2ecc1f8a7f5c5fe977d05428e4 Mon Sep 17 00:00:00 2001 From: paizi Date: Thu, 11 Jul 2019 00:10:51 +0800 Subject: [PATCH 14/16] Fix a bug in gitlab-ce help --- _posts/help/1970-01-01-gitlab-ce.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/help/1970-01-01-gitlab-ce.md b/_posts/help/1970-01-01-gitlab-ce.md index b6f1ef9..a8850f4 100644 --- a/_posts/help/1970-01-01-gitlab-ce.md +++ b/_posts/help/1970-01-01-gitlab-ce.md @@ -23,7 +23,7 @@ curl https://packages.gitlab.com/gpg.key 2> /dev/null | sudo apt-key add - &>/de