185e30c664
The tests for null patterns where changed in 25754125cef278c7e9492fbd6dc4a28319b01f18, it's possible utf-8 normalisation is causing different behaviour here. not ok 54 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[Ð]' a not ok 57 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>Ð' a not ok 60 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a not ok 63 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>Ð' a Dubious, test returned 1 (wstat 256, 0x100) Failed 4/145 subtests (less 48 skipped subtests: 93 okay)
330 lines
12 KiB
Nix
330 lines
12 KiB
Nix
{ fetchurl, stdenv, buildPackages
|
|
, curl, openssl, zlib, expat, perlPackages, python, gettext, cpio
|
|
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
|
|
, openssh, pcre2
|
|
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
|
|
, libxslt, tcl, tk, makeWrapper, libiconv
|
|
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
|
|
, perlSupport ? true
|
|
, guiSupport
|
|
, withManual ? true
|
|
, pythonSupport ? true
|
|
, withpcre2 ? true
|
|
, sendEmailSupport
|
|
, darwin
|
|
, withLibsecret ? false
|
|
, pkgconfig, glib, libsecret
|
|
, gzip # needed at runtime by gitweb.cgi
|
|
}:
|
|
|
|
assert sendEmailSupport -> perlSupport;
|
|
assert svnSupport -> perlSupport;
|
|
|
|
let
|
|
version = "2.24.0";
|
|
svn = subversionClient.override { perlBindings = perlSupport; };
|
|
|
|
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
|
|
in
|
|
|
|
stdenv.mkDerivation {
|
|
pname = "git";
|
|
inherit version;
|
|
|
|
src = fetchurl {
|
|
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
|
sha256 = "06rpakbwzck85ncfsgv4xmq3iwab9d4f5y6dqhl8nvb2fccxcwcz";
|
|
};
|
|
|
|
outputs = [ "out" ];
|
|
|
|
hardeningDisable = [ "format" ];
|
|
|
|
enableParallelBuilding = true;
|
|
|
|
## Patch
|
|
|
|
patches = [
|
|
./docbook2texi.patch
|
|
./git-sh-i18n.patch
|
|
./ssh-path.patch
|
|
./git-send-email-honor-PATH.patch
|
|
./installCheck-path.patch
|
|
];
|
|
|
|
postPatch = ''
|
|
for x in connect.c git-gui/lib/remote_add.tcl ; do
|
|
substituteInPlace "$x" \
|
|
--subst-var-by ssh "${openssh}/bin/ssh"
|
|
done
|
|
|
|
# Fix references to gettext introduced by ./git-sh-i18n.patch
|
|
substituteInPlace git-sh-i18n.sh \
|
|
--subst-var-by gettext ${gettext}
|
|
'';
|
|
|
|
nativeBuildInputs = [ gettext perlPackages.perl ]
|
|
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
|
|
docbook_xsl docbook_xml_dtd_45 libxslt ];
|
|
buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv]
|
|
++ stdenv.lib.optionals perlSupport [ perlPackages.perl ]
|
|
++ stdenv.lib.optionals guiSupport [tcl tk]
|
|
++ stdenv.lib.optionals withpcre2 [ pcre2 ]
|
|
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]
|
|
++ stdenv.lib.optionals withLibsecret [ pkgconfig glib libsecret ];
|
|
|
|
# required to support pthread_cancel()
|
|
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
|
|
+ stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr";
|
|
|
|
configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
|
"ac_cv_fread_reads_directories=yes"
|
|
"ac_cv_snprintf_returns_bogus=no"
|
|
];
|
|
|
|
preBuild = ''
|
|
makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') )
|
|
'';
|
|
|
|
makeFlags = [
|
|
"prefix=\${out}"
|
|
"SHELL_PATH=${stdenv.shell}"
|
|
]
|
|
++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"])
|
|
++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"])
|
|
++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
|
|
++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"])
|
|
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"]
|
|
++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1";
|
|
|
|
|
|
postBuild = ''
|
|
make -C contrib/subtree
|
|
'' + (stdenv.lib.optionalString perlSupport ''
|
|
make -C contrib/diff-highlight
|
|
'') + (stdenv.lib.optionalString stdenv.isDarwin ''
|
|
make -C contrib/credential/osxkeychain
|
|
'') + (stdenv.lib.optionalString withLibsecret ''
|
|
make -C contrib/credential/libsecret
|
|
'');
|
|
|
|
|
|
## Install
|
|
|
|
# WARNING: Do not `rm` or `mv` files from the source tree; use `cp` instead.
|
|
# We need many of these files during the installCheckPhase.
|
|
|
|
installFlags = "NO_INSTALL_HARDLINKS=1";
|
|
|
|
preInstall = (stdenv.lib.optionalString stdenv.isDarwin ''
|
|
mkdir -p $out/bin
|
|
ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/
|
|
rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o
|
|
'') + (stdenv.lib.optionalString withLibsecret ''
|
|
mkdir -p $out/bin
|
|
ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/
|
|
rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o
|
|
'');
|
|
|
|
postInstall =
|
|
''
|
|
notSupported() {
|
|
unlink $1 || true
|
|
}
|
|
|
|
# Install git-subtree.
|
|
make -C contrib/subtree install ${stdenv.lib.optionalString withManual "install-doc"}
|
|
rm -rf contrib/subtree
|
|
|
|
# Install contrib stuff.
|
|
mkdir -p $out/share/git
|
|
cp -a contrib $out/share/git/
|
|
mkdir -p $out/share/emacs/site-lisp
|
|
ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
|
|
mkdir -p $out/share/bash-completion/completions
|
|
ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
|
|
mkdir -p $out/etc/bash_completion.d
|
|
ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/
|
|
|
|
# grep is a runtime dependency, need to patch so that it's found
|
|
substituteInPlace $out/libexec/git-core/git-sh-setup \
|
|
--replace ' grep' ' ${gnugrep}/bin/grep' \
|
|
--replace ' egrep' ' ${gnugrep}/bin/egrep'
|
|
|
|
# Fix references to the perl, sed, awk and various coreutil binaries used by
|
|
# shell scripts that git calls (e.g. filter-branch)
|
|
SCRIPT="$(cat <<'EOS'
|
|
BEGIN{
|
|
@a=(
|
|
'${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
|
|
'${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',
|
|
'${coreutils}/bin/wc', '${coreutils}/bin/tr'
|
|
${stdenv.lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"}
|
|
);
|
|
}
|
|
foreach $c (@a) {
|
|
$n=(split("/", $c))[-1];
|
|
s|(?<=[^#][^/.-])\b''${n}(?=\s)|''${c}|g
|
|
}
|
|
EOS
|
|
)"
|
|
perl -0777 -i -pe "$SCRIPT" \
|
|
$out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse}
|
|
|
|
|
|
# Also put git-http-backend into $PATH, so that we can use smart
|
|
# HTTP(s) transports for pushing
|
|
ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend
|
|
'' + stdenv.lib.optionalString perlSupport ''
|
|
# wrap perl commands
|
|
makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/git-credential-netrc \
|
|
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
|
|
wrapProgram $out/libexec/git-core/git-cvsimport \
|
|
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
|
|
wrapProgram $out/libexec/git-core/git-add--interactive \
|
|
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
|
|
wrapProgram $out/libexec/git-core/git-archimport \
|
|
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
|
|
wrapProgram $out/libexec/git-core/git-instaweb \
|
|
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
|
|
wrapProgram $out/libexec/git-core/git-cvsexportcommit \
|
|
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
|
|
|
|
# gzip (and optionally bzip2, xz, zip) are runtime dependencies for
|
|
# gitweb.cgi, need to patch so that it's found
|
|
sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
|
|
$out/share/gitweb/gitweb.cgi
|
|
# Give access to CGI.pm and friends (was removed from perl core in 5.22)
|
|
for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do
|
|
sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \
|
|
"$out/share/gitweb/gitweb.cgi"
|
|
done
|
|
''
|
|
|
|
+ (if svnSupport then ''
|
|
# wrap git-svn
|
|
wrapProgram $out/libexec/git-core/git-svn \
|
|
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath (perlLibs ++ [svn.out])}" \
|
|
--prefix PATH : "${svn.out}/bin" ''
|
|
else '' # replace git-svn by notification script
|
|
notSupported $out/libexec/git-core/git-svn
|
|
'')
|
|
|
|
+ (if sendEmailSupport then ''
|
|
# wrap git-send-email
|
|
wrapProgram $out/libexec/git-core/git-send-email \
|
|
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath smtpPerlLibs}"
|
|
'' else ''
|
|
# replace git-send-email by notification script
|
|
notSupported $out/libexec/git-core/git-send-email
|
|
'')
|
|
|
|
+ stdenv.lib.optionalString withManual ''# Install man pages and Info manual
|
|
make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-info \
|
|
-C Documentation ''
|
|
|
|
+ (if guiSupport then ''
|
|
# Wrap Tcl/Tk programs
|
|
for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
|
|
sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
|
|
-e "s|exec wish|exec '${tk}/bin/wish'|g" \
|
|
"$out/$prog"
|
|
done
|
|
'' else ''
|
|
# Don't wrap Tcl/Tk, replace them by notification scripts
|
|
for prog in bin/gitk libexec/git-core/git-gui; do
|
|
notSupported "$out/$prog"
|
|
done
|
|
'')
|
|
+ stdenv.lib.optionalString stdenv.isDarwin ''
|
|
# enable git-credential-osxkeychain by default if darwin
|
|
cat > $out/etc/gitconfig << EOF
|
|
[credential]
|
|
helper = osxkeychain
|
|
EOF
|
|
'';
|
|
|
|
|
|
## InstallCheck
|
|
|
|
doCheck = false;
|
|
doInstallCheck = true;
|
|
|
|
installCheckTarget = "test";
|
|
|
|
# see also installCheckFlagsArray
|
|
installCheckFlags = "DEFAULT_TEST_TARGET=prove";
|
|
|
|
preInstallCheck = ''
|
|
installCheckFlagsArray+=(
|
|
GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save"
|
|
GIT_TEST_INSTALLED=$out/bin
|
|
${stdenv.lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"}
|
|
)
|
|
|
|
function disable_test {
|
|
local test=$1 pattern=$2
|
|
if [ $# -eq 1 ]; then
|
|
mv t/{,skip-}$test.sh || true
|
|
else
|
|
sed -i t/$test.sh \
|
|
-e "/^ *test_expect_.*$pattern/,/^ *' *\$/{s/^/#/}"
|
|
fi
|
|
}
|
|
|
|
# Shared permissions are forbidden in sandbox builds.
|
|
disable_test t0001-init shared
|
|
disable_test t1301-shared-repo
|
|
|
|
# Our patched gettext never fallbacks
|
|
disable_test t0201-gettext-fallbacks
|
|
|
|
${stdenv.lib.optionalString (!sendEmailSupport) ''
|
|
# Disable sendmail tests
|
|
disable_test t9001-send-email
|
|
''}
|
|
|
|
# XXX: I failed to understand why this one fails.
|
|
# Could someone try to re-enable it on the next release ?
|
|
# Tested to fail: 2.18.0 and 2.19.0
|
|
disable_test t1700-split-index "null sha1"
|
|
|
|
# Tested to fail: 2.18.0
|
|
disable_test t7005-editor "editor with a space"
|
|
disable_test t7005-editor "core.editor with a space"
|
|
|
|
# Tested to fail: 2.18.0
|
|
disable_test t9902-completion "sourcing the completion script clears cached --options"
|
|
|
|
# As of 2.19.0, t5562 refers to #!/usr/bin/perl
|
|
patchShebangs t/t5562/invoke-with-content-length.pl
|
|
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
|
# XXX: Some tests added in 2.24.0 fail.
|
|
# Please try to re-enable on the next release.
|
|
disable_test t7816-grep-binary-pattern
|
|
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
|
|
# Test fails (as of 2.17.0, musl 1.1.19)
|
|
disable_test t3900-i18n-commit
|
|
# Fails largely due to assumptions about BOM
|
|
# Tested to fail: 2.18.0
|
|
disable_test t0028-working-tree-encoding
|
|
'';
|
|
|
|
stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ];
|
|
|
|
|
|
meta = {
|
|
homepage = https://git-scm.com/;
|
|
description = "Distributed version control system";
|
|
license = stdenv.lib.licenses.gpl2;
|
|
|
|
longDescription = ''
|
|
Git, a popular distributed version control system designed to
|
|
handle very large projects with speed and efficiency.
|
|
'';
|
|
|
|
platforms = stdenv.lib.platforms.all;
|
|
maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens globin ];
|
|
};
|
|
}
|