forked from M-Labs/nix-scripts
move some packages to artiq-full
This commit is contained in:
parent
dfa5b47d9b
commit
a7e8319735
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue