Merge pull request #51896 from nicknovitski/kubernetes-1.13

kubernetes: 1.12.3 -> 1.13.1
This commit is contained in:
Franz Pletz 2018-12-17 22:10:03 +00:00 committed by GitHub
commit 033486446c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_10, go-bindata, makeWrapper, rsync
{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
, components ? [
"cmd/kubeadm"
"cmd/kubectl"
@ -15,16 +15,16 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
version = "1.12.3";
version = "1.13.1";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "0y227qzv7hsibf0sil5ylfdvkfsd43qlsyprc1dwgbj8igjl6q2d";
sha256 = "048ckirz7v1djari6l9ddkcd9i4yafcv57wk131dv0cs2zady9va";
};
buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
outputs = ["out" "man" "pause"];
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_10} '{}' +
find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' +
'';
meta = {