newell
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

move some packages to artiq-full

This commit is contained in:
Sebastien Bourdeauducq 2019-07-17 19:21:06 +08:00
parent dfa5b47d9b
commit a7e8319735
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq-fast.nix
View File

@ -39,13 +39,7 @@ let
inherit pkgs; inherit pkgs;
artiqPkg = artiqpkgs.conda-artiq; artiqPkg = artiqpkgs.conda-artiq;
} // overrides); } // overrides);
jobs = (builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiqpkgs) // { 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 {});
};
in in
jobs // { jobs // {
generated-nix = pkgs.lib.hydraJob generatedNix; # used by artiq-full generated-nix = pkgs.lib.hydraJob generatedNix; # used by artiq-full

8
artiq-full.nix
View File

@ -104,7 +104,13 @@ let
} }
EOF 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 in
jobs // { jobs // {
channel = pkgs.releaseTools.channel { channel = pkgs.releaseTools.channel {