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: 4edcaabafc53
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8a9d1aad72e6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 1, 2021

  1. cadvisor: 0.36.0 -> 0.37.0

    @SuperSandro2000
    SuperSandro2000 committed Jan 1, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a0c61e1 View commit details

Commits on Jan 2, 2021

  1. Merge pull request #108148 from SuperSandro2000/cadvisor 

    cadvisor: 0.36.0 -> 0.37.0
    @flokli
    flokli authored Jan 2, 2021
    Copy the full SHA
    8a9d1aa View commit details
Showing with 15 additions and 6 deletions.
  1. +15 −6 pkgs/servers/monitoring/cadvisor/default.nix
21 changes: 15 additions & 6 deletions pkgs/servers/monitoring/cadvisor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoPackage rec {
buildGoModule rec {
pname = "cadvisor";
version = "0.36.0";
version = "0.37.0";

src = fetchFromGitHub {
owner = "google";
repo = "cadvisor";
rev = "v${version}";
sha256 = "12hk2l82i7hawzbvj6imcfwn6v8pcfv0dbjfn259yi4b0jrlx6l8";
sha256 = "15njzwvsl7jc2hgxlpsksmn7md3bqpavzaskfdlmzxnxp3biw3cj";
};

goPackagePath = "github.com/google/cadvisor";
modRoot = "./cmd";

subPackages = [ "." ];
vendorSha256 = "1vbydwj3xrz2gimwfasiqiwzsdiplaq7imildzr4wspkk64dprf4";

buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ];

postInstall = ''
mv $out/bin/{cmd,cadvisor}
rm $out/bin/example
'';

preCheck = ''
rm internal/container/mesos/handler_test.go
'';

meta = with stdenv.lib; {
description = "Analyzes resource usage and performance characteristics of running docker containers";
homepage = "https://github.com/google/cadvisor";