From 582e2edf94a7f4615f951dddea38533a3989abda Mon Sep 17 00:00:00 2001
From: zyx <zz593141477@gmail.com>
Date: Fri, 14 Jun 2019 15:47:15 +0800
Subject: [PATCH] Anaconda mirror service is resumed

Signed-off-by: zyx <zz593141477@gmail.com>
---
 _data/mirror_desc.json               |  4 ++
 _posts/help/1970-01-01-anaconda.md   | 63 +++++++++++++++++++++++++++-
 _posts/help/1970-01-01-tensorflow.md |  3 +-
 geninfo/genisolist.ini               | 40 ++++++++++++++++++
 4 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/_data/mirror_desc.json b/_data/mirror_desc.json
index edad907..432f990 100644
--- a/_data/mirror_desc.json
+++ b/_data/mirror_desc.json
@@ -55,6 +55,10 @@
     "name": "alpine",
     "desc": "Alpine Linux 的安装镜像和官方软件包仓库"
   },
+  {
+    "name": "anaconda",
+    "desc": "用于科学计算的 Python 发行版"
+  },
   {
     "name": "antergos",
     "desc": "基于 Arch Linux 的使用 GNOME 3 的发行版，曾用名 Cinnarch"
diff --git a/_posts/help/1970-01-01-anaconda.md b/_posts/help/1970-01-01-anaconda.md
index 6d78fb0..d0d7f27 100644
--- a/_posts/help/1970-01-01-anaconda.md
+++ b/_posts/help/1970-01-01-anaconda.md
@@ -6,4 +6,65 @@ mirrorid: anaconda
 
 ## Anaconda 镜像使用帮助
 
-[关于停止Anaconda镜像服务的通知](../../news/close-anaconda-service/)
\ No newline at end of file
+Anaconda 是一个用于科学计算的 Python 发行版，支持 Linux, Mac, Windows, 包含了众多流行的科学计算、数据分析的 Python 包。
+
+Anaconda 安装包可以到 <https://mirrors.tuna.tsinghua.edu.cn/anaconda/archive/> 下载。
+
+TUNA 还提供了 Anaconda 仓库的镜像，运行以下命令:
+
+```
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/free/
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/main/
+conda config --set show_channel_urls yes
+```
+
+即可添加 Anaconda Python 免费仓库。
+
+运行 `conda install numpy` 测试一下吧。
+
+## Miniconda 镜像使用帮助
+
+Miniconda 是一个 Anaconda 的轻量级替代，默认只包含了 python 和 conda，但是可以通过 pip 和 conda 来安装所需要的包。
+
+Miniconda 安装包可以到 <https://mirrors.tuna.tsinghua.edu.cn/anaconda/miniconda/> 下载。
+
+## Conda 三方源
+
+当前tuna还维护了一些anaconda三方源。
+
+### Conda Forge
+
+```
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/conda-forge/
+```
+
+### msys2
+
+```
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/msys2/
+```
+
+### bioconda
+
+```
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/bioconda/
+```
+
+### menpo
+
+```
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/menpo/
+```
+
+### pytorch
+
+```
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/pytorch/
+
+# for legacy win-64
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/peterjc123/
+```
+
+### 其他三方源
+
+对于conda的其他三方源，如有需要请在[这个issue](https://github.com/tuna/issues/issues/112)中提出请求，我们会综合考虑多方因素来酌情增减。
diff --git a/_posts/help/1970-01-01-tensorflow.md b/_posts/help/1970-01-01-tensorflow.md
index 465e6c0..11baecf 100644
--- a/_posts/help/1970-01-01-tensorflow.md
+++ b/_posts/help/1970-01-01-tensorflow.md
@@ -6,4 +6,5 @@ mirrorid: tensorflow
 
 # TensorFlow 镜像使用帮助
 
-请通过 pypi 安装 TensorFlow。当前 tensorflow 这个仓库已经不再更新，保留下来仅仅是历史原因。
\ No newline at end of file
+请通过 pypi 安装 TensorFlow。当前 tensorflow 这个仓库已经不再更新，保留下来仅仅是历史原因。
+
diff --git a/geninfo/genisolist.ini b/geninfo/genisolist.ini
index 0a1337a..2bd84c8 100644
--- a/geninfo/genisolist.ini
+++ b/geninfo/genisolist.ini
@@ -290,6 +290,46 @@ type = $4
 version = MikTeX $1
 category = app
 
+[anaconda3]
+distro = Conda
+listvers = 1
+location = anaconda/archive/Anaconda*
+pattern = (Anaconda3)-(\d+.\d+.\d+)-(Windows|Linux|MacOSX)-(x86_64|x86).\w+
+platform = $3
+type = $4
+version = $1 $2
+category = app
+
+[anaconda2]
+distro = Conda
+listvers = 1
+location = anaconda/archive/Anaconda*
+pattern = (Anaconda2)-(\d+.\d+.\d+)-(Windows|Linux|MacOSX)-(x86_64|x86).\w+
+platform = $3
+type = $4
+version = $1 $2
+category = app
+
+[miniconda3]
+distro = Conda
+listvers = 1
+location = anaconda/miniconda/Miniconda*
+pattern = (Miniconda3)-(\d+.\d+.\d+)-(Windows|Linux|MacOSX)-(x86_64|x86).\w+
+platform = $3
+type = $4
+version = $1 $2
+category = app
+
+[miniconda2]
+distro = Conda
+listvers = 1
+location = anaconda/miniconda/Miniconda*
+pattern = (Miniconda2)-(\d+.\d+.\d+)-(Windows|Linux|MacOSX)-(x86_64|x86).\w+
+platform = $3
+type = $4
+version = $1 $2
+category = app
+
 [lineageos]
 distro = LineageOS
 listvers = 1