git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108148 from SuperSandro2000/cadvisor
8a9d1aaFlorian Klink
pkgs/servers/monitoring/cadvisor/default.nix+15−6
compare with master
unifiedsplit
@@ -1,22 +1,31 @@
1−{ stdenv, buildGoPackage, fetchFromGitHub }:
1+{ stdenv, buildGoModule, fetchFromGitHub }:
2
2
3−buildGoPackage rec {
3+buildGoModule rec {
4 pname = "cadvisor";
4 pname = "cadvisor";
5− version = "0.36.0";
5+ version = "0.37.0";
6
6
7 src = fetchFromGitHub {
7 src = fetchFromGitHub {
8 owner = "google";
8 owner = "google";
9 repo = "cadvisor";
9 repo = "cadvisor";
10 rev = "v${version}";
10 rev = "v${version}";
11− sha256 = "12hk2l82i7hawzbvj6imcfwn6v8pcfv0dbjfn259yi4b0jrlx6l8";
11+ sha256 = "15njzwvsl7jc2hgxlpsksmn7md3bqpavzaskfdlmzxnxp3biw3cj";
12 };
12 };
13
13
14− goPackagePath = "github.com/google/cadvisor";
14+ modRoot = "./cmd";
15
15
16− subPackages = [ "." ];
16+ vendorSha256 = "1vbydwj3xrz2gimwfasiqiwzsdiplaq7imildzr4wspkk64dprf4";
17
17
18 buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ];
18 buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ];
19
19
20+ postInstall = ''
21+ mv $out/bin/{cmd,cadvisor}
22+ rm $out/bin/example
23+ '';
24+
25+ preCheck = ''
26+ rm internal/container/mesos/handler_test.go
27+ '';
28+
20 meta = with stdenv.lib; {
29 meta = with stdenv.lib; {
21 description = "Analyzes resource usage and performance characteristics of running docker containers";
30 description = "Analyzes resource usage and performance characteristics of running docker containers";
22 homepage = "https://github.com/google/cadvisor";
31 homepage = "https://github.com/google/cadvisor";