astro
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: astro:c1490f2c681b7e45877a30aa8e42ee99a60e51b9
Branches Tags
astro:master
astro:pin-nixpkgs
astro:no-stdenv-lib
astro:flakes
astro:jsonschema
astro:board-generated
astro:target-list
astro:artiq-jsonschema
astro:json-schema-for-humans
astro:artiq-board
astro:astro
astro:wfvm
astro:tecpak
astro:stm32-no-overlay
M-Labs:master
..
compare: astro:f5429f28ae7c0fcf6385eac2bedf89f52bbc697e
Branches Tags
astro:pin-nixpkgs
astro:master
astro:no-stdenv-lib
astro:flakes
astro:jsonschema
astro:board-generated
astro:target-list
astro:artiq-jsonschema
astro:json-schema-for-humans
astro:artiq-board
astro:astro
astro:wfvm
astro:tecpak
astro:stm32-no-overlay
M-Labs:master

3 Commits
c1490f2c68 ... f5429f28ae

Author SHA1 Message Date
Astro f5429f28ae add more tracing 2020-06-17 22:10:28 +02:00
Astro 6ba6edd6f2 Revert "artiq-full: disable other jobs" 
This reverts commit dcad2654a3.
 2020-06-17 22:09:30 +02:00
Astro 5496b3fa05 add trace 2020-06-17 22:08:33 +02:00
1 changed files with 8 additions and 9 deletions
Show Stats Expand all files Collapse all files

17
artiq-full.nix
View File

@ -100,7 +100,7 @@ let
"uamsterdam" "uamsterdam"
]); ]);
artiq-board = import ./fast/artiq-board.nix { inherit pkgs; }; artiq-board = builtins.trace "artiq-board" (import ./fast/artiq-board.nix { inherit pkgs; });
conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; }; conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; };
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git"; url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
@ -253,18 +253,17 @@ let
inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo; inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo;
inherit (pythonDeps) sphinxcontrib-wavedrom; 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 # This is in the example in the ARTIQ manual - precompile it to speed up
# installation for users. # installation for users.
matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; }); matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; });
}; };
in in
builtins.mapAttrs (key: value: builtins.trace "full-${key}" pkgs.lib.hydraJob value) jobs // { builtins.mapAttrs (key: value: builtins.trace "full-${key}" pkgs.lib.hydraJob value) jobs // {
#artiq-full = pkgs.releaseTools.channel { artiq-full = builtins.trace "channel" (pkgs.releaseTools.channel {
# name = "artiq-full"; name = "artiq-full";
# src = generatedNix; src = generatedNix;
# constituents = builtins.attrValues jobs; constituents = builtins.attrValues jobs;
#}; });
#conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs; } { inherit jobs; }; conda-channel = builtins.trace "conda-channel" (import ./artiq-full/conda-channel.nix { inherit pkgs; }) { inherit jobs; };
} }