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

prow: fix build on darwin

Browse Source
This commit is contained in:
Mario Rodas 2020-03-21 06:01:00 -05:00
parent 622494d85d
commit 37087c1550
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, lib }: { buildGoModule, fetchFromGitHub, stdenv, Security }:
buildGoModule rec { buildGoModule rec {
pname = "prow-unstable"; pname = "prow-unstable";
@ -20,6 +20,8 @@ buildGoModule rec {
modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq"; modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ subPackages = [
"./prow/cmd/admission" "./prow/cmd/admission"
"./prow/cmd/artifact-uploader" "./prow/cmd/artifact-uploader"
@ -54,7 +56,7 @@ buildGoModule rec {
"./prow/cmd/tot" "./prow/cmd/tot"
]; ];
meta = with lib; { meta = with stdenv.lib; {
description = "Prow is a Kubernetes based CI/CD system"; description = "Prow is a Kubernetes based CI/CD system";
longDescription = '' longDescription = ''
Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various

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

@ -25901,6 +25901,7 @@ in
# Version 2019-08-14 fails to build with go 1.13 due to dependencies: # 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) # 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; buildGoModule = buildGo112Module;
inherit (darwin.apple_sdk.frameworks) Security;
}; };
inherit (callPackage ../applications/networking/cluster/terraform { inherit (callPackage ../applications/networking/cluster/terraform {