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

Revert "artiq-full: disable other jobs" 

This reverts commit dcad2654a3.
This commit is contained in:
Astro 2020-06-17 22:09:30 +02:00
parent 5496b3fa05
commit 6ba6edd6f2
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artiq-full.nix
View File

@ -253,18 +253,17 @@ let
inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo;
inherit (pythonDeps) sphinxcontrib-wavedrom;
};
jobs = import generatedNix { inherit pkgs; };
_jobs = (import generatedNix { inherit pkgs; }) // sipycoManualPackages // artiqManualPackages // {
jobs = (import generatedNix { inherit pkgs; }) // sipycoManualPackages // artiqManualPackages // {
# This is in the example in the ARTIQ manual - precompile it to speed up
# installation for users.
matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; });
};
in
builtins.mapAttrs (key: value: builtins.trace "full-${key}" pkgs.lib.hydraJob value) jobs // {
#artiq-full = pkgs.releaseTools.channel {
# name = "artiq-full";
# src = generatedNix;
# constituents = builtins.attrValues jobs;
#};
#conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs; } { inherit jobs; };
artiq-full = pkgs.releaseTools.channel {
name = "artiq-full";
src = generatedNix;
constituents = builtins.attrValues jobs;
};
conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs; } { inherit jobs; };
}