From 5d8e29eacbd891b9aeb123bb7071aa7cb3f0209e Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 17 Jul 2019 19:35:29 +0800
Subject: [PATCH] include artiq-fast in artiq-full

---
 artiq-full.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/artiq-full.nix b/artiq-full.nix
index 97ce636..d32ad9f 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -6,6 +6,9 @@ let
   generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
     ''
     mkdir $out
+
+    cp -a ${<artiq-fast>} $out/fast
+
     REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD`
     SINARA_SRC_CLEAN=`mktemp -d`
     cp -a ${sinaraSystemsSrc}/. $SINARA_SRC_CLEAN
@@ -53,9 +56,9 @@ let
         "wipm3"
       ];
 
-      artiq-fast = import <artiq-fast> { inherit pkgs; };
-      artiq-board = import <artiq-fast/artiq-board.nix> { inherit pkgs; };
-      conda-artiq-board = import <artiq-fast/conda-artiq-board.nix> { inherit pkgs; };
+      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; };
       src = pkgs.fetchgit {
         url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
         rev = "$REV";
@@ -89,7 +92,7 @@ let
             };
           })) {} variants;
     in
-      generic-kasli // {
+      artiq-fast // generic-kasli // {
         artiq-board-sayma-satellite = artiq-board {
           target = "sayma";
           variant = "satellite";