b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #184919 from SuperSandro2000/kubectx

Browse source
This commit is contained in:
Sandro 2022-08-07 21:52:20 +02:00 committed by GitHub
parent 04a3fd2f6a f3e8b609c3
commit 999b9de409
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/development/tools/kubectx/bump-golang-x-sys.patch Normal file
View file

@ -0,0 +1,25 @@
diff --git a/go.mod b/go.mod
index c523783..1ef8d00 100644
--- a/go.mod
+++ b/go.mod
@@ -9,6 +9,7 @@ require (
github.com/imdario/mergo v0.3.9 // indirect
github.com/mattn/go-isatty v0.0.12
github.com/pkg/errors v0.9.1
+ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
k8s.io/apimachinery v0.21.0-alpha.1
k8s.io/client-go v0.21.0-alpha.1
diff --git a/go.sum b/go.sum
index 8f16b5a..7426c68 100644
--- a/go.sum
+++ b/go.sum
@@ -293,6 +293,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80=
+golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

7
pkgs/development/tools/kubectx/default.nix
View file

@ -11,7 +11,11 @@ buildGoModule rec {
sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM=";
};
vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg=";
patches = [
./bump-golang-x-sys.patch
];
vendorSha256 = "sha256-p4KUBmJw6hWG1J2qwg4QBbh6Vo1cr/HQz0IqytIDJjU=";
nativeBuildInputs = [ installShellFiles ];
@ -24,6 +28,5 @@ buildGoModule rec {
license = licenses.asl20;
homepage = "https://github.com/ahmetb/kubectx";
maintainers = with maintainers; [ jlesquembre ];
platforms = with platforms; unix;
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -16241,9 +16241,7 @@ with pkgs;
kubeaudit = callPackage ../tools/security/kubeaudit { };
kubectx = callPackage ../development/tools/kubectx {
buildGoModule = buildGo117Module;
};
kubectx = callPackage ../development/tools/kubectx { };
kube-linter = callPackage ../development/tools/kube-linter { };