From 5ea1d50226a082840800ee34d1cb3b8ff646886c Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 7 Jul 2021 18:13:40 +0800 Subject: [PATCH] zynq: fix nix let statement --- artiq-zynq.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/artiq-zynq.nix b/artiq-zynq.nix index b156191..dac7501 100644 --- a/artiq-zynq.nix +++ b/artiq-zynq.nix @@ -2,6 +2,11 @@ let pkgs = import {}; artiq-zynq = import ; artiq-fast = import { 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 ( builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq @@ -29,12 +34,7 @@ in ]; phases = [ "buildPhase" ]; - let - 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 = + buildPhase = '' echo Power cycling board... (echo b; sleep 5; echo B; sleep 5) | nc -N -w6 192.168.1.31 3131