From f35f61b65d35d175b99f432ef5cb425d82af8ca2 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 15 Feb 2019 00:56:56 +0800
Subject: [PATCH] reintroduce conda-board with new version scheme

---
 artiq/conda-board.nix |  4 +---
 main.nix              | 12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/artiq/conda-board.nix b/artiq/conda-board.nix
index 08c9fc1..a8116e3 100644
--- a/artiq/conda-board.nix
+++ b/artiq/conda-board.nix
@@ -12,15 +12,13 @@ let
     cat << EOF > $out/fake-conda/meta.yaml
     package:
       name: artiq-board-${target}-${variant}
-      version: {{ environ["GIT_DESCRIBE_TAG"] }}
+      version: 5e-{{ environ["GIT_FULL_HASH"][:8] }}
 
     source:
       git_url: ..
 
     build:
       noarch: python
-      number: {{ environ["GIT_DESCRIBE_NUMBER"] }}
-      string: {{ environ["GIT_DESCRIBE_NUMBER"] }}+git{{ environ["GIT_FULL_HASH"][:8] }}
       ignore_prefix_files: True
 
     outputs:
diff --git a/main.nix b/main.nix
index e8ca72a..f9e2d9b 100644
--- a/main.nix
+++ b/main.nix
@@ -31,12 +31,12 @@ let
     in
       start // {
         "artiq-board-${board.target}-${board.variant}" = boardBinaries;
-        #"conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-board.nix" { inherit pkgs; } {
-        #  artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; };
-        #  boardBinaries = boardBinaries;
-        #  target = board.target;
-        #  variant = board.variant;
-        #};
+        "conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-board.nix" { inherit pkgs; } {
+          artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; };
+          boardBinaries = boardBinaries;
+          target = board.target;
+          variant = board.variant;
+        };
       }) {} boards;
 
   jobs = {