Merge pull request #34126 from nicknovitski/kubectl

init: kubectl at 1.7.9 (alias for kubernetes with only kubectl component)

authored by Tim Steinbach and committed by GitHub 250df5c8 693ab60b

+6 -2
+2 -2
pkgs/applications/networking/cluster/helm/default.nix
··· 1 - { stdenv, fetchurl, kubernetes }: 2 let 3 arch = if stdenv.isLinux 4 then "linux-amd64" ··· 21 22 buildInputs = [ ]; 23 24 - propagatedBuildInputs = [ kubernetes ]; 25 26 phases = [ "buildPhase" "installPhase" ]; 27
··· 1 + { stdenv, fetchurl, kubectl }: 2 let 3 arch = if stdenv.isLinux 4 then "linux-amd64" ··· 21 22 buildInputs = [ ]; 23 24 + propagatedBuildInputs = [ kubectl ]; 25 26 phases = [ "buildPhase" "installPhase" ]; 27
+4
pkgs/top-level/all-packages.nix
··· 15925 15926 kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; 15927 15928 kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; 15929 15930 kupfer = callPackage ../applications/misc/kupfer { };
··· 15925 15926 kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; 15927 15928 + kubectl = (kubernetes.override { components = [ "cmd/kubectl" ]; }).overrideAttrs(oldAttrs: { 15929 + name = "kubectl-${oldAttrs.version}"; 15930 + }); 15931 + 15932 kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; 15933 15934 kupfer = callPackage ../applications/misc/kupfer { };