git.iko.soy/typeable/nixpkgs
on master help sign in
prow: 2019-08-14 -> 2020-04-01 (#84055)
commit9e55da14fee564f9f9730111e579bd257dce4319 authorWael Nasreddine <wael.nasreddine@gmail.com> dateFri 3 Apr 2020, 10:09 (7 years ago) parent964bdae
3 files changed+36−67
pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch−22 pkgs/applications/networking/cluster/prow/default.nix+35−40 pkgs/top-level/all-packages.nix+1−5
pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patchdeleted−22
@@ -1,22 +0,0 @@
1−From b0ab95b9664916618ebf5fe637b1bc4de4ba9a6e Mon Sep 17 00:00:00 2001
2−From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
3−Date: Wed, 14 Aug 2019 23:07:51 -0700
4−Subject: [PATCH] fix the hash of gomodules.xyz/jsonpatch/v2
5−
6−---
7− go.sum | 2 +-
8− 1 file changed, 1 insertion(+), 1 deletion(-)
9−
10−diff --git a/go.sum b/go.sum
11−index 6bb130b4d9b..b3f48a85d4a 100644
12−--- a/go.sum
13−+++ b/go.sum
14−@@ -452,7 +452,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138 h1:H3uGjxCR/6Ds0Mjgyp7LMK8
15− golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
16− golang.org/x/tools v0.0.0-20190404132500-923d25813098 h1:MtqjsZmyGRgMmLUgxnmMJ6RYdvd2ib8ipiayHhqSxs4=
17− golang.org/x/tools v0.0.0-20190404132500-923d25813098/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
18−-gomodules.xyz/jsonpatch/v2 v2.0.0 h1:lHNQverf0+Gm1TbSbVIDWVXOhZ2FpZopxRqpr2uIjs4=
19−+gomodules.xyz/jsonpatch/v2 v2.0.0 h1:OyHbl+7IOECpPKfVK42oFr6N7+Y2dR+Jsb/IiDV3hOo=
20− gomodules.xyz/jsonpatch/v2 v2.0.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
21− google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
22− google.golang.org/api v0.0.0-20181021000519-a2651947f503/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
pkgs/applications/networking/cluster/prow/default.nix+35−40
@@ -2,56 +2,51 @@
22
33buildGoModule rec {
44 pname = "prow-unstable";
5− version = "2019-08-14";
6− rev = "35a7744f5737bbc1c4e1256a9c9c5ad135c650e4";
5+ version = "2020-04-01";
6+ rev = "32e3b5ce7695fb622381421653db436cb57b47c5";
77
88 src = fetchFromGitHub {
99 inherit rev;
1010
1111 owner = "kubernetes";
1212 repo = "test-infra";
13− sha256 = "07kdlzrj59xyaa73vlx4s50fpg0brrkb0h0cyjgx81a0hsc7s03k";
13+ sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4";
1414 };
1515
16− patches = [
17− # https://github.com/kubernetes/test-infra/pull/13918
18− ./13918-fix-go-sum.patch
19− ];
20−
21− modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq";
16+ modSha256 = "1xajdg10a27icc7g1y3ym4pkgg64rp4afybbjlhbg3k3whir9xa1";
2217
2318 subPackages = [
24− "./prow/cmd/admission"
25− "./prow/cmd/artifact-uploader"
26− "./prow/cmd/branchprotector"
27− "./prow/cmd/build"
28− "./prow/cmd/checkconfig"
29− "./prow/cmd/clonerefs"
30− "./prow/cmd/config-bootstrapper"
31− "./prow/cmd/crier"
32− "./prow/cmd/deck"
33− "./prow/cmd/entrypoint"
34− "./prow/cmd/gcsupload"
35− "./prow/cmd/gerrit"
36− "./prow/cmd/hook"
37− "./prow/cmd/horologium"
38− "./prow/cmd/initupload"
39− "./prow/cmd/jenkins-operator"
40− "./prow/cmd/mkbuild-cluster"
41− "./prow/cmd/mkpj"
42− "./prow/cmd/mkpod"
43− "./prow/cmd/peribolos"
44− "./prow/cmd/phaino"
45− "./prow/cmd/phony"
46− "./prow/cmd/pipeline"
47− "./prow/cmd/plank"
48− "./prow/cmd/sidecar"
49− "./prow/cmd/sinker"
50− "./prow/cmd/status-reconciler"
51− "./prow/cmd/sub"
52− "./prow/cmd/tackle"
53− "./prow/cmd/tide"
54− "./prow/cmd/tot"
19+ "prow/cmd/admission"
20+ "prow/cmd/branchprotector"
21+ "prow/cmd/checkconfig"
22+ "prow/cmd/clonerefs"
23+ "prow/cmd/cm2kc"
24+ "prow/cmd/config-bootstrapper"
25+ "prow/cmd/crier"
26+ "prow/cmd/deck"
27+ "prow/cmd/entrypoint"
28+ "prow/cmd/exporter"
29+ "prow/cmd/gcsupload"
30+ "prow/cmd/gerrit"
31+ "prow/cmd/hook"
32+ "prow/cmd/horologium"
33+ "prow/cmd/initupload"
34+ "prow/cmd/jenkins-operator"
35+ "prow/cmd/mkbuild-cluster"
36+ "prow/cmd/mkpj"
37+ "prow/cmd/mkpod"
38+ "prow/cmd/peribolos"
39+ "prow/cmd/phaino"
40+ "prow/cmd/phony"
41+ "prow/cmd/pipeline"
42+ "prow/cmd/plank"
43+ "prow/cmd/sidecar"
44+ "prow/cmd/sinker"
45+ "prow/cmd/status-reconciler"
46+ "prow/cmd/sub"
47+ "prow/cmd/tackle"
48+ "prow/cmd/tide"
49+ "prow/cmd/tot"
5550 ];
5651
5752 meta = with lib; {
pkgs/top-level/all-packages.nix+1−5
@@ -25894,11 +25894,7 @@ in
2589425894
2589525895 jx = callPackage ../applications/networking/cluster/jx {};
2589625896
25897− prow = callPackage ../applications/networking/cluster/prow {
25898− # Version 2019-08-14 fails to build with go 1.13 due to dependencies:
25899− # go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint)
25900− buildGoModule = buildGo112Module;
25901− };
25897+ prow = callPackage ../applications/networking/cluster/prow { };
2590225898
2590325899 inherit (callPackage ../applications/networking/cluster/terraform {
2590425900 # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287