diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:39:23 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:39:23 +0200 |
commit | fe9a3e3e63fa59c8014d454b0efd3231bdd19350 (patch) | |
tree | 3546e83902366b34599e8d5f6a698e37935a104d /pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch | |
parent | ed3cb39bfa7234e5bbf2b50ce6f658ef5fda686a (diff) | |
parent | c68f58d95c0e34d91ff3e4f08464954fd0e9e466 (diff) | |
download | nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.gz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.bz2 nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.lz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.xz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.zst nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch')
-rw-r--r-- | pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch b/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch new file mode 100644 index 00000000000..ae407727b9d --- /dev/null +++ b/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch @@ -0,0 +1,22 @@ +From b0ab95b9664916618ebf5fe637b1bc4de4ba9a6e Mon Sep 17 00:00:00 2001 +From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com> +Date: Wed, 14 Aug 2019 23:07:51 -0700 +Subject: [PATCH] fix the hash of gomodules.xyz/jsonpatch/v2 + +--- + go.sum | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/go.sum b/go.sum +index 6bb130b4d9b..b3f48a85d4a 100644 +--- a/go.sum ++++ b/go.sum +@@ -452,7 +452,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138 h1:H3uGjxCR/6Ds0Mjgyp7LMK8 + golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= + golang.org/x/tools v0.0.0-20190404132500-923d25813098 h1:MtqjsZmyGRgMmLUgxnmMJ6RYdvd2ib8ipiayHhqSxs4= + golang.org/x/tools v0.0.0-20190404132500-923d25813098/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +-gomodules.xyz/jsonpatch/v2 v2.0.0 h1:lHNQverf0+Gm1TbSbVIDWVXOhZ2FpZopxRqpr2uIjs4= ++gomodules.xyz/jsonpatch/v2 v2.0.0 h1:OyHbl+7IOECpPKfVK42oFr6N7+Y2dR+Jsb/IiDV3hOo= + gomodules.xyz/jsonpatch/v2 v2.0.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= + google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= + google.golang.org/api v0.0.0-20181021000519-a2651947f503/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= |