From 53838bd55f0a7aff24f98dee4be82c66235cf6f9 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 9 Sep 2020 16:51:03 +0800 Subject: [PATCH] zynq: use new zynq-rs --- hydra/artiq.nix | 1 - zynq.nix | 19 +++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/hydra/artiq.nix b/hydra/artiq.nix index 733a694..0724353 100644 --- a/hydra/artiq.nix +++ b/hydra/artiq.nix @@ -107,7 +107,6 @@ "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 }, - "mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla", "emailresponsible": false }, "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "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 } diff --git a/zynq.nix b/zynq.nix index f7ff3eb..f67e02b 100644 --- a/zynq.nix +++ b/zynq.nix @@ -1,24 +1,11 @@ let - pkgs = import {}; - zynq-rs = import { mozillaOverlay = import ; }; + zynq-rs = import ; artiq-zynq = import ; + pkgs = import {}; artiq-fast = import { inherit pkgs; }; - 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 - ) - ) zynq-rs.zc706 + builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) zynq-rs ) // ( builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq ) // {