From 9695aaf74f9e45d85a4d0a9336cf77c2715deab8 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 3 May 2020 09:46:28 +0800 Subject: [PATCH] zynq: build experiments again --- hydra/artiq.nix | 1 + zynq.nix | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/hydra/artiq.nix b/hydra/artiq.nix index 3cac412..df7fce8 100644 --- a/hydra/artiq.nix +++ b/hydra/artiq.nix @@ -108,6 +108,7 @@ "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 }, "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 }, "artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git", "emailresponsible": false } } } diff --git a/zynq.nix b/zynq.nix index 2667145..218dff1 100644 --- a/zynq.nix +++ b/zynq.nix @@ -1,5 +1,23 @@ let pkgs = import {}; + zc706 = import { mozillaOverlay = import ; }; artiq-zynq = import { mozillaOverlay = import ; }; + addBuildProducts = drv: drv.overrideAttrs (oldAttrs: { + installPhase = '' + ${oldAttrs.installPhase} + mkdir -p $out/nix-support + for f in $out/*.elf ; do + echo file binary-dist $f >> $out/nix-support/hydra-build-products + done + ''; + }); in -builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq + ( + builtins.mapAttrs (name: drv: + pkgs.lib.hydraJob ( + addBuildProducts drv + ) + ) zc706.zc706 + ) // ( + builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq + )