From 70e6f77d4d928f2fe15f08350837e73e5a57002f Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Mon, 23 Oct 2017 17:26:41 +0200 Subject: [PATCH] conda: bump openocd to simplify pinning --- conda/artiq-dev/meta.yaml | 2 +- conda/artiq/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index e8689987b..9be90507a 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -22,7 +22,7 @@ requirements: - llvmlite-artiq 0.12.0 - rust-core-or1k 1.20.0 16 - cargo 0.11.0 - - openocd 0.10.0+git 2 + - openocd 0.10.0+git1 - lit - outputcheck - coverage diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index 149cd0f86..eb5d441dd 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -29,7 +29,7 @@ requirements: - llvmlite-artiq 0.12.0 - binutils-or1k-linux - pythonparser >=1.1 - - openocd 0.10.0+git 2 + - openocd 0.10.0+git1 - lit - outputcheck - scipy