public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prow: 2019-08-14 -> 2020-04-01 (#84055)

Browse Source
This commit is contained in:
Wael Nasreddine 2020-04-03 10:09:11 -07:00 committed by GitHub
parent 964bdae5d9
commit 9e55da14fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch
View File

@ -1,22 +0,0 @@
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=

75
pkgs/applications/networking/cluster/prow/default.nix
View File

@ -2,56 +2,51 @@
buildGoModule rec { buildGoModule rec {
pname = "prow-unstable"; pname = "prow-unstable";
version = "2019-08-14"; version = "2020-04-01";
rev = "35a7744f5737bbc1c4e1256a9c9c5ad135c650e4"; rev = "32e3b5ce7695fb622381421653db436cb57b47c5";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
owner = "kubernetes"; owner = "kubernetes";
repo = "test-infra"; repo = "test-infra";
sha256 = "07kdlzrj59xyaa73vlx4s50fpg0brrkb0h0cyjgx81a0hsc7s03k"; sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4";
}; };
patches = [ modSha256 = "1xajdg10a27icc7g1y3ym4pkgg64rp4afybbjlhbg3k3whir9xa1";
# https://github.com/kubernetes/test-infra/pull/13918
./13918-fix-go-sum.patch
];
modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq";
subPackages = [ subPackages = [
"./prow/cmd/admission" "prow/cmd/admission"
"./prow/cmd/artifact-uploader" "prow/cmd/branchprotector"
"./prow/cmd/branchprotector" "prow/cmd/checkconfig"
"./prow/cmd/build" "prow/cmd/clonerefs"
"./prow/cmd/checkconfig" "prow/cmd/cm2kc"
"./prow/cmd/clonerefs" "prow/cmd/config-bootstrapper"
"./prow/cmd/config-bootstrapper" "prow/cmd/crier"
"./prow/cmd/crier" "prow/cmd/deck"
"./prow/cmd/deck" "prow/cmd/entrypoint"
"./prow/cmd/entrypoint" "prow/cmd/exporter"
"./prow/cmd/gcsupload" "prow/cmd/gcsupload"
"./prow/cmd/gerrit" "prow/cmd/gerrit"
"./prow/cmd/hook" "prow/cmd/hook"
"./prow/cmd/horologium" "prow/cmd/horologium"
"./prow/cmd/initupload" "prow/cmd/initupload"
"./prow/cmd/jenkins-operator" "prow/cmd/jenkins-operator"
"./prow/cmd/mkbuild-cluster" "prow/cmd/mkbuild-cluster"
"./prow/cmd/mkpj" "prow/cmd/mkpj"
"./prow/cmd/mkpod" "prow/cmd/mkpod"
"./prow/cmd/peribolos" "prow/cmd/peribolos"
"./prow/cmd/phaino" "prow/cmd/phaino"
"./prow/cmd/phony" "prow/cmd/phony"
"./prow/cmd/pipeline" "prow/cmd/pipeline"
"./prow/cmd/plank" "prow/cmd/plank"
"./prow/cmd/sidecar" "prow/cmd/sidecar"
"./prow/cmd/sinker" "prow/cmd/sinker"
"./prow/cmd/status-reconciler" "prow/cmd/status-reconciler"
"./prow/cmd/sub" "prow/cmd/sub"
"./prow/cmd/tackle" "prow/cmd/tackle"
"./prow/cmd/tide" "prow/cmd/tide"
"./prow/cmd/tot" "prow/cmd/tot"
]; ];
meta = with lib; { meta = with lib; {

6
pkgs/top-level/all-packages.nix
View File

@ -25894,11 +25894,7 @@ in
jx = callPackage ../applications/networking/cluster/jx {}; jx = callPackage ../applications/networking/cluster/jx {};
prow = callPackage ../applications/networking/cluster/prow { prow = callPackage ../applications/networking/cluster/prow { };
# Version 2019-08-14 fails to build with go 1.13 due to dependencies:
# 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)
buildGoModule = buildGo112Module;
};
inherit (callPackage ../applications/networking/cluster/terraform { inherit (callPackage ../applications/networking/cluster/terraform {
# terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287 # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287