esavkin
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

include artiq-fast in artiq-full

This commit is contained in:
Sebastien Bourdeauducq 2019-07-17 19:35:29 +08:00
parent 93667c0fe1
commit 5d8e29eacb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artiq-full.nix
View File

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