alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

kubernetes: 1.9.1 -> 1.9.7

Browse source
This commit is contained in:
Eric Bailey 2018-05-14 12:50:20 -05:00
parent 405f9d10ef
commit 9d5b6b89f0
No known key found for this signature in database
GPG key ID: 55BF5D49549F04AD
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/networking/cluster/kubernetes/default.nix
View file

@ -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}"