public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37164 from mbode/kubernetes_go_1_9

Browse Source 
kubernetes: use go 1.9 instead of 1.10
This commit is contained in:
Jörg Thalheim 2018-03-16 12:50:24 +00:00 committed by GitHub
commit 1ed100b13c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync { stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
, iptables, coreutils , iptables, coreutils
, components ? [ , components ? [
"cmd/kubeadm" "cmd/kubeadm"
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk"; sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk";
}; };
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];
outputs = ["out" "man" "pause"]; outputs = ["out" "man" "pause"];
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
''; '';
preFixup = '' preFixup = ''
find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_9} '{}' +
''; '';
meta = { meta = {