diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-27 13:08:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 13:08:50 +0100 |
| commit | eeeba2a79394e94d48acb63d1675f110fa9d4ab2 (patch) | |
| tree | a8d5b5d2afedfb52dab0593eaaaf01111732eeeb /pkgs/applications/networking/cluster | |
| parent | 2bd4ff03cbf381ad2452c24ee6077228e6f3e748 (diff) | |
| parent | 05683aceaef08906b8019c6714eb3843946c811a (diff) | |
| download | nixlib-eeeba2a79394e94d48acb63d1675f110fa9d4ab2.tar nixlib-eeeba2a79394e94d48acb63d1675f110fa9d4ab2.tar.gz nixlib-eeeba2a79394e94d48acb63d1675f110fa9d4ab2.tar.bz2 nixlib-eeeba2a79394e94d48acb63d1675f110fa9d4ab2.tar.lz nixlib-eeeba2a79394e94d48acb63d1675f110fa9d4ab2.tar.xz nixlib-eeeba2a79394e94d48acb63d1675f110fa9d4ab2.tar.zst nixlib-eeeba2a79394e94d48acb63d1675f110fa9d4ab2.zip | |
Merge pull request #86121 from zowoq/more-go-fixes
buildGoPackage: use installShellFiles, {excluded,sub}PackagesDiffstat (limited to 'pkgs/applications/networking/cluster')
| -rw-r--r-- | pkgs/applications/networking/cluster/heptio-ark/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/openshift/default.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix index 21f4011f0706..aa86dcbeb241 100644 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; }; - postInstall = "rm $bin/bin/issue-template-gen"; + excludedPackages = [ "issue-template-gen" ]; meta = with stdenv.lib; { description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index a9b0ed3fcb59..bcd259b138f7 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux -, coreutils, kerberos, clang +, coreutils, kerberos, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -35,7 +35,7 @@ in buildGoPackage rec { buildInputs = [ kerberos ]; - nativeBuildInputs = [ which rsync go-bindata clang ]; + nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; patchPhase = '' patchShebangs ./hack @@ -74,8 +74,8 @@ in buildGoPackage rec { installPhase = '' mkdir -p $bin/bin cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" - install -D -t "$bin/etc/bash_completion.d" contrib/completions/bash/* - install -D -t "$bin/share/zsh/site-functions" contrib/completions/zsh/* + installShellCompletion --bash contrib/completions/bash/* + installShellCompletion --zsh contrib/completions/zsh/* ''; meta = with stdenv.lib; { |