Merge branch 'miniconda-installer' into dev

sci-bots · Nov 10, 2016 · b97cd07 · b97cd07
2 parents 74171ab + 4bf2104
commit b97cd07
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.miniconda-recipe/construct.yaml b/.miniconda-recipe/construct.yaml
@@ -2,8 +2,8 @@ name: MicroDrop
 version: {{ GIT_DESCRIBE_TAG[1:] }}
 
 channels:
-  - http://repo.continuum.io/pkgs/free/
   - https://conda.anaconda.org/wheeler-microfluidics/
+  - http://repo.continuum.io/pkgs/free/
 
 specs:
   - python 2.7*
@@ -20,5 +20,9 @@ specs:
 
 license_file: EULA.txt
 
+conda_default_channels:
+  - https://conda.anaconda.org/wheeler-microfluidics/
+  - http://repo.continuum.io/pkgs/free/
+
 # Welcome image for Windows installer
 welcome_image: logo.png                  [win]