cloudflared: 2022.4.0 -> 2022.4.1 + fix tests for linux (#167419)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
parent
0343e34157
commit
db6a3b620a
1 changed files with 16 additions and 5 deletions
|
@ -1,22 +1,33 @@
|
||||||
{ lib, buildGoModule, fetchFromGitHub }:
|
{ lib, buildGoModule, fetchFromGitHub, stdenv }:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cloudflared";
|
pname = "cloudflared";
|
||||||
version = "2022.4.0";
|
version = "2022.4.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cloudflare";
|
owner = "cloudflare";
|
||||||
repo = "cloudflared";
|
repo = "cloudflared";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-+40OK2q4WdvlLhoPfZH6q+pghgS7ZLmaZl2VbZK4rdA=";
|
hash = "sha256-dgvXbWtLP6sXBlqcx/xpw9LIbcE4VlYZQO5rrS34+9I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
ldflags = [ "-X main.Version=${version}" ];
|
ldflags = [ "-X main.Version=${version}" ];
|
||||||
|
|
||||||
|
preCheck = ''
|
||||||
|
# Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory
|
||||||
|
export HOME="$(mktemp -d)";
|
||||||
|
|
||||||
|
# Workaround for: protocol_test.go:11:
|
||||||
|
# lookup protocol-v2.argotunnel.com on [::1]:53: read udp [::1]:51876->[::1]:53: read: connection refused
|
||||||
|
|
||||||
|
substituteInPlace "edgediscovery/protocol_test.go" \
|
||||||
|
--replace "TestProtocolPercentage" "SkipProtocolPercentage"
|
||||||
|
'';
|
||||||
|
|
||||||
|
doCheck = !stdenv.isDarwin;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "CloudFlare Tunnel daemon (and DNS-over-HTTPS client)";
|
description = "CloudFlare Tunnel daemon (and DNS-over-HTTPS client)";
|
||||||
homepage = "https://www.cloudflare.com/products/tunnel";
|
homepage = "https://www.cloudflare.com/products/tunnel";
|
||||||
|
|
Loading…
Reference in a new issue