From a7e83197350cce08f7e253e16d44306d4f04b94f Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 17 Jul 2019 19:21:06 +0800
Subject: [PATCH] move some packages to artiq-full

---
 artiq-fast.nix | 8 +-------
 artiq-full.nix | 8 +++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/artiq-fast.nix b/artiq-fast.nix
index b2bf620..ecceb97 100644
--- a/artiq-fast.nix
+++ b/artiq-fast.nix
@@ -39,13 +39,7 @@ let
       inherit pkgs;
       artiqPkg = artiqpkgs.conda-artiq;
     } // overrides);
-  jobs = (builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiqpkgs) // {
-    # 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; });
-    # For Raspberry Pi JTAG servers
-    openocd-aarch64 = pkgs.lib.hydraJob ((import <nixpkgs> { system = "aarch64-linux"; }).callPackage ./artiq-fast/pkgs/openocd.nix {});
-  };
+  jobs = (builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiqpkgs);
 in
   jobs // {
     generated-nix = pkgs.lib.hydraJob generatedNix;  # used by artiq-full
diff --git a/artiq-full.nix b/artiq-full.nix
index 68e6275..97ce636 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -104,7 +104,13 @@ let
       }
     EOF
     '';
-  jobs = builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) (import generatedNix { inherit pkgs; });
+  jobs = builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) (import generatedNix { inherit pkgs; }) // {
+    # 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; });
+    # For Raspberry Pi JTAG servers
+    openocd-aarch64 = pkgs.lib.hydraJob ((import <nixpkgs> { system = "aarch64-linux"; }).callPackage ./artiq-fast/pkgs/openocd.nix {});
+  };
 in
   jobs // {
     channel = pkgs.releaseTools.channel {