From e4f4584e2ab489e98d66ef4d4bf7cbf5f33eba57 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 15 Feb 2019 23:17:44 +0800 Subject: [PATCH] still trying to understand undocumented 'previous hydra build' option --- sinara-systems.nix | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/sinara-systems.nix b/sinara-systems.nix index f9f9c68..bfc9dfd 100644 --- a/sinara-systems.nix +++ b/sinara-systems.nix @@ -1,29 +1,5 @@ -{ pkgs ? import {}}: +{ pkgs ? import {}, mainBuild}: -let - mainBuild = import ; - #artiq-board = import { inherit pkgs; }; - #conda-artiq-board = import { inherit pkgs; }; - - #target = "kasli"; - - #variants = ["berkeley" "mitll2" "mitll" "nudt" "sysu" "tsinghua2" "tsinghua" "unsw" "ustc" "wipm"]; - #jobs = pkgs.lib.lists.foldr (variant: start: - # let - # json = ../. + "/${variant}.json"; - # boardBinaries = conda-artiq-board { - # inherit target variant; - # buildCommand = "python -m artiq.gateware.targets.kasli_generic ${json}"; - # }; - # in - # start // { - # "artiq-board-${target}-${variant}" = boardBinaries; - # "conda-artiq-board-${target}-${variant}" = conda-artiq-board { - # boardBinaries = boardBinaries; - # inherit target variant; - # }; - #}) {} variants; -in - { - foo = pkgs.runCommand "xxxxabcd" { } "echo ${mainBuild} > $out"; - } +{ + foo = pkgs.runCommand "xxxxabcd" { } "echo ${mainBuild} > $out"; +}