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

artiq-board: let artiq-full pass vivado

This commit is contained in:
Astro 2020-06-17 22:21:02 +02:00
parent b876be5ef9
commit 4bfe5420d3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq-fast/artiq-board.nix
View File

@ -2,10 +2,10 @@
# nix.sandboxPaths = ["/opt"]; # nix.sandboxPaths = ["/opt"];
{ pkgs { pkgs
, vivado ? (builtins.trace "vivado" (import ./vivado.nix { inherit pkgs; }))
}: }:
let let
vivado = builtins.trace "vivado" (import ./vivado.nix { inherit pkgs; });
artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; }; artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
artiqpkgs = builtins.trace "artiqpkgs" (import ./default.nix { inherit pkgs; }); artiqpkgs = builtins.trace "artiqpkgs" (import ./default.nix { inherit pkgs; });
fetchcargo = import ./fetchcargo.nix { fetchcargo = import ./fetchcargo.nix {

3
artiq-full.nix
View File

@ -100,7 +100,8 @@ let
"uamsterdam" "uamsterdam"
]); ]);
artiq-board = builtins.trace "artiq-board" (import ./fast/artiq-board.nix { inherit pkgs; }); vivado = builtins.trace "vivado (full)" (import ./vivado.nix { inherit pkgs; });
artiq-board = builtins.trace "artiq-board" (import ./fast/artiq-board.nix { inherit pkgs vivado; });
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";