diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-07-08 09:31:25 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-07-08 09:31:25 +0200 |
| commit | b39924fc7764c08ae3b51beef9a3518c414cdb7d (patch) | |
| tree | a58285393c76913d3f028e2f5838c0c58e7d7448 /pkgs/applications | |
| parent | 0be91cefefde5701f8fa957904618a13e3bb51d8 (diff) | |
| parent | add0201f354284b5447b1bcf6a065a9a50aebea8 (diff) | |
Merge #179844: staging-next 2022-07-01
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/cluster/kompose/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/gitbatch/default.nix | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 2b80dfc6815a3..a4081408871ac 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose, git }: buildGoModule rec { pname = "kompose"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-OR5U2PnebO0a+lwU09Dveh0Yxk91cmSRorTxQIO5lHc="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles git ]; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix index 75fea7bf871fc..0eb20db1462ab 100644 --- a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, git }: buildGoModule rec { pname = "gitbatch"; @@ -15,7 +15,15 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - checkFlags = [ "-short" ]; + nativeBuildInputs = [ + git # required by unit tests + ]; + + preCheck = '' + HOME=$(mktemp -d) + # Disable tests requiring network access to gitlab.com + buildFlagsArray+=("-run" "[^(Test(Run|Start|(Fetch|Pull)With(Go|)Git))]") + ''; meta = with lib; { description = "Running git UI commands"; |