From d6162dab509ababe7c3ce83c17a3ef63855e0832 Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Thu, 30 Apr 2020 21:59:00 -0400 Subject: go-modules: Update files to use vendorSha256 --- .../networking/cluster/argo/default.nix | 4 +- .../networking/cluster/argocd/default.nix | 4 +- .../networking/cluster/atlantis/default.nix | 4 +- .../networking/cluster/docker-machine/hyperkit.nix | 4 +- .../networking/cluster/docker-machine/kvm2.nix | 4 +- .../networking/cluster/fluxctl/default.nix | 4 +- .../networking/cluster/helm/default.nix | 4 +- .../networking/cluster/helmfile/default.nix | 4 +- .../networking/cluster/helmsman/default.nix | 2 +- .../networking/cluster/hetzner-kube/default.nix | 4 +- .../applications/networking/cluster/jx/gomod.patch | 186 +++++++++++++++++++++ .../networking/cluster/k9s/default.nix | 4 +- .../networking/cluster/kube3d/default.nix | 4 +- .../networking/cluster/kubeseal/default.nix | 4 +- .../networking/cluster/kubeval/default.nix | 4 +- .../networking/cluster/linkerd/default.nix | 10 +- .../networking/cluster/minikube/default.nix | 2 +- .../cluster/node-problem-detector/default.nix | 11 +- .../networking/cluster/prow/default.nix | 4 +- .../networking/cluster/qbec/default.nix | 4 +- .../terraform-providers/elasticsearch/default.nix | 4 +- .../cluster/terraform-providers/lxd/default.nix | 4 +- .../terraform-providers/vpsadmin/default.nix | 4 +- .../networking/cluster/terragrunt/default.nix | 4 +- 24 files changed, 233 insertions(+), 54 deletions(-) create mode 100644 pkgs/applications/networking/cluster/jx/gomod.patch (limited to 'pkgs/applications/networking/cluster') diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 891d153a09e1..7179a2915434 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf"; }; - modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45"; + vendorSha256 = "0dhzr62x2lzf3w0j2r496cr7jvkdcavfqaqr2xh972k3qqc9caky"; subPackages = [ "cmd/argo" ]; @@ -46,4 +46,4 @@ buildGoModule rec { maintainers = with maintainers; [ groodt ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 7f9ebda93c0a..409498905051 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj"; }; - modSha256 = "1qivg7yy7ymmgkrvl365x29d8jnsphbz18j1ykgwwysyw3n4jkdg"; + vendorSha256 = "0r2nh7v00m6zbdnhsgjn01q9pkiz41ckkqgfnpqmkxaqmjz31iyj"; nativeBuildInputs = [ packr ]; @@ -37,4 +37,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ shahrukh330 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 7d04595d3feb..b6077b5c4d82 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "16zz4xwpqipdmszbz93xxw31hbh7s8pfa9dm64ybyni7wc4lvdy6"; }; - modSha256 = "18f7cf61yn5jkji5a4v6xw6c7xl40nj32n5w34xmcmszzf64cwkn"; + vendorSha256 = null; subPackages = [ "." ]; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ jpotier ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index ec5a79e9acee..0c5a716aa8a1 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit; + inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; pname = "docker-machine-hyperkit"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ atkinschang ]; platforms = platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 6af1bf126b56..60d478fe1584 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit; + inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 commit; pname = "docker-machine-kvm2"; @@ -24,4 +24,4 @@ buildGoModule rec { maintainers = with maintainers; [ tadfisher atkinschang ]; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 10991d47cca9..4354d72a5bd9 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0"; }; - modSha256 = "0zwq7n1lggj27j5yxgfplbaccw5fhbm7vm0sja839r1jamrn3ips"; + vendorSha256 = "0w5l1lkzx4frllflkbilj8qqwf54wkz7hin7q8xn1vflkv3lxcnp"; subPackages = [ "cmd/fluxctl" ]; @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ Gonzih filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index deb6d75f12c5..9d3809c1717b 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1x05xnc3czk7vpn9qnfdavdjy5agv800nh7jyqczpiw125l9jfyd"; }; - modSha256 = "000knqwsajlqika4abp3fh721mn1vykcsnv3c1qw0mzffkmzwsqd"; + vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl"; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; @@ -28,4 +28,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 628ae10f11b7..f193186144a2 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -15,7 +15,7 @@ buildGoModule { goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "0j7w12rrnsv2h5v0bqh6sjq9anm51zs0p3nzlhwsksw9c98r9avk"; + vendorSha256 = "0m16l3px2ykdsrmlirf7c4lwgmigs6p3rdr61l49acwsmniz2m8a"; nativeBuildInputs = [ makeWrapper ]; @@ -36,4 +36,4 @@ buildGoModule { maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; platforms = lib.platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index f1d81975e1e6..992b6c4dc5e3 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0i7sg3iwxb07gjxcz6chpdcx3fqykzldmf7s1c9m02hkps910ca8"; }; - modSha256 = "19qdrrwmjc32nw8m0zi251z32wqj2d956wgd1dkcvx1x0n4p435g"; + vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; meta = with lib; { description = "Helm Charts (k8s applications) as Code tool"; diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 1d9940c8f318..98edd849bac5 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw"; }; - modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh"; + vendorSha256 = "1jh2f66ys6rmrrwrf5zqfprgcvziyq6l4z8bfqwxgf1ysnxx525h"; buildFlagsArray = '' -ldflags= @@ -25,4 +25,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ eliasp ]; platforms = lib.platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/jx/gomod.patch b/pkgs/applications/networking/cluster/jx/gomod.patch new file mode 100644 index 000000000000..0116d45955dc --- /dev/null +++ b/pkgs/applications/networking/cluster/jx/gomod.patch @@ -0,0 +1,186 @@ +diff --git a/go.mod b/go.mod +index cd54a606e..a78b23286 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,5 +1,7 @@ + module github.com/jenkins-x/jx + ++go 1.14 ++ + require ( + code.gitea.io/sdk v0.0.0-20180702024448-79a281c4e34a + github.com/Azure/draft v0.15.0 +@@ -7,7 +9,6 @@ require ( + github.com/IBM-Cloud/bluemix-go v0.0.0-20181008063305-d718d474c7c2 + github.com/Jeffail/gabs v1.1.1 + github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e +- github.com/Masterminds/semver v1.4.2 // indirect + github.com/Netflix/go-expect v0.0.0-20180814212900-124a37274874 + github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect + github.com/Pallinder/go-randomdata v0.0.0-20180616180521-15df0648130a +@@ -20,7 +21,7 @@ require ( + github.com/andygrunwald/go-gerrit v0.0.0-20181026193842-43cfd7a94eb4 + github.com/andygrunwald/go-jira v1.5.0 + github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect +- github.com/antham/chyle v1.4.0 ++ github.com/antham/chyle v1.9.0 + github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect + github.com/armon/go-radix v1.0.0 // indirect + github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf // indirect +@@ -36,21 +37,18 @@ require ( + github.com/cloudflare/cfssl v0.0.0-20190409034051-768cd563887f + github.com/codeship/codeship-go v0.0.0-20180717142545-7793ca823354 + github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect +- github.com/cpuguy83/go-md2man v1.0.8 // indirect + github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect + github.com/denormal/go-gitignore v0.0.0-20180713143441-75ce8f3e513c + github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect + github.com/duosecurity/duo_api_golang v0.0.0-20190107154727-539434bf0d45 // indirect + github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect + github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect +- github.com/emicklei/go-restful v2.8.0+incompatible +- github.com/emirpasic/gods v1.9.0 // indirect +- github.com/fatih/color v1.7.0 ++ github.com/emicklei/go-restful v2.8.0+incompatible // indirect ++ github.com/fatih/color v1.9.0 + github.com/fatih/structs v1.0.0 + github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect + github.com/gfleury/go-bitbucket-v1 v0.0.0-20190216152406-3a732135aa4d + github.com/ghodss/yaml v1.0.0 +- github.com/gliderlabs/ssh v0.1.1 // indirect + github.com/go-ldap/ldap v3.0.1+incompatible // indirect + github.com/go-ole/go-ole v1.2.1 // indirect + github.com/go-openapi/jsonreference v0.17.0 +@@ -59,9 +57,9 @@ require ( + github.com/gobwas/glob v0.2.3 // indirect + github.com/gocql/gocql v0.0.0-20190126123547-8516aabb0f99 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b +- github.com/golang/protobuf v1.2.0 ++ github.com/golang/protobuf v1.3.1 + github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect +- github.com/google/go-cmp v0.2.0 ++ github.com/google/go-cmp v0.3.0 + github.com/google/go-containerregistry v0.0.0-20190317040536-ebbba8469d06 // indirect + github.com/google/go-github v17.0.0+incompatible + github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect +@@ -79,15 +77,15 @@ require ( + github.com/hashicorp/go-sockaddr v1.0.0 // indirect + github.com/hashicorp/go-uuid v1.0.1 // indirect + github.com/hashicorp/go-version v0.0.0-20180716215031-270f2f71b1ee +- github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce ++ github.com/hashicorp/hcl v1.0.0 + github.com/hashicorp/vault v0.11.4 + github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20190115203747-edbfe287c5d9 // indirect +- github.com/heptio/sonobuoy v0.12.0 ++ github.com/heptio/sonobuoy v0.18.1 + github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c + github.com/hpcloud/tail v1.0.0 + github.com/iancoleman/orderedmap v0.0.0-20181121102841-22c6ecc9fe13 + github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 // indirect +- github.com/imdario/mergo v0.3.6 ++ github.com/imdario/mergo v0.3.8 + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jbrukh/bayesian v0.0.0-20161210175230-bf3f261f9a9c // indirect + github.com/jefferai/jsonx v1.0.0 // indirect +@@ -95,14 +93,12 @@ require ( + github.com/jenkins-x/golang-jenkins v0.0.0-20180919102630-65b83ad42314 + github.com/jetstack/cert-manager v0.5.2 + github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect +- github.com/kevinburke/ssh_config v0.0.0-20180317175531-9fc7bb800b55 // indirect + github.com/keybase/go-crypto v0.0.0-20181127160227-255a5089e85a // indirect + github.com/knative/build v0.5.0 + github.com/knative/build-pipeline v0.1.0 // indirect + github.com/knative/pkg v0.0.0-20190402181056-ff46edef0ae5 + github.com/knative/serving v0.5.0 + github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect +- github.com/kr/pty v1.1.2 // indirect + github.com/kubernetes/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect + github.com/kubernetes/kube-openapi v0.0.0-20190320154901-5e45bb682580 // indirect + github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 // indirect +@@ -114,9 +110,8 @@ require ( + github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect + github.com/mholt/archiver v3.1.1+incompatible + github.com/mitchellh/copystructure v1.0.0 // indirect +- github.com/mitchellh/go-homedir v0.0.0-20180523094522-3864e76763d9 // indirect + github.com/mitchellh/go-testing-interface v1.0.0 // indirect +- github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699 ++ github.com/mitchellh/mapstructure v1.1.2 + github.com/nlopes/slack v0.0.0-20180721202243-347a74b1ea30 + github.com/nwaples/rardecode v1.0.0 // indirect + github.com/onsi/ginkgo v1.6.0 +@@ -130,55 +125,48 @@ require ( + github.com/petergtz/pegomock v2.2.0+incompatible + github.com/pierrec/lz4 v2.0.5+incompatible // indirect + github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15 +- github.com/pkg/errors v0.8.0 +- github.com/prometheus/common v0.2.0 // indirect ++ github.com/pkg/errors v0.8.1 + github.com/rodaine/hclencoder v0.0.0-20180926060551-0680c4321930 +- github.com/russross/blackfriday v1.5.1 +- github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 ++ github.com/russross/blackfriday v1.5.2 ++ github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 // indirect + github.com/satori/go.uuid v1.2.1-0.20180103174451-36e9d2ebbde5 + github.com/sergi/go-diff v1.0.0 // indirect + github.com/sethvargo/go-password v0.1.2 + github.com/shirou/gopsutil v0.0.0-20180901134234-eb1f1ab16f2e + github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect +- github.com/sirupsen/logrus v1.4.1 +- github.com/spf13/cobra v0.0.3 +- github.com/spf13/pflag v1.0.3 +- github.com/src-d/gcfg v1.3.0 // indirect ++ github.com/sirupsen/logrus v1.4.2 ++ github.com/spf13/cobra v0.0.7 ++ github.com/spf13/pflag v1.0.5 + github.com/stoewer/go-strcase v1.0.1 + github.com/stretchr/objx v0.2.0 // indirect +- github.com/stretchr/testify v1.3.0 ++ github.com/stretchr/testify v1.4.0 + github.com/tektoncd/pipeline v0.0.0-20190327171839-7c43fbae2816 + github.com/trivago/tgo v1.0.1 // indirect + github.com/ulikunitz/xz v0.5.6 // indirect + github.com/wbrefvem/go-bitbucket v0.0.0-20190128183802-fc08fd046abb + github.com/xanzy/go-gitlab v0.0.0-20180814191223-f3bc634ab936 +- github.com/xanzy/ssh-agent v0.2.0 // indirect + github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect + gocloud.dev v0.9.0 + golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c // indirect +- golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect + golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 // indirect +- golang.org/x/net v0.0.0-20181201002055-351d144fa1fc // indirect + golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 +- golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 +- golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 ++ golang.org/x/sync v0.0.0-20190423024810-112230192c58 ++ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e + google.golang.org/api v0.1.0 // indirect + google.golang.org/genproto v0.0.0-20190219182410-082222b4a5c5 // indirect + gopkg.in/AlecAivazis/survey.v1 v1.6.2 + gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect + gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect +- gopkg.in/src-d/go-billy.v4 v4.2.0 // indirect +- gopkg.in/src-d/go-git-fixtures.v3 v3.3.0 // indirect +- gopkg.in/src-d/go-git.v4 v4.5.0 ++ gopkg.in/src-d/go-git.v4 v4.13.1 + gopkg.in/warnings.v0 v0.1.2 // indirect +- gopkg.in/yaml.v2 v2.2.1 ++ gopkg.in/yaml.v2 v2.2.2 + gotest.tools v2.2.0+incompatible // indirect + k8s.io/api v0.0.0-20190126160303-ccdd560a045f + k8s.io/apiextensions-apiserver v0.0.0-20181128195303-1f84094d7e8e + k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 + k8s.io/client-go v9.0.0+incompatible +- k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da +- k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 ++ k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect ++ k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 // indirect + k8s.io/helm v2.7.2+incompatible + k8s.io/klog v0.2.0 // indirect + k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4 +@@ -197,6 +185,4 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d + + replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 + +-replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible +- + replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index a51d1afb3674..4be3398f4be8 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - modSha256 = "11jxyzajlk6b5j19sg1kjr7qdzpxkwjwrvyhx9mwy6jb5sgqbzv8"; + vendorSha256 = "0vvzv5v7j77v809h2ial9n23244j1sy3xhkarsv0wwkifc3swvq5"; meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 2eea6adb28d1..32b8b4498611 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { -X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion} ''; - modSha256 = "0c8bfl0hz5cfhi6jzhhylz051jiix6s7s20fn23w7wri4xaqrjn8"; + vendorSha256 = null; meta = with stdenv.lib; { homepage = "https://github.com/rancher/k3d"; @@ -30,4 +30,4 @@ buildGoModule rec { platforms = platforms.linux; maintainers = with maintainers; [ kuznero jlesquembre ngerstle ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index ef87b67a3600..4486f473969d 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0z51iwdc4m0y8wyyx3mcvbzxlrgws7n5wkcd0g7nr73irnsld4lh"; }; - modSha256 = "029h0zr3fpzlsv9hf1d1x5j7aalxkcsyszsxjz8fqrhjafqc7zvq"; + vendorSha256 = null; subPackages = [ "cmd/kubeseal" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 3d3674dbe0fc..10d75435e421 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0"; }; - modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y"; + vendorSha256 = "1kpwvi84i3h1yjprd6m6hn8l9j235931871y3qk9cl0g8q0hv9ja"; meta = with lib; { description = "Validate your Kubernetes configuration files"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ johanot nicknovitski ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 3d66a7c62f20..331cef0444cd 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,16 +2,16 @@ buildGoModule { pname = "linkerd-unstablle"; - version = "2019-07-26"; + version = "2020-05-01"; src = fetchFromGitHub { owner = "linkerd"; repo = "linkerd2"; - rev = "065dd3ec9d4b84c90383b31be16ccadd34a8ab0d"; - sha256 = "01m8g627sd126as0a74fy9svmymwd41sifd897nhn6kz78a21gq8"; + rev = "9e9f3bb1e2aeab8cf20f98f5cad159bbb6f24883"; + sha256 = "1pvj31wz1klwhcqga1m8kixdqsxwmppp9ix6r3wpp4dwfig45fm0"; }; - modSha256 = "0gahhywpcj16ww4l8s3wjwvavq24fpy258snhyf94ipy6lb797sl"; + vendorSha256 = "0vls58ld50jca5yn73kvg3lx4z83cc7skky54a90pkbj737y58pz"; subPackages = [ "cli/cmd" ]; @@ -21,4 +21,4 @@ buildGoModule { license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 830dcec95168..040447b0ccd9 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { # for -ldflags commit = "63ab801ac27e5742ae442ce36dff7877dcccb278"; - modSha256 = "1g94jjwr5higg1b297zwp6grkj7if3mrdafjq9vls9y2svh11xr8"; + vendorSha256 = "1l9dxn7yy21x4b3cg6l5a08wx2ng8qf531ilg8yf1rznwfwjajrv"; src = fetchFromGitHub { owner = "kubernetes"; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index a7a98de6d39b..f68d5f08e66e 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -11,14 +11,7 @@ buildGoModule rec { sha256 = "02avknglmkr9k933a64hkw0rjfxvyh4sc3x70p41b8q2g6vzv2gs"; }; - # Project upstream recommends building through vendoring - overrideModAttrs = (_: { - buildCommand = '' - echo "Skipping go.mod, using vendoring instead." && touch $out - ''; - }); - - modSha256 = "0ip26j2h11n1kgkz36rl4akv694yz65hr72q4kv4b3lxcbi65b3p"; + vendorSha256 = null; # Optionally, a log counter binary can be created to parse journald logs. # The binary is dynamically linked against systemd libraries, making it a @@ -47,4 +40,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ lbpdt ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index 0b2f798d35b4..4ad685418d35 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4"; }; - modSha256 = "1xajdg10a27icc7g1y3ym4pkgg64rp4afybbjlhbg3k3whir9xa1"; + vendorSha256 = "16fdc5r28andm8my4fxj0f1yygx6j2mvn92i6xdfhbcra0lvr4ql"; subPackages = [ "prow/cmd/admission" @@ -63,4 +63,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 53b421ec5521..ddde1e50edde 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0krdfaha19wzi10rh0wfhki5nknbd5mndaxhrq7y9m840xy43d6d"; }; - modSha256 = "1wb15vrkb4ryvrjp68ygmadnf78s354106ya210pnmsbb53rbhaz"; + vendorSha256 = "1cyr621fb6hxwswz9lf75brc9qjy1n9rqjkwi6r8s3y6nhw20db6"; meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 1aadbbc5ccd3..6afa63c4a525 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v"; }; - modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p"; + vendorSha256 = "1rdvyypdl3fk6af66gfjhyl271cnlx5xgrl1w68sc6sbvq00bqkd"; subPackages = [ "." ]; @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ basvandijk ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index fd2a6c36d65c..69d93ac1c754 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv"; }; - modSha256 = "1h95ng9by3i3v15s1ws1fv86a47vglivn42xbffdy94s108g0908"; + vendorSha256 = "1shdpl1zsbbpc3mfs0l65ykq2h15ggvqylaixcap4j4lfl7m9my0"; postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}"; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ gila ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix index 2f788ed915ee..270c7adcb47f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { hash = "sha256-+6jRjcManQdoKh7ewOJI1UaulY5OSbkIUHmtrBI33u4="; }; - modSha256 = "sha256-gz+t50uHFj4BQnJg6kOJI/joJVE+usLpVzTqziek2wY="; + vendorSha256 = "0j90fnzba23mwf9bzf9w5h0hszkl3h61p5i780s9v9c0hbzhbqsh"; subPackages = [ "." ]; @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.mpl20; maintainers = with maintainers; [ zimbatm ]; }; -} +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 245bd2fffbb0..6a4e1979e883 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1znb9d4n9zv3dq10dw17kb1h04gj8iz6gwx1a741fcf4ygp8zpy1"; }; - modSha256 = "0pjqsb6lxk73prc6jxj07iwd1wyy5gqz24kigb308r3n0c2vcnky"; + vendorSha256 = "0h737h25f80zfx84vm6ry0581c32ylcb5h9givqk5k5kh5qgkbgx"; buildInputs = [ makeWrapper ]; @@ -30,4 +30,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; -} +} \ No newline at end of file -- cgit 1.4.1 From cdb8539006c57050f546971250d38c837c6f8ebe Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 11 May 2020 07:04:58 +0100 Subject: jx: 2.1.31 -> 2.1.31 --- .../cluster/jx/3321-fix-location-of-thrift.patch | 36 ---- .../applications/networking/cluster/jx/default.nix | 13 +- .../applications/networking/cluster/jx/gomod.patch | 186 --------------------- 3 files changed, 4 insertions(+), 231 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch delete mode 100644 pkgs/applications/networking/cluster/jx/gomod.patch (limited to 'pkgs/applications/networking/cluster') diff --git a/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch b/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch deleted file mode 100644 index 223d6c6c2477..000000000000 --- a/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 40b8eaacb3a24c466c17c8a65938330d5805b112 Mon Sep 17 00:00:00 2001 -From: "Wael M. Nasreddine" -Date: Fri, 8 Mar 2019 14:10:11 -0800 -Subject: [PATCH] chore: fix the location of thrift - -Thrift is no longer available at the git.apache.org and it's now -distributed on GitHub at github.com/apache/thrift. - -fixes #3320 ---- - go.mod | 2 ++ - go.sum | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/go.mod b/go.mod -index 04bcc84cc..e26c4cf1d 100644 ---- a/go.mod -+++ b/go.mod -@@ -184,3 +184,5 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d - replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 - - replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible -+ -+replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 -diff --git a/go.sum b/go.sum -index c9fdf8768..6ed69e69d 100644 ---- a/go.sum -+++ b/go.sum -@@ -87,6 +87,7 @@ github.com/antham/chyle v1.4.0/go.mod h1:D94Z4aE/ECudyNoTHwkhqu77mjGPZtfPG8dNoeI - github.com/antham/envh v1.2.0/go.mod h1:ocIRPHuwwjyBVBtuUJOJc2TYzGg+d23xSAZexl4y9hQ= - github.com/antham/strumt v0.0.0-20171215230529-6776189777d3/go.mod h1:sE7EYIUE0nQzPiv5zQAmw2aVkei0j2xmb4gTIIqSFSI= - github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= -+github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= - github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= - github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= - github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index e2c0b663befa..df39e5d86768 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,22 +1,17 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "jx"; - version = "1.3.967"; + pname = "jx"; + version = "2.1.31"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "0a25m7sz134kch21bg6l86kvwl4cg6babqf57kqidq6kid1zgdaq"; + sha256 = "1rbdmqi6m042jxd3hhqw821l567s9zzzgp0cvx8467yfi449qipn"; }; - patches = [ - # https://github.com/jenkins-x/jx/pull/3321 - ./3321-fix-location-of-thrift.patch - ]; - - modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; + vendorSha256 = "1jn636sv6ak6hngw4fpgxqm6gfay2ip6g3gafjb3m4adcc5n9f8s"; subPackages = [ "cmd/jx" ]; diff --git a/pkgs/applications/networking/cluster/jx/gomod.patch b/pkgs/applications/networking/cluster/jx/gomod.patch deleted file mode 100644 index 0116d45955dc..000000000000 --- a/pkgs/applications/networking/cluster/jx/gomod.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff --git a/go.mod b/go.mod -index cd54a606e..a78b23286 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,5 +1,7 @@ - module github.com/jenkins-x/jx - -+go 1.14 -+ - require ( - code.gitea.io/sdk v0.0.0-20180702024448-79a281c4e34a - github.com/Azure/draft v0.15.0 -@@ -7,7 +9,6 @@ require ( - github.com/IBM-Cloud/bluemix-go v0.0.0-20181008063305-d718d474c7c2 - github.com/Jeffail/gabs v1.1.1 - github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e -- github.com/Masterminds/semver v1.4.2 // indirect - github.com/Netflix/go-expect v0.0.0-20180814212900-124a37274874 - github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect - github.com/Pallinder/go-randomdata v0.0.0-20180616180521-15df0648130a -@@ -20,7 +21,7 @@ require ( - github.com/andygrunwald/go-gerrit v0.0.0-20181026193842-43cfd7a94eb4 - github.com/andygrunwald/go-jira v1.5.0 - github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect -- github.com/antham/chyle v1.4.0 -+ github.com/antham/chyle v1.9.0 - github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect - github.com/armon/go-radix v1.0.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf // indirect -@@ -36,21 +37,18 @@ require ( - github.com/cloudflare/cfssl v0.0.0-20190409034051-768cd563887f - github.com/codeship/codeship-go v0.0.0-20180717142545-7793ca823354 - github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect -- github.com/cpuguy83/go-md2man v1.0.8 // indirect - github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect - github.com/denormal/go-gitignore v0.0.0-20180713143441-75ce8f3e513c - github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect - github.com/duosecurity/duo_api_golang v0.0.0-20190107154727-539434bf0d45 // indirect - github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect - github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect -- github.com/emicklei/go-restful v2.8.0+incompatible -- github.com/emirpasic/gods v1.9.0 // indirect -- github.com/fatih/color v1.7.0 -+ github.com/emicklei/go-restful v2.8.0+incompatible // indirect -+ github.com/fatih/color v1.9.0 - github.com/fatih/structs v1.0.0 - github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect - github.com/gfleury/go-bitbucket-v1 v0.0.0-20190216152406-3a732135aa4d - github.com/ghodss/yaml v1.0.0 -- github.com/gliderlabs/ssh v0.1.1 // indirect - github.com/go-ldap/ldap v3.0.1+incompatible // indirect - github.com/go-ole/go-ole v1.2.1 // indirect - github.com/go-openapi/jsonreference v0.17.0 -@@ -59,9 +57,9 @@ require ( - github.com/gobwas/glob v0.2.3 // indirect - github.com/gocql/gocql v0.0.0-20190126123547-8516aabb0f99 // indirect - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b -- github.com/golang/protobuf v1.2.0 -+ github.com/golang/protobuf v1.3.1 - github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect -- github.com/google/go-cmp v0.2.0 -+ github.com/google/go-cmp v0.3.0 - github.com/google/go-containerregistry v0.0.0-20190317040536-ebbba8469d06 // indirect - github.com/google/go-github v17.0.0+incompatible - github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect -@@ -79,15 +77,15 @@ require ( - github.com/hashicorp/go-sockaddr v1.0.0 // indirect - github.com/hashicorp/go-uuid v1.0.1 // indirect - github.com/hashicorp/go-version v0.0.0-20180716215031-270f2f71b1ee -- github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce -+ github.com/hashicorp/hcl v1.0.0 - github.com/hashicorp/vault v0.11.4 - github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20190115203747-edbfe287c5d9 // indirect -- github.com/heptio/sonobuoy v0.12.0 -+ github.com/heptio/sonobuoy v0.18.1 - github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c - github.com/hpcloud/tail v1.0.0 - github.com/iancoleman/orderedmap v0.0.0-20181121102841-22c6ecc9fe13 - github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 // indirect -- github.com/imdario/mergo v0.3.6 -+ github.com/imdario/mergo v0.3.8 - github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect - github.com/jbrukh/bayesian v0.0.0-20161210175230-bf3f261f9a9c // indirect - github.com/jefferai/jsonx v1.0.0 // indirect -@@ -95,14 +93,12 @@ require ( - github.com/jenkins-x/golang-jenkins v0.0.0-20180919102630-65b83ad42314 - github.com/jetstack/cert-manager v0.5.2 - github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect -- github.com/kevinburke/ssh_config v0.0.0-20180317175531-9fc7bb800b55 // indirect - github.com/keybase/go-crypto v0.0.0-20181127160227-255a5089e85a // indirect - github.com/knative/build v0.5.0 - github.com/knative/build-pipeline v0.1.0 // indirect - github.com/knative/pkg v0.0.0-20190402181056-ff46edef0ae5 - github.com/knative/serving v0.5.0 - github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect -- github.com/kr/pty v1.1.2 // indirect - github.com/kubernetes/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect - github.com/kubernetes/kube-openapi v0.0.0-20190320154901-5e45bb682580 // indirect - github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 // indirect -@@ -114,9 +110,8 @@ require ( - github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect - github.com/mholt/archiver v3.1.1+incompatible - github.com/mitchellh/copystructure v1.0.0 // indirect -- github.com/mitchellh/go-homedir v0.0.0-20180523094522-3864e76763d9 // indirect - github.com/mitchellh/go-testing-interface v1.0.0 // indirect -- github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699 -+ github.com/mitchellh/mapstructure v1.1.2 - github.com/nlopes/slack v0.0.0-20180721202243-347a74b1ea30 - github.com/nwaples/rardecode v1.0.0 // indirect - github.com/onsi/ginkgo v1.6.0 -@@ -130,55 +125,48 @@ require ( - github.com/petergtz/pegomock v2.2.0+incompatible - github.com/pierrec/lz4 v2.0.5+incompatible // indirect - github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15 -- github.com/pkg/errors v0.8.0 -- github.com/prometheus/common v0.2.0 // indirect -+ github.com/pkg/errors v0.8.1 - github.com/rodaine/hclencoder v0.0.0-20180926060551-0680c4321930 -- github.com/russross/blackfriday v1.5.1 -- github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 -+ github.com/russross/blackfriday v1.5.2 -+ github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 // indirect - github.com/satori/go.uuid v1.2.1-0.20180103174451-36e9d2ebbde5 - github.com/sergi/go-diff v1.0.0 // indirect - github.com/sethvargo/go-password v0.1.2 - github.com/shirou/gopsutil v0.0.0-20180901134234-eb1f1ab16f2e - github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect -- github.com/sirupsen/logrus v1.4.1 -- github.com/spf13/cobra v0.0.3 -- github.com/spf13/pflag v1.0.3 -- github.com/src-d/gcfg v1.3.0 // indirect -+ github.com/sirupsen/logrus v1.4.2 -+ github.com/spf13/cobra v0.0.7 -+ github.com/spf13/pflag v1.0.5 - github.com/stoewer/go-strcase v1.0.1 - github.com/stretchr/objx v0.2.0 // indirect -- github.com/stretchr/testify v1.3.0 -+ github.com/stretchr/testify v1.4.0 - github.com/tektoncd/pipeline v0.0.0-20190327171839-7c43fbae2816 - github.com/trivago/tgo v1.0.1 // indirect - github.com/ulikunitz/xz v0.5.6 // indirect - github.com/wbrefvem/go-bitbucket v0.0.0-20190128183802-fc08fd046abb - github.com/xanzy/go-gitlab v0.0.0-20180814191223-f3bc634ab936 -- github.com/xanzy/ssh-agent v0.2.0 // indirect - github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - gocloud.dev v0.9.0 - golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c // indirect -- golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect - golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 // indirect -- golang.org/x/net v0.0.0-20181201002055-351d144fa1fc // indirect - golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 -- golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 -- golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 -+ golang.org/x/sync v0.0.0-20190423024810-112230192c58 -+ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e - google.golang.org/api v0.1.0 // indirect - google.golang.org/genproto v0.0.0-20190219182410-082222b4a5c5 // indirect - gopkg.in/AlecAivazis/survey.v1 v1.6.2 - gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect - gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect -- gopkg.in/src-d/go-billy.v4 v4.2.0 // indirect -- gopkg.in/src-d/go-git-fixtures.v3 v3.3.0 // indirect -- gopkg.in/src-d/go-git.v4 v4.5.0 -+ gopkg.in/src-d/go-git.v4 v4.13.1 - gopkg.in/warnings.v0 v0.1.2 // indirect -- gopkg.in/yaml.v2 v2.2.1 -+ gopkg.in/yaml.v2 v2.2.2 - gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20190126160303-ccdd560a045f - k8s.io/apiextensions-apiserver v0.0.0-20181128195303-1f84094d7e8e - k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 - k8s.io/client-go v9.0.0+incompatible -- k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da -- k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 -+ k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect -+ k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 // indirect - k8s.io/helm v2.7.2+incompatible - k8s.io/klog v0.2.0 // indirect - k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4 -@@ -197,6 +185,4 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d - - replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 - --replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible -- - replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 -- cgit 1.4.1 From aade6fc7b002e74629b977f7f44572f6622dc279 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:00 +1000 Subject: cni-plugins: switch to buildGoModule --- pkgs/applications/networking/cluster/cni/plugins.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/networking/cluster') diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 34eb6a8ee28d..6aaf67bd1d18 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "cni-plugins"; version = "0.8.6"; @@ -11,10 +11,10 @@ buildGoPackage rec { sha256 = "0f1cqxjf26sy1c4aw6y7pyd9lrz0vknby4q5j6xj77a1pab9073m"; }; - goPackagePath = "github.com/containernetworking/plugins"; + vendorSha256 = null; buildFlagsArray = [ - "-ldflags=-X ${goPackagePath}/pkg/utils/buildversion.BuildVersion=${version}" + "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=${version}" ]; subPackages = [ -- cgit 1.4.1