push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,96 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
callPackage,
gitUpdater,
}:
buildGoModule rec {
pname = "cloudflared";
version = "2025.9.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
tag = version;
hash = "sha256-xFkRwbRfJCpwTW9T9g2Tnn6qAwoTT9bxOCEkTM01+B4=";
};
vendorHash = null;
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
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"
# Workaround for: origin_icmp_proxy_test.go:46:
# cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied
substituteInPlace "ingress/origin_icmp_proxy_test.go" \
--replace "TestICMPRouterEcho" "SkipICMPRouterEcho"
# Workaround for: origin_icmp_proxy_test.go:110:
# cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied
substituteInPlace "ingress/origin_icmp_proxy_test.go" \
--replace "TestConcurrentRequestsToSameDst" "SkipConcurrentRequestsToSameDst"
# Workaround for: origin_icmp_proxy_test.go:242:
# cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied
substituteInPlace "ingress/origin_icmp_proxy_test.go" \
--replace "TestICMPRouterRejectNotEcho" "SkipICMPRouterRejectNotEcho"
# Workaround for: origin_icmp_proxy_test.go:108:
# Received unexpected error: cannot create ICMPv4 proxy: Group ID 100 is not between ping group 65534 to 65534 nor ICMPv6 proxy: socket: permission denied
substituteInPlace "ingress/origin_icmp_proxy_test.go" \
--replace "TestTraceICMPRouterEcho" "SkipTraceICMPRouterEcho"
# Workaround for: icmp_posix_test.go:28: socket: permission denied
substituteInPlace "ingress/icmp_posix_test.go" \
--replace "TestFunnelIdleTimeout" "SkipFunnelIdleTimeout"
# Workaround for: icmp_posix_test.go:88: Received unexpected error: Group ID 100 is not between ping group 65534 to 65534
substituteInPlace "ingress/icmp_posix_test.go" \
--replace "TestReuseFunnel" "SkipReuseFunnel"
# Workaround for: manager_test.go:197:
# Should be false
substituteInPlace "datagramsession/manager_test.go" \
--replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions"
'';
doCheck = !stdenv.hostPlatform.isDarwin;
passthru = {
tests.simple = callPackage ./tests.nix { inherit version; };
updateScript = gitUpdater { };
};
meta = {
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 = lib.licenses.asl20;
platforms = lib.platforms.unix ++ lib.platforms.windows;
maintainers = with lib.maintainers; [
bbigras
enorris
thoughtpolice
piperswe
qjoly
wrbbz
];
mainProgram = "cloudflared";
};
}

View File

@@ -0,0 +1,62 @@
{
version,
lib,
stdenv,
pkgsCross,
testers,
cloudflared,
runCommand,
wine,
wine64,
}:
let
inherit (stdenv) buildPlatform;
in
{
version = testers.testVersion {
package = cloudflared;
command = "cloudflared help";
};
refuses-to-autoupdate =
runCommand "cloudflared-${version}-refuses-to-autoupdate"
{
nativeBuildInputs = [ cloudflared ];
}
''
set -e
cloudflared update 2>&1 | tee output.txt
if ! grep "cloudflared was installed by nixpkgs" output.txt
then
echo "cloudflared's output didn't contain the package manager name"
exit 1
fi
mkdir $out
'';
}
// lib.optionalAttrs (buildPlatform.isLinux && (buildPlatform.isi686 || buildPlatform.isx86_64)) {
runs-through-wine =
runCommand "cloudflared-${version}-runs-through-wine"
{
nativeBuildInputs = [ wine ];
exe = "${pkgsCross.mingw32.cloudflared}/bin/cloudflared.exe";
}
''
export HOME="$(mktemp -d)"
wine $exe help
mkdir $out
'';
}
// lib.optionalAttrs (buildPlatform.isLinux && buildPlatform.isx86_64) {
runs-through-wine64 =
runCommand "cloudflared-${version}-runs-through-wine64"
{
nativeBuildInputs = [ wine64 ];
exe = "${pkgsCross.mingwW64.cloudflared}/bin/cloudflared.exe";
}
''
export HOME="$(mktemp -d)"
wine64 $exe help
mkdir $out
'';
}