mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 11:40:45 +00:00
Code Issues Wiki Activity

Merge pull request #218668 from piperswe/cloudflared-2023.2.2

Browse source 
cloudflared: 2023.2.1 -> 2023.2.2
This commit is contained in:
Fabian Affolter 2023-03-02 09:27:51 +01:00 committed by GitHub
parent 690288fd37 f0a620bd28
commit ffd3af93ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/applications/networking/cloudflared/default.nix
View file

@ -1,19 +1,29 @@
{ lib, buildGoModule, fetchFromGitHub, stdenv, callPackage }:
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, callPackage
}:
buildGoModule rec {
pname = "cloudflared";
version = "2023.2.1";
version = "2023.2.2";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
hash = "sha256-vhcz/uk1sBt7XytXQYcPreoPfNz7fdPVE+j+FTH7tPc=";
rev = "refs/tags/${version}";
hash = "sha256-qZ3h8KZLGSH+sqUs0wof5arKvcps1DdqBnT+coWEiys=";
};
vendorSha256 = null;
ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=nixpkgs" ];
ldflags = [
"-s"
"-w"
"-X main.Version=${version}"
"-X github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=nixpkgs"
];
preCheck = ''
# Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory
@ -52,11 +62,6 @@ buildGoModule rec {
substituteInPlace "ingress/icmp_posix_test.go" \
--replace "TestReuseFunnel" "SkipReuseFunnel"
# Workaround for: supervisor_test.go:49:
# Expected nil, but got: Could not lookup srv records on _us-v2-origintunneld._tcp.argotunnel.com: lookup _us-v2-origintunneld._tcp.argotunnel.com on [::1]:53: read udp [::1]:49342->[::1]:53: read: connection refused
substituteInPlace "supervisor/supervisor_test.go" \
--replace "Test_Initialize_Same_Protocol" "Skip_Initialize_Same_Protocol"
# Workaround for: manager_test.go:197:
# Should be false
substituteInPlace "datagramsession/manager_test.go" \
@ -70,6 +75,7 @@ buildGoModule rec {
meta = with lib; {
description = "Cloudflare Tunnel daemon, Cloudflare Access toolkit, and DNS-over-HTTPS client";
homepage = "https://www.cloudflare.com/products/tunnel";
changelog = "https://github.com/cloudflare/cloudflared/releases/tag/${version}";
license = licenses.asl20;
platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ bbigras enorris thoughtpolice piperswe ];