Merge pull request #67599 from marsam/update-cadvisor

cadvisor: 0.33.1 -> 0.34.0
This commit is contained in:
Marek Mahut 2019-08-28 10:08:47 +02:00 committed by GitHub
commit a35400ffa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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; {