diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:33 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:38 +0300 |
| commit | 003473613a084b38a1f0335ba8035461b4190e5d (patch) | |
| tree | cc4598d81eb607acba0d89664fe13fd44138dd7e /pkgs/applications/networking | |
| parent | 39696b6d56fbe93834a8997057b3507e8cd2a234 (diff) | |
| parent | 50bbc56b0bd87715bc17230365fe5eb441bfac68 (diff) | |
| download | nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.gz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.bz2 nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.lz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.xz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.zst nixlib-003473613a084b38a1f0335ba8035461b4190e5d.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 1a7ba3cf93df..e1023afc7aba 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -16,13 +16,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.9.1"; + version = "1.9.7"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk"; + sha256 = "1dykh48c6bvypg51mlxjdyrggpjq597mjj83xgj1pfadsy6pp9bh"; }; # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373 @@ -30,21 +30,6 @@ stdenv.mkDerivation rec { outputs = ["out" "man" "pause"]; - patches = [ - # patch is from https://github.com/kubernetes/kubernetes/pull/58207 - (fetchpatch { - url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch"; - sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w"; - }) - (fetchpatch { - # https://github.com/kubernetes/kubernetes/pull/60978 - # Fixes critical kube-proxy failure on iptables-restore >= 1.6.2 and - # non-critical failures on prior versions. - url = "https://github.com/kubernetes/kubernetes/commit/34ce573e9992ecdbc06dff1b4e3d0e9baa8353dd.patch"; - sha256 = "1sd9qgc28zr6fkk0441f89bw8kq2kadys0qs7bgivy9cmcpw5x5p"; - }) - ]; - postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" |