From 06757b311acbb8c30ca7ff781d5e59eb9cde8456 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 1 May 2020 11:30:01 +0800
Subject: [PATCH] zc706: build artiq-zynq

---
 hydra/artiq.nix |  7 ++++---
 zc706.nix       | 23 ++++-------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/hydra/artiq.nix b/hydra/artiq.nix
index 13b2fcb..e205eaf 100644
--- a/hydra/artiq.nix
+++ b/hydra/artiq.nix
@@ -95,7 +95,7 @@
         "zc706": {
             "enabled": 1,
             "hidden": false,
-            "description": "Rust on ZYNQ",
+            "description": "ARTIQ on the Zynq-based ZC706 board",
             "nixexprinput": "nixScripts",
             "nixexprpath": "zc706.nix",
             "checkinterval": 300,
@@ -106,8 +106,9 @@
             "inputs": {
                 "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
                 "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-                "zc706": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/zc706.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-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git", "emailresponsible": false }
             }
         }
     }
diff --git a/zc706.nix b/zc706.nix
index cdb81dd..df90c62 100644
--- a/zc706.nix
+++ b/zc706.nix
@@ -1,20 +1,5 @@
-{ pkgs ? import <nixpkgs> {},
-  zc706-nix ? import <zc706> { mozillaOverlay = import <mozillaOverlay>; },
+{
+  pkgs ? import <nixpkgs> {},
+  artiq-zynq ? import <artiq-zynq> { mozillaOverlay = import <mozillaOverlay>; },
 }:
-let
-  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 (name: drv:
-  pkgs.lib.hydraJob (
-    addBuildProducts drv
-  )
-) zc706-nix.zc706
+builtins.mapAttrs pkgs.lib.hydraJob artiq-zynq