diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh index 9f661b2d7..a4c2524b9 100755 --- a/.travis/get-anaconda.sh +++ b/.travis/get-anaconda.sh @@ -10,4 +10,4 @@ conda info -a conda install conda-build jinja2 conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION conda config --add channels fallen -conda config --add channels https://conda.binstar.org/fallen/channel/dev +conda config --add channels https://conda.anaconda.org/fallen/channel/dev diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 5784d994a..10bdd61c3 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -36,7 +36,7 @@ Installing the host side software For this, you need to add our binstar repository to your conda configuration:: - $ conda config --add channels http://conda.binstar.org/fallen/channel/dev + $ conda config --add channels http://conda.anaconda.org/fallen/channel/dev Then you can install the ARTIQ package, it will pull all the necessary dependencies::