From 22a6d5fb2e27be4c624c17a4d9b7464bdcd06faf Mon Sep 17 00:00:00 2001
From: Stephan Maka <sm@m-labs.hk>
Date: Tue, 22 Dec 2020 01:21:43 +0100
Subject: [PATCH] artiq-full: fix artiq-board paths

---
 artiq-full.nix                                    |  1 +
 artiq-full/artiq-board.nix                        | 10 +++++-----
 {artiq-fast => artiq-full}/generate-identifier.py |  0
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename {artiq-fast => artiq-full}/generate-identifier.py (100%)

diff --git a/artiq-full.nix b/artiq-full.nix
index fb4aca5..3f32f02 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -9,6 +9,7 @@ let
 
     cp -a ${<artiq-fast>} $out/fast
     cp ${./artiq-full}/artiq-board.nix $out
+    cp ${./artiq-full}/generate-identifier.py $out
     cp ${./artiq-full}/conda-artiq-board.nix $out
     cp ${./artiq-full}/extras.nix $out
     cp ${./artiq-full}/*.patch $out
diff --git a/artiq-full/artiq-board.nix b/artiq-full/artiq-board.nix
index 006f144..8cbe0e5 100644
--- a/artiq-full/artiq-board.nix
+++ b/artiq-full/artiq-board.nix
@@ -2,14 +2,14 @@
 #  nix.sandboxPaths = ["/opt"];
 
 { pkgs
-, vivado ? import ./vivado.nix { inherit pkgs; }
+, vivado ? import ./fast/vivado.nix { inherit pkgs; }
 }:
 
 let
-  version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
-  artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
-  artiqpkgs = import ./default.nix { inherit pkgs; };
-  fetchcargo = import ./fetchcargo.nix {
+  version = import ./fast/pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
+  artiqSrc = import ./fast/pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
+  artiqpkgs = import ./fast/default.nix { inherit pkgs; };
+  fetchcargo = import ./fast/fetchcargo.nix {
     inherit (pkgs) stdenv cacert git;
     inherit (artiqpkgs) cargo cargo-vendor;
   };
diff --git a/artiq-fast/generate-identifier.py b/artiq-full/generate-identifier.py
similarity index 100%
rename from artiq-fast/generate-identifier.py
rename to artiq-full/generate-identifier.py