From 1aee94dc428138cfb3e0c74451a88c60412c6e6f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 27 Aug 2019 22:40:43 -0500 Subject: cadvisor: 0.33.1 -> 0.34.0 --- pkgs/servers/monitoring/cadvisor/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 502a3026b2ae..d6f3e18e49bc 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.33.1"; + version = "0.34.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "15wddg0xwkz42n5y2f72yq3imhbvnp83g1jq6p81ddw9qzbz62zs"; + sha256 = "1hshmhsclja50ja2jqxx2f5lcvbs64n6aw6dw28wbnq3z9v0q8ad"; }; nativeBuildInputs = [ go ]; @@ -17,12 +17,15 @@ stdenv.mkDerivation rec { export GOCACHE="$TMPDIR/go-cache" mkdir -p Godeps/_workspace/src/github.com/google/ ln -s $(pwd) Godeps/_workspace/src/github.com/google/cadvisor - GOPATH=$(pwd)/Godeps/_workspace go build -v -o cadvisor github.com/google/cadvisor + GOPATH=$(pwd)/Godeps/_workspace go build -v -o cadvisor -ldflags="-s -w -X github.com/google/cadvisor/version.Version=${version}" github.com/google/cadvisor ''; installPhase = '' - mkdir -p $out/bin - mv cadvisor $out/bin + runHook preInstall + + install -Dm755 -t $out/bin cadvisor + + runHook postInstall ''; meta = with stdenv.lib; { -- cgit 1.4.1