Merge pull request #139633 from edolstra/fix-metrics

Fix the metrics job

authored by

Eelco Dolstra and committed by
GitHub
8b725cf8 382d842d

+4 -4
+3 -4
pkgs/top-level/metrics.nix
··· 9 9 } 10 10 '' 11 11 export NIX_STATE_DIR=$TMPDIR 12 + export NIX_PAGER= 12 13 nix-store --init 13 14 14 15 mkdir -p $out/nix-support ··· 24 25 # Redirect stdout to /dev/null to avoid hitting "Output Limit 25 26 # Exceeded" on Hydra. 26 27 nix-env.qaDrv|nix-env.qaDrvAggressive) 27 - NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix >/dev/null ;; 28 + NIX_SHOW_STATS=1 NIX_SHOW_STATS_PATH=stats-nix time -o stats-time "$@" >/dev/null ;; 28 29 *) 29 - NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix ;; 30 + NIX_SHOW_STATS=1 NIX_SHOW_STATS_PATH=stats-nix time -o stats-time "$@" ;; 30 31 esac 31 - 32 - sed '/^warning:/d' -i stats-nix 33 32 34 33 cat stats-nix; echo; cat stats-time; echo 35 34
+1
pkgs/top-level/release.nix
··· 90 90 meta.description = "Release-critical builds for the Nixpkgs unstable channel"; 91 91 constituents = 92 92 [ jobs.tarball 93 + jobs.metrics 93 94 jobs.manual 94 95 jobs.lib-tests 95 96 jobs.pkgs-lib-tests