From 28876a34dc6497e234e6c5f61523cca9ba5bf52d Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 15 Feb 2019 00:24:33 +0800 Subject: [PATCH] disable conda output for now Breaks due to GIT_* variables issues, and gets in the way of debugging hydra channel problems. --- main.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/main.nix b/main.nix index 89a50bc..e8ca72a 100644 --- a/main.nix +++ b/main.nix @@ -31,20 +31,20 @@ let in start // { "artiq-board-${board.target}-${board.variant}" = boardBinaries; - "conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-board.nix" { inherit pkgs; } { - artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; }; - boardBinaries = boardBinaries; - target = board.target; - variant = board.variant; - }; - }) {} boards; + #"conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-board.nix" { inherit pkgs; } { + # artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; }; + # boardBinaries = boardBinaries; + # target = board.target; + # variant = board.variant; + #}; + }) {} boards; jobs = { - conda-artiq = import "${generatedNix}/conda-build.nix" { inherit pkgs; } { - name = "conda-artiq"; - src = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; }; - recipe = "conda/artiq"; - }; + #conda-artiq = import "${generatedNix}/conda-build.nix" { inherit pkgs; } { + # name = "conda-artiq"; + # src = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; }; + # recipe = "conda/artiq"; + #}; } // boardJobs // artiqPkgs; in jobs // {