diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index c74fdbc749d4..dbdc45355f45 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -22,8 +22,6 @@ buildGoModule rec { "-X github.com/cloudnativelabs/kube-router/pkg/version.BuildDate=Nix" ]; - checkFlags = [ "-short" ]; - passthru.tests.version = testers.testVersion { package = kube-router; }; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index db423d619b52..b4844015eb6e 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -17,7 +17,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - checkFlags = [ "-short" ]; + # There too many integration tests. + doCheck = false; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index 802be18e566f..1a8039d42b77 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -17,7 +17,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - checkFlags = [ "-short" ]; + preCheck = '' + buildFlagsArray+="-short" + ''; meta = { description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 2e1f44754d1f..ba78b1d50bc1 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -24,7 +24,9 @@ buildGoModule rec { ]; # skips tests with external dependencies, e.g. on mysqld - checkFlags = [ "-short" ]; + preCheck = '' + buildFlagsArray+="-short" + ''; meta = with lib; { description = "Prometheus exporter for MySQL server metrics"; diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 149fe7e4b3bf..a3cd4b9b5149 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, docker-credential-gcr }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, testers, docker-credential-gcr }: buildGoModule rec { pname = "docker-credential-gcr"; @@ -11,6 +11,18 @@ buildGoModule rec { sha256 = "sha256-1AUs8Gt2Qw8BJk2zwRcazVl+POkPSy9e1jW9Mk/0rx8="; }; + patches = [ + (fetchpatch { + name = "fix-TestGet_GCRCredentials.patch"; + url = "https://github.com/GoogleCloudPlatform/docker-credential-gcr/commit/a0c080e58bbfdeb0aa24e66551c4e8b0359bf178.patch"; + sha256 = "sha256-aXp/1kNaxqQDPszC7pO+qP7ZBWHjpVljUHiKFnnDWuM="; + }) + ]; + + postPatch = '' + rm -rf ./test + ''; + vendorSha256 = "sha256-e7XNTizZYp/tS7KRvB9KxY3Yurphnm6Ehz4dHZNReK8="; CGO_ENABLED = 0; @@ -21,8 +33,6 @@ buildGoModule rec { "-X github.com/GoogleCloudPlatform/docker-credential-gcr/config.Version=${version}" ]; - checkFlags = [ "-short" ]; - passthru.tests.version = testers.testVersion { package = docker-credential-gcr; command = "docker-credential-gcr version"; diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 6f2cf06a433e..3551c0368a89 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -15,7 +15,9 @@ buildGoModule rec { vendorSha256 = "sha256-yxqLGDqdu9vX3ykHq7Kzf8oBH1ydltZkiWNWWM2l0Aw="; - checkFlags = [ "-short" ]; + preCheck = '' + buildFlagsArray+="-short" + ''; meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases";