diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2016-11-24 23:10:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 23:10:01 +0100 |
| commit | 3b500d37f503dd63da7a76ade9765e0b81c796cb (patch) | |
| tree | 7a0e90f3b20e0575267773b2632856f74bfc721f /pkgs | |
| parent | e29e2467201be02de2ae67bf1916b2114ffada23 (diff) | |
| parent | 5bc7ae7adb66639dbff676db51454ed2e5f8ad87 (diff) | |
| download | nixlib-3b500d37f503dd63da7a76ade9765e0b81c796cb.tar nixlib-3b500d37f503dd63da7a76ade9765e0b81c796cb.tar.gz nixlib-3b500d37f503dd63da7a76ade9765e0b81c796cb.tar.bz2 nixlib-3b500d37f503dd63da7a76ade9765e0b81c796cb.tar.lz nixlib-3b500d37f503dd63da7a76ade9765e0b81c796cb.tar.xz nixlib-3b500d37f503dd63da7a76ade9765e0b81c796cb.tar.zst nixlib-3b500d37f503dd63da7a76ade9765e0b81c796cb.zip | |
Merge pull request #19023 from offlinehacker/kube-update
WIP: kubernetes update package and module
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/cni/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 38 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix new file mode 100644 index 000000000000..bdff04cb0738 --- /dev/null +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, go }: + +stdenv.mkDerivation rec { + name = "cni-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "containernetworking"; + repo = "cni"; + rev = "v${version}"; + sha256 = "1nvixvf5slnsdrfpfs2km64x680wf83jbyp7il12bcim37q2az7m"; + }; + + buildInputs = [ go ]; + + outputs = ["out" "plugins"]; + + buildPhase = '' + patchShebangs build + ./build + ''; + + installPhase = '' + mkdir -p $out/bin $plugins + mv bin/cnitool $out/bin + mv bin/* $plugins/ + ''; + + meta = with stdenv.lib; { + description = "Container Network Interface - networking for Linux containers"; + license = licenses.asl20; + homepage = https://github.com/containernetworking/cni; + maintainers = with maintainers; [offline]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 5430902477f2..44444417f3c3 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -48,9 +48,6 @@ stdenv.mkDerivation rec { ''; preFixup = '' - wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin" - wrapProgram "$out/bin/kubelet" --prefix PATH : "${coreutils}/bin" - # Remove references to go compiler while read file; do cat $file | sed "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" > $file.tmp diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a9820ef1a17..e8600419a707 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12402,6 +12402,8 @@ in pulseaudioSupport = config.pulseaudio or false; }; + cni = callPackage ../applications/networking/cluster/cni {}; + communi = qt5.callPackage ../applications/networking/irc/communi { }; compiz = callPackage ../applications/window-managers/compiz { |