M-Labs
/
nix-scripts
9
0
Fork 8
Code Issues 6 Pull Requests 3 Releases Wiki Activity

disable conda output for now 

Breaks due to GIT_* variables issues, and gets in the way of debugging hydra channel problems.
pull/16/head
Sebastien Bourdeauducq 2019-02-15 00:24:33 +08:00
parent 835f3cf241
commit 28876a34dc
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main.nix
View File

@ -31,20 +31,20 @@ let
in in
start // { start // {
"artiq-board-${board.target}-${board.variant}" = boardBinaries; "artiq-board-${board.target}-${board.variant}" = boardBinaries;
"conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-board.nix" { inherit pkgs; } { #"conda-artiq-board-${board.target}-${board.variant}" = import "${generatedNix}/conda-board.nix" { inherit pkgs; } {
artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; }; # artiqSrc = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; };
boardBinaries = boardBinaries; # boardBinaries = boardBinaries;
target = board.target; # target = board.target;
variant = board.variant; # variant = board.variant;
}; #};
}) {} boards; }) {} boards;
jobs = { jobs = {
conda-artiq = import "${generatedNix}/conda-build.nix" { inherit pkgs; } { #conda-artiq = import "${generatedNix}/conda-build.nix" { inherit pkgs; } {
name = "conda-artiq"; # name = "conda-artiq";
src = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; }; # src = import "${generatedNix}/pkgs/artiq-src.nix" { fetchgit = pkgs.fetchgit; };
recipe = "conda/artiq"; # recipe = "conda/artiq";
}; #};
} // boardJobs // artiqPkgs; } // boardJobs // artiqPkgs;
in in
jobs // { jobs // {