esavkin
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

zynq: use exposed zynq-rs from artiq-zynq

This commit is contained in:
Sebastien Bourdeauducq 2020-09-09 19:23:53 +08:00
parent 58c9c6f83c
commit de7c867866
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zynq.nix
View File

@ -2,6 +2,8 @@ let
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> {};
zynq-rs-latest = import <zynq-rs>; zynq-rs-latest = import <zynq-rs>;
artiq-zynq = import <artiq-zynq>; artiq-zynq = import <artiq-zynq>;
zynq-rs = import artiq-zynq.zynq-rs;
zc706-szl = (import zynq-rs).zc706-szl;
artiq-fast = import <artiq-fast> { inherit pkgs; }; artiq-fast = import <artiq-fast> { inherit pkgs; };
in in
( (
@ -21,10 +23,7 @@ in
touch $out touch $out
''; '';
}); });
zc706-hitl-tests = pkgs.lib.hydraJob (let zc706-hitl-tests = pkgs.lib.hydraJob (pkgs.stdenv.mkDerivation {
zynq-rs = import "${<artiq-zynq>}/zynq-rs.nix";
zc706-szl = (import zynq-rs).zc706-szl;
in pkgs.stdenv.mkDerivation {
name = "zc706-hitl-tests"; name = "zc706-hitl-tests";
# requires patched Nix # requires patched Nix