Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d2d43b53e155
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c6516f3c8334
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 31, 2016

  1. doc: add note about xcb (closes #361)

    @jordens
    jordens committed Mar 31, 2016
    3
    Copy the full SHA
    d561681 View commit details

  2. doc: conda channel -> label

    @jordens
    jordens committed Mar 31, 2016
    Copy the full SHA
    c6516f3 View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 doc/manual/installing.rst
10 changes: 8 additions & 2 deletions doc/manual/installing.rst
View file
Original file line number Diff line number Diff line change
@@ -45,10 +45,10 @@ Installing the ARTIQ packages

For this, you need to add our Anaconda repository to your conda configuration::

$ conda config --add channels http://conda.anaconda.org/m-labs/channel/main
$ conda config --add channels http://conda.anaconda.org/m-labs/label/main

.. note::
To use the development versions of ARTIQ, also add the ``dev`` channel (http://conda.anaconda.org/m-labs/channel/dev).
To use the development versions of ARTIQ, also add the ``dev`` label (http://conda.anaconda.org/m-labs/label/dev).
Development versions contain more features, but are not as well-tested and are more likely to contain bugs or inconsistencies.

Then you can install the ARTIQ package, it will pull all the necessary dependencies.
@@ -88,6 +88,12 @@ the existing environments using::

$ conda env list

.. note::
The ``qt5`` package requires (on Linux only) libraries not packaged under the ``m-labs`` conda labels.
Those need to be installed through the Linux distribution's mechanism.
If ``artiq_gui`` does not start because ``it could not find or load the Qt platform plugin "xcb"``, install the various ``libxcb-*`` packages through your distribution's mechanism.
The names of the libraries missing can be obtained from the output of a command like ``ldd [path-to-conda-installation]/envs/artiq-[date]/lib/qt5/plugins/platform/libqxcb.so``.

Preparing the core device FPGA board
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^