ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 06:06:13 +03:00
Code Issues Projects Releases Wiki Activity

git: use easier string concatenation instead of inlining things

Browse Source
This commit is contained in:
Sandro Jäckel 2024-02-26 11:56:42 +01:00
parent 150cd0ab61
commit 913a1d439c
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/version-management/git/default.nix
View File

@ -323,12 +323,10 @@ stdenv.mkDerivation (finalAttrs: {
# Our patched gettext never fallbacks # Our patched gettext never fallbacks
disable_test t0201-gettext-fallbacks disable_test t0201-gettext-fallbacks
'' + lib.optionalString (!sendEmailSupport) ''
${lib.optionalString (!sendEmailSupport) '' # Disable sendmail tests
# Disable sendmail tests disable_test t9001-send-email
disable_test t9001-send-email '' + ''
''}
# XXX: I failed to understand why this one fails. # XXX: I failed to understand why this one fails.
# Could someone try to re-enable it on the next release ? # Could someone try to re-enable it on the next release ?
# Tested to fail: 2.18.0 and 2.19.0 # Tested to fail: 2.18.0 and 2.19.0
@ -342,12 +340,11 @@ stdenv.mkDerivation (finalAttrs: {
disable_test t0021-conversion disable_test t0021-conversion
disable_test t3910-mac-os-precompose disable_test t3910-mac-os-precompose
${lib.optionalString (!perlSupport) '' '' + lib.optionalString (!perlSupport) ''
# request-pull is a Bash script that invokes Perl, so it is not available # 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 # when NO_PERL=1, and the test should be skipped, but the test suite does
# not check for the Perl prerequisite. # not check for the Perl prerequisite.
disable_test t5150-request-pull disable_test t5150-request-pull
''}
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
# XXX: Some tests added in 2.24.0 fail. # XXX: Some tests added in 2.24.0 fail.
# Please try to re-enable on the next release. # Please try to re-enable on the next release.