nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #137784 from andir/staging-git

Browse Source 
git: disable flaky test & patch shebangs in test scripts
This commit is contained in:
Andreas Rammhold
2021-09-14 15:55:42 +02:00
committed by GitHub
parent df9a7e8f43 6f3ee459de
commit 413da4c0f4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@@ -65,6 +65,9 @@ stdenv.mkDerivation {
# Fix references to gettext introduced by ./git-sh-i18n.patch
substituteInPlace git-sh-i18n.sh \
--subst-var-by gettext ${gettext}
# ensure we are using the correct shell when executing the test scripts
patchShebangs t/*.sh
'';
nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ]
@@ -318,6 +321,7 @@ stdenv.mkDerivation {
# Flaky tests:
disable_test t5319-multi-pack-index
disable_test t6421-merge-partial-clone
${lib.optionalString (!perlSupport) ''
# request-pull is a Bash script that invokes Perl, so it is not available