From 14c0bd71037491b3e013f588b2ff7dda96550bad Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 17 Jul 2019 22:36:44 +0800
Subject: [PATCH] move conda-artiq-board to artiq-full

---
 artiq-fast/default.nix                           | 5 -----
 artiq-full.nix                                   | 8 +++++++-
 {artiq-fast => artiq-full}/conda-artiq-board.nix | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename {artiq-fast => artiq-full}/conda-artiq-board.nix (87%)

diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index 55815cb..d147bf4 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -16,11 +16,6 @@ let
     in
       start // {
         "artiq-board-${board.target}-${board.variant}" = boardBinaries;
-        "conda-artiq-board-${board.target}-${board.variant}" = import ./conda-artiq-board.nix { inherit pkgs; } {
-          target = board.target;
-          variant = board.variant;
-          boardBinaries = boardBinaries;
-        };
       }) {} boards;
   mainPackages = rec {
     inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b lit outputcheck;
diff --git a/artiq-full.nix b/artiq-full.nix
index c9a4a2f..005730f 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -8,6 +8,7 @@ let
     mkdir $out
 
     cp -a ${<artiq-fast>} $out/fast
+    cp ${./artiq-full/conda-artiq-board.nix} $out/conda-artiq-board.nix
     cp ${./artiq-full/extras.nix} $out/extras.nix
 
     REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD`
@@ -59,7 +60,7 @@ let
 
       artiq-fast = import ./fast { inherit pkgs; };
       artiq-board = import ./fast/artiq-board.nix { inherit pkgs; };
-      conda-artiq-board = import ./fast/conda-artiq-board.nix { inherit pkgs; };
+      conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; };
       src = pkgs.fetchgit {
         url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
         rev = "$REV";
@@ -106,6 +107,11 @@ let
           variant = "master";
           buildCommand = "python -m artiq.gateware.targets.metlino";
         };
+        conda-artiq-board-kc705-nist_clock = conda-artiq-board {
+          target = "kc705";
+          variant = "nist_clock";
+          boardBinaries = artiq-fast.artiq-board-kc705-nist_clock;
+        };
       }
     EOF
     '';
diff --git a/artiq-fast/conda-artiq-board.nix b/artiq-full/conda-artiq-board.nix
similarity index 87%
rename from artiq-fast/conda-artiq-board.nix
rename to artiq-full/conda-artiq-board.nix
index f56d4d4..33064a3 100644
--- a/artiq-fast/conda-artiq-board.nix
+++ b/artiq-full/conda-artiq-board.nix
@@ -4,7 +4,7 @@
 with pkgs;
 
 let
-  version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
+  version = import ./fast/pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
   fakeCondaSource = runCommand "fake-condasrc-artiq-board-${target}-${variant}" { }
     ''
     mkdir -p $out/fake-conda;
@@ -40,7 +40,7 @@ let
     EOF
     chmod 755 $out/fake-conda/build.sh
     '';
-  conda-artiq-board = import ./conda-build.nix { inherit pkgs; } {
+  conda-artiq-board = import ./fast/conda-build.nix { inherit pkgs; } {
     name = "conda-artiq-board-${target}-${variant}";
     src = fakeCondaSource;
   };