From 6ba6edd6f278bf027efc33a02668d6833081f8fe Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Wed, 17 Jun 2020 22:09:30 +0200 Subject: [PATCH] Revert "artiq-full: disable other jobs" This reverts commit dcad2654a391367d06e929e145ea9d518937d117. --- artiq-full.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/artiq-full.nix b/artiq-full.nix index 958b4c4..2c62f6e 100644 --- a/artiq-full.nix +++ b/artiq-full.nix @@ -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; }; }