M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

artiq-full: add a boardsWithoutBuildSplit blacklist

This commit is contained in:
Astro 2020-12-27 01:59:39 +01:00
parent e189ee4c8f
commit cc6e7095f3
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
artiq-full.nix
View File

@ -102,13 +102,22 @@ let
"wipm7master" "wipm7master"
"wipm7satellite" "wipm7satellite"
]); ]);
# Splitting the build process into software+gateware does
# not work when artiq embeds compiled firmware into generated
# Vivado input.
boardsWithoutBuildSplit = [
{ target = "sayma"; variant = "rtm"; }
];
vivado = import ./fast/vivado.nix { inherit pkgs; }; vivado = import ./fast/vivado.nix { inherit pkgs; };
artiq-board-import = artiq-board-import = path: import path { inherit pkgs vivado; };
artiq-board = args:
if pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0" if pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0"
then ./artiq-board.nix && ! builtins.elem { inherit (args) target variant; } boardsWithoutBuildSplit
else ./fast/artiq-board.nix; then
artiq-board = import artiq-board-import { inherit pkgs vivado; }; artiq-board-import ./artiq-board.nix args
else
artiq-board-import ./fast/artiq-board.nix args;
conda-artiq-board = import ./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";