mwojcik
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move conda-artiq-board to artiq-full

This commit is contained in:
Sebastien Bourdeauducq 2019-07-17 22:36:44 +08:00
parent c4b57f341b
commit 14c0bd7103
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq-fast/default.nix
View File

@ -16,11 +16,6 @@ let
in in
start // { start // {
"artiq-board-${board.target}-${board.variant}" = boardBinaries; "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; }) {} boards;
mainPackages = rec { mainPackages = rec {
inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b lit outputcheck; inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b lit outputcheck;

8
artiq-full.nix
View File

@ -8,6 +8,7 @@ let
mkdir $out mkdir $out
cp -a ${<artiq-fast>} $out/fast 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 cp ${./artiq-full/extras.nix} $out/extras.nix
REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD` REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD`
@ -59,7 +60,7 @@ let
artiq-fast = import ./fast { inherit pkgs; }; artiq-fast = import ./fast { inherit pkgs; };
artiq-board = import ./fast/artiq-board.nix { 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 { 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";
@ -106,6 +107,11 @@ let
variant = "master"; variant = "master";
buildCommand = "python -m artiq.gateware.targets.metlino"; 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 EOF
''; '';

4
artiq-fast/conda-artiq-board.nix → artiq-full/conda-artiq-board.nix
View File

@ -4,7 +4,7 @@
with pkgs; with pkgs;
let 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}" { } fakeCondaSource = runCommand "fake-condasrc-artiq-board-${target}-${variant}" { }
'' ''
mkdir -p $out/fake-conda; mkdir -p $out/fake-conda;
@ -40,7 +40,7 @@ let
EOF EOF
chmod 755 $out/fake-conda/build.sh 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}"; name = "conda-artiq-board-${target}-${variant}";
src = fakeCondaSource; src = fakeCondaSource;
}; };