zynq: use zynq-rs from artiq-zynq
This commit is contained in:
parent
51bd917512
commit
b3715bbfc8
5
zynq.nix
5
zynq.nix
|
@ -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
|
||||||
) // {
|
) // {
|
||||||
|
|
Loading…
Reference in New Issue