From 8dc0768762dd87c6836807b5969cd17be8816887 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 16 Jul 2022 17:32:41 +0100 Subject: [PATCH] git: don't doInstallCheck on darwin by default however *do* provide a `passthru.tests.withInstallCheck`. doInstallCheck takes a ridiculous amount of time on darwin, making staging builds ever more painful. --- .../version-management/git-and-tools/git/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 341e1e0b9c97..9e735edea8af 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -19,6 +19,7 @@ , pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi , withSsh ? false +, doInstallCheck ? !stdenv.isDarwin # extremely slow on darwin }: assert osxkeychainSupport -> stdenv.isDarwin; @@ -31,7 +32,7 @@ let gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "git" + lib.optionalString svnSupport "-with-svn" + lib.optionalString (!svnSupport && !guiSupport && !sendEmailSupport && !withManual && !pythonSupport && !withpcre2) "-minimal"; @@ -280,7 +281,7 @@ stdenv.mkDerivation { ## InstallCheck doCheck = false; - doInstallCheck = true; + inherit doInstallCheck; installCheckTarget = "test"; @@ -369,6 +370,9 @@ stdenv.mkDerivation { passthru = { shellPath = "/bin/git-shell"; tests = { + withInstallCheck = finalAttrs.finalPackage.overrideAttrs (_: { + doInstallCheck = true; + }); buildbot-integration = nixosTests.buildbot; }; }; @@ -387,4 +391,4 @@ stdenv.mkDerivation { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ primeos wmertens globin ]; }; -} +})