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

zynq: use zynq-rs from artiq-zynq

This commit is contained in:
Sebastien Bourdeauducq 2020-09-09 19:11:41 +08:00
parent 51bd917512
commit b3715bbfc8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zynq.nix
View File

@ -1,11 +1,12 @@
let let
zynq-rs = 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.nix";
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> {};
artiq-fast = import <artiq-fast> { inherit pkgs; }; artiq-fast = import <artiq-fast> { inherit pkgs; };
in in
( (
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) zynq-rs builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) zynq-rs-latest
) // ( ) // (
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq
) // { ) // {