Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7ec04712423d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2aa8a208b0e3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 13, 2018

  1. metrics: fixup sed expr to work with Nix 2

    @dtzWill
    dtzWill committed Mar 13, 2018
    Copy the full SHA
    5eb07e2 View commit details

  2. Merge pull request #36896 from dtzWill/fix/metrics-sed 

    metrics: fixup sed expr to work with Nix 2
    @edolstra
    edolstra authored Mar 13, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2aa8a20 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/top-level/metrics.nix
2 changes: 1 addition & 1 deletion pkgs/top-level/metrics.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ runCommand "nixpkgs-metrics"
[[ -n $x ]] || exit 1
echo "$name.allocations $x B" >> $out/nix-support/hydra-metrics
x=$(sed -e 's/.*values allocated: \([0-9]\+\) .*/\1/ ; t ; d' stats)
x=$(sed -e 's/.*values allocated bytes: \([0-9]\+\).*/\1/ ; t ; d' stats)
[[ -n $x ]] || exit 1
echo "$name.values $x" >> $out/nix-support/hydra-metrics
}