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

zc706 -> zynq-rs

This commit is contained in:
Sebastien Bourdeauducq 2020-08-06 20:30:00 +08:00
parent a7179589bd
commit 536e26b771
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hydra/artiq.nix
View File

@ -96,7 +96,7 @@
"zynq": { "zynq": {
"enabled": 1, "enabled": 1,
"hidden": false, "hidden": false,
"description": "ARTIQ on the Zynq-based ZC706 board", "description": "ARTIQ on Zynq",
"nixexprinput": "nixScripts", "nixexprinput": "nixScripts",
"nixexprpath": "zynq.nix", "nixexprpath": "zynq.nix",
"checkinterval": 300, "checkinterval": 300,
@ -109,7 +109,7 @@
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
"mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla", "emailresponsible": false }, "mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla", "emailresponsible": false },
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false }, "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false },
"zc706": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/zc706.git", "emailresponsible": false }, "zynq-rs": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/zynq-rs.git", "emailresponsible": false },
"artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git", "emailresponsible": false } "artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git", "emailresponsible": false }
} }
} }

4
zynq.nix
View File

@ -1,6 +1,6 @@
let let
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> {};
zc706 = import <zc706> { mozillaOverlay = import <mozillaOverlay>; }; zynq-rs = import <zynq-rs> { mozillaOverlay = import <mozillaOverlay>; };
artiq-zynq = import <artiq-zynq> { mozillaOverlay = import <mozillaOverlay>; }; artiq-zynq = import <artiq-zynq> { mozillaOverlay = import <mozillaOverlay>; };
artiq-fast = import <artiq-fast> { inherit pkgs; }; artiq-fast = import <artiq-fast> { inherit pkgs; };
addBuildProducts = drv: drv.overrideAttrs (oldAttrs: { addBuildProducts = drv: drv.overrideAttrs (oldAttrs: {
@ -18,7 +18,7 @@ in
pkgs.lib.hydraJob ( pkgs.lib.hydraJob (
addBuildProducts drv addBuildProducts drv
) )
) zc706.zc706 ) zynq-rs.zc706
) // ( ) // (
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq
) // { ) // {