From 70a3b66c76f8204a3b8f0b63747182f90f09f186 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 6 Jun 2017 15:57:38 +0800
Subject: [PATCH] conda: unbreak channel lists in environment descriptions

---
 conda/artiq-dev.yaml | 5 +++--
 conda/artiq-doc.yaml | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/conda/artiq-dev.yaml b/conda/artiq-dev.yaml
index 66a57cb8b..c8b58bf3e 100644
--- a/conda/artiq-dev.yaml
+++ b/conda/artiq-dev.yaml
@@ -2,8 +2,9 @@
 # $ conda env create -f conda/artiq-dev.yaml
 name: artiq-dev
 channels:
-  - m-labs/label/main
-  - m-labs/label/dev
   - defaults
+  - conda-forge/label/main
+  - m-labs/label/dev
+  - m-labs/label/main
 dependencies:
   - artiq-dev
diff --git a/conda/artiq-doc.yaml b/conda/artiq-doc.yaml
index 1dd1d44bb..bf1ad16f8 100644
--- a/conda/artiq-doc.yaml
+++ b/conda/artiq-doc.yaml
@@ -2,9 +2,10 @@
 # $ conda env create -f conda/artiq-doc.yaml
 name: artiq-doc
 channels:
+  - defaults
+  - conda-forge/label/main
   - m-labs/label/dev
   - m-labs/label/main
-  - defaults
 dependencies:
   - python>=3.5.3,<3.6
   - sphinx=1.4.8