diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2019-11-28 21:13:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-28 21:13:05 +0100 |
| commit | acfa5d83245ee5661c5540a2a90b4a97f35c3296 (patch) | |
| tree | d848ec23dd3db09e0ff76ab05f7a75338444f141 /pkgs/applications/version-management/git-and-tools | |
| parent | d2ef08d3bee85b24d64f5fc1f610a2daff8315db (diff) | |
| parent | 2163fc7f0a3b8b8215452fc6631642b811116000 (diff) | |
Merge pull request #74213 from ruuda/fix-git-perl-support
git: fix the "perlSupport = false" configuration
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 12 |
1 files changed, 11 insertions, 1 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 8a0253029e1c..7fdb659890a9 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -253,7 +253,10 @@ stdenv.mkDerivation { installCheckTarget = "test"; # see also installCheckFlagsArray - installCheckFlags = "DEFAULT_TEST_TARGET=prove"; + installCheckFlags = [ + "DEFAULT_TEST_TARGET=prove" + "PERL_PATH=${buildPackages.perl}/bin/perl" + ]; preInstallCheck = '' installCheckFlagsArray+=( @@ -296,6 +299,13 @@ stdenv.mkDerivation { # Tested to fail: 2.18.0 disable_test t9902-completion "sourcing the completion script clears cached --options" + ${stdenv.lib.optionalString (!perlSupport) '' + # request-pull is a Bash script that invokes Perl, so it is not available + # when NO_PERL=1, and the test should be skipped, but the test suite does + # not check for the Perl prerequisite. + disable_test t5150-request-pull + ''} + # As of 2.19.0, t5562 refers to #!/usr/bin/perl patchShebangs t/t5562/invoke-with-content-length.pl '' + stdenv.lib.optionalString stdenv.isDarwin '' |