Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0236a947d09d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: df57003e969d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 2, 2018

  1. Copy the full SHA
    357760a View commit details

Commits on Apr 4, 2018

  1. Merge pull request #38228 from mbode/kubectl_zsh_completion

    kubernetes: add kubectl zsh completion
    Mic92 authored Apr 4, 2018
    Copy the full SHA
    df57003 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/applications/networking/cluster/kubernetes/default.nix
3 changes: 2 additions & 1 deletion pkgs/applications/networking/cluster/kubernetes/default.nix
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
'';

installPhase = ''
mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin"
mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" "$man/share/man" "$pause/bin"
cp _output/local/go/bin/* "$out/bin/"
cp build/pause/pause "$pause/bin/pause"
@@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl"
$out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
$out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl
'';

preFixup = ''