diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/tools/kubectx | |
parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/tools/kubectx')
-rw-r--r-- | nixpkgs/pkgs/development/tools/kubectx/bump-golang-x-sys.patch | 25 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/tools/kubectx/default.nix | 7 |
2 files changed, 29 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/tools/kubectx/bump-golang-x-sys.patch b/nixpkgs/pkgs/development/tools/kubectx/bump-golang-x-sys.patch new file mode 100644 index 000000000000..ec838728410a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/kubectx/bump-golang-x-sys.patch @@ -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= diff --git a/nixpkgs/pkgs/development/tools/kubectx/default.nix b/nixpkgs/pkgs/development/tools/kubectx/default.nix index 8ddd7685dcfb..dfdfebcf3eab 100644 --- a/nixpkgs/pkgs/development/tools/kubectx/default.nix +++ b/nixpkgs/pkgs/development/tools/kubectx/default.nix @@ -11,9 +11,11 @@ buildGoModule rec { sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM="; }; - vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg="; + patches = [ + ./bump-golang-x-sys.patch + ]; - doCheck = false; + vendorSha256 = "sha256-p4KUBmJw6hWG1J2qwg4QBbh6Vo1cr/HQz0IqytIDJjU="; nativeBuildInputs = [ installShellFiles ]; @@ -26,6 +28,5 @@ buildGoModule rec { license = licenses.asl20; homepage = "https://github.com/ahmetb/kubectx"; maintainers = with maintainers; [ jlesquembre ]; - platforms = with platforms; unix; }; } |