From c1490f2c681b7e45877a30aa8e42ee99a60e51b9 Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Wed, 17 Jun 2020 21:11:22 +0200 Subject: [PATCH] add some tracing --- artiq-fast/artiq-board.nix | 4 ++-- artiq-fast/pkgs/artiq.nix | 4 ++-- artiq-full.nix | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/artiq-fast/artiq-board.nix b/artiq-fast/artiq-board.nix index f74b0c9..8799882 100644 --- a/artiq-fast/artiq-board.nix +++ b/artiq-fast/artiq-board.nix @@ -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. diff --git a/artiq-fast/pkgs/artiq.nix b/artiq-fast/pkgs/artiq.nix index 1ae7a35..47d50a1 100644 --- a/artiq-fast/pkgs/artiq.nix +++ b/artiq-fast/pkgs/artiq.nix @@ -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 ]; }; - } + }) diff --git a/artiq-full.nix b/artiq-full.nix index 90253d4..0d9de8d 100644 --- a/artiq-full.nix +++ b/artiq-full.nix @@ -3,7 +3,7 @@ let 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;