From edab068ac99a1250c7d0df5eaf103a1dfd2f4656 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Thu, 2 Feb 2017 15:12:28 +0100 Subject: [PATCH] conda: pull in openocd in artiq and artiq-dev --- conda/artiq-dev/meta.yaml | 1 + conda/artiq/meta.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index 5d0a6f349..b5b336cf2 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -22,6 +22,7 @@ requirements: - llvmlite-artiq 0.12.0.dev py35_30 - rust-core-or1k 1.16.0 11 - cargo + - openocd >=0.10 - lit - outputcheck - coverage diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 6b3139deb..dea51840f 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -19,6 +19,7 @@ requirements: - llvmlite-artiq 0.12.0.dev py35_30 - binutils-or1k-linux - pythonparser 1.0 + - openocd >=0.10 - lit - outputcheck - scipy