From 734fa593e4d8d5cc780d5d9de6c14fca732a7c85 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Sun, 14 Feb 2016 14:20:45 +0100 Subject: [PATCH 1/2] conda bitstreams: depend on artiq 0.1 --- conda/artiq-kc705-nist_clock/meta.yaml | 2 +- conda/artiq-kc705-nist_qc1/meta.yaml | 2 +- conda/artiq-kc705-nist_qc2/meta.yaml | 2 +- conda/artiq-pipistrello-nist_qc1/meta.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/artiq-kc705-nist_clock/meta.yaml b/conda/artiq-kc705-nist_clock/meta.yaml index c139d53ec..35503cb4f 100644 --- a/conda/artiq-kc705-nist_clock/meta.yaml +++ b/conda/artiq-kc705-nist_clock/meta.yaml @@ -13,7 +13,7 @@ build: requirements: build: # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. - - artiq 0.0 + - artiq 0.1 - migen 0.2 - misoc 0.1 - llvm-or1k diff --git a/conda/artiq-kc705-nist_qc1/meta.yaml b/conda/artiq-kc705-nist_qc1/meta.yaml index 16707ac83..1fb36ffd5 100644 --- a/conda/artiq-kc705-nist_qc1/meta.yaml +++ b/conda/artiq-kc705-nist_qc1/meta.yaml @@ -13,7 +13,7 @@ build: requirements: build: # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. - - artiq 0.0 + - artiq 0.1 - migen 0.2 - misoc 0.1 - llvm-or1k diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml index c5dd2fa23..59eaab699 100644 --- a/conda/artiq-kc705-nist_qc2/meta.yaml +++ b/conda/artiq-kc705-nist_qc2/meta.yaml @@ -13,7 +13,7 @@ build: requirements: build: # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. - - artiq 0.0 + - artiq 0.1 - migen 0.2 - misoc 0.1 - llvm-or1k diff --git a/conda/artiq-pipistrello-nist_qc1/meta.yaml b/conda/artiq-pipistrello-nist_qc1/meta.yaml index 580038f0b..f7362c0ea 100644 --- a/conda/artiq-pipistrello-nist_qc1/meta.yaml +++ b/conda/artiq-pipistrello-nist_qc1/meta.yaml @@ -13,7 +13,7 @@ build: requirements: build: # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. - - artiq 0.0 + - artiq 0.1 - migen 0.2 - misoc 0.1 - llvm-or1k From 1cfca74fcb5369bb7fafa18e9fc0b5ef3cdc812d Mon Sep 17 00:00:00 2001 From: whitequark Date: Sun, 14 Feb 2016 13:35:40 +0000 Subject: [PATCH 2/2] conda: remove spurious artiq dep from gateware packages. --- conda/artiq-kc705-nist_clock/meta.yaml | 2 -- conda/artiq-kc705-nist_qc1/meta.yaml | 2 -- conda/artiq-kc705-nist_qc2/meta.yaml | 2 -- conda/artiq-pipistrello-nist_qc1/meta.yaml | 2 -- 4 files changed, 8 deletions(-) diff --git a/conda/artiq-kc705-nist_clock/meta.yaml b/conda/artiq-kc705-nist_clock/meta.yaml index 35503cb4f..233472174 100644 --- a/conda/artiq-kc705-nist_clock/meta.yaml +++ b/conda/artiq-kc705-nist_clock/meta.yaml @@ -12,8 +12,6 @@ build: requirements: build: - # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. - - artiq 0.1 - migen 0.2 - misoc 0.1 - llvm-or1k diff --git a/conda/artiq-kc705-nist_qc1/meta.yaml b/conda/artiq-kc705-nist_qc1/meta.yaml index 1fb36ffd5..a4e8e0533 100644 --- a/conda/artiq-kc705-nist_qc1/meta.yaml +++ b/conda/artiq-kc705-nist_qc1/meta.yaml @@ -12,8 +12,6 @@ build: requirements: build: - # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. - - artiq 0.1 - migen 0.2 - misoc 0.1 - llvm-or1k diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml index 59eaab699..870ad6e6c 100644 --- a/conda/artiq-kc705-nist_qc2/meta.yaml +++ b/conda/artiq-kc705-nist_qc2/meta.yaml @@ -12,8 +12,6 @@ build: requirements: build: - # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. - - artiq 0.1 - migen 0.2 - misoc 0.1 - llvm-or1k diff --git a/conda/artiq-pipistrello-nist_qc1/meta.yaml b/conda/artiq-pipistrello-nist_qc1/meta.yaml index f7362c0ea..e184d5cc4 100644 --- a/conda/artiq-pipistrello-nist_qc1/meta.yaml +++ b/conda/artiq-pipistrello-nist_qc1/meta.yaml @@ -12,8 +12,6 @@ build: requirements: build: - # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. - - artiq 0.1 - migen 0.2 - misoc 0.1 - llvm-or1k