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

zynq: fix nix let statement

This commit is contained in:
Sebastien Bourdeauducq 2021-07-07 18:13:40 +08:00
parent 92d2b24e7c
commit 5ea1d50226
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq-zynq.nix
View File

@ -2,6 +2,11 @@ let
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> {};
artiq-zynq = import <artiq-zynq>; artiq-zynq = import <artiq-zynq>;
artiq-fast = import <artiq-fast> { inherit pkgs; }; artiq-fast = import <artiq-fast> { inherit pkgs; };
zynq-rs = import artiq-zynq.zynq-rs;
# New zynq-rs versions with Kasli-SoC support have the multiboard "szl" package.
# Older versions need the SZL environment variable set to the SZL ELF to be loaded.
szlEnv = if zynq-rs ? "szl" then "${zynq-rs.szl}" else "${zynq-rs.zc706-szl}/szl.elf";
in in
( (
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq
@ -29,12 +34,7 @@ in
]; ];
phases = [ "buildPhase" ]; phases = [ "buildPhase" ];
let buildPhase =
zynq-rs = import artiq-zynq.zynq-rs;
# New zynq-rs versions with Kasli-SoC support have the multiboard "szl" package.
# Older versions need the SZL environment variable set to the SZL ELF to be loaded.
szlEnv = if zynq-rs ? "szl" then "${zynq-rs.szl}" else "${zynq-rs.zc706-szl}/szl.elf";
in buildPhase =
'' ''
echo Power cycling board... echo Power cycling board...
(echo b; sleep 5; echo B; sleep 5) | nc -N -w6 192.168.1.31 3131 (echo b; sleep 5; echo B; sleep 5) | nc -N -w6 192.168.1.31 3131