M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

add some tracing

This commit is contained in:
Astro 2020-06-17 21:11:22 +02:00
parent dcad2654a3
commit c1490f2c68
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq-fast/artiq-board.nix
View File

@ -9,7 +9,7 @@
let
artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
artiqpkgs = import ./default.nix { inherit pkgs; };
artiqpkgs = builtins.trace "artiqpkgs" (import ./default.nix { inherit pkgs; });
fetchcargo = import ./fetchcargo.nix {
inherit (pkgs) stdenv cacert git;
inherit (artiqpkgs) cargo cargo-vendor;
@ -44,7 +44,7 @@ let
'';
};
vivado = import ./vivado.nix { inherit pkgs; };
vivado = builtins.trace "vivado" (import ./vivado.nix { inherit pkgs; });
# Board packages are Python modules so that they get added to the ARTIQ Python
# environment, and artiq_flash finds them.

4
artiq-fast/pkgs/artiq.nix
View File

@ -3,7 +3,7 @@
let
pythonDeps = callPackage ./python-deps.nix {};
in
python3Packages.buildPythonPackage rec {
builtins.trace "artiq" (python3Packages.buildPythonPackage rec {
name = "artiq-${version}";
version = import ./artiq-version.nix { inherit stdenv fetchgit git; };
src = import ./artiq-src.nix { inherit fetchgit; };
@ -26,4 +26,4 @@ in
license = licenses.lgpl3;
maintainers = [ maintainers.sb0 ];
};
}
})

6
artiq-full.nix
View File

@ -3,7 +3,7 @@
let
sinaraSystemsSrc = <sinaraSystemsSrc>;
generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
generatedNix = builtins.trace "full generatedNix" (pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
''
mkdir $out
@ -243,7 +243,7 @@ let
};
}
EOF
'';
'');
pythonDeps = import ./artiq-full/python-deps.nix { inherit pkgs; };
sipycoManualPackages = import ./artiq-full/sipyco-manual.nix {
inherit (pkgs) stdenv lib python3Packages texlive texinfo;
@ -260,7 +260,7 @@ let
matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; });
};
in
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) jobs // {
builtins.mapAttrs (key: value: builtins.trace "full-${key}" pkgs.lib.hydraJob value) jobs // {
#artiq-full = pkgs.releaseTools.channel {
# name = "artiq-full";
# src = generatedNix;