From b265305f3edd8cbe02b1b95c72f52c49732f3486 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 15 Feb 2019 23:50:44 +0800 Subject: [PATCH] first theoretically working sinara-systems jobset attempt --- sinara-systems.nix | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/sinara-systems.nix b/sinara-systems.nix index 29cc6f4..0b10285 100644 --- a/sinara-systems.nix +++ b/sinara-systems.nix @@ -1,29 +1,27 @@ { pkgs ? import {}}: let - mainChannel = import ; - #artiq-board = import { inherit pkgs; }; - #conda-artiq-board = import { inherit pkgs; }; + artiq-board = import { inherit pkgs; }; + conda-artiq-board = import { inherit pkgs; }; - #target = "kasli"; + 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; + variants = ["berkeley" "mitll2" "mitll" "nudt" "sysu" "tsinghua2" "tsinghua" "unsw" "ustc" "wipm"]; + sinaraSystemsPkgs = 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; + jobs = builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) sinaraSystemsPkgs; in - { - foo = pkgs.runCommand "xxxxabcd" { } "echo ${mainChannel} > $out"; - } + jobs