98c44f5657
disable_test: Use \s instead of ' ' as tabs are used for indentation in t5324-split-commit-graph.sh. It's also necessary to insert : (no op) in front of # to prevent Bash syntax errors due to empty loops. Two newly added tests fail due the usage of shared permissions (outside of the build sandbox they succeed, actually even with breakpointHook (cntr attach + cntr exec bash)): ``` t5324-split-commit-graph.sh (Wstat: 256 Tests: 29 Failed: 2) Failed tests: 28-29 Non-zero exit status: 1 ``` I'm also adding myself as maintainer since there currently doesn't seem to be a fixed one for regular updates. Announcement: https://lkml.kernel.org/lkml/xmqqzh9mu4my.fsf@gitster.c.googlers.com/
350 lines
13 KiB
Nix
350 lines
13 KiB
Nix
{ fetchurl, stdenv, buildPackages
|
|
, curl, openssl, zlib, expat, perlPackages, python3, 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.27.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 = "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk";
|
|
};
|
|
|
|
outputs = [ "out" "doc" ];
|
|
|
|
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"
|
|
"ac_cv_iconv_omits_bom=no"
|
|
"ac_cv_prog_CURL_CONFIG=${curl.dev}/bin/curl-config"
|
|
];
|
|
|
|
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=${python3}/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"
|
|
# git-gui refuses to start with the version of tk distributed with
|
|
# macOS Catalina. We can prevent git from building the .app bundle
|
|
# by specifying an invalid tk framework. The postInstall step will
|
|
# then ensure that git-gui uses tcl/tk from nixpkgs, which is an
|
|
# acceptable version.
|
|
#
|
|
# See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706
|
|
++ stdenv.lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent";
|
|
|
|
|
|
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/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/
|
|
mkdir -p $out/share/zsh/site-functions
|
|
ln -s $out/share/git/contrib/completion/git-completion.zsh $out/share/zsh/site-functions/_git
|
|
|
|
# Patch the zsh completion script so it can find the Bash completion script.
|
|
sed -i -e "/locations=(/a \${"\t\t"}'$out/share/git/contrib/completion/git-completion.bash'" \
|
|
$out/share/git/contrib/completion/git-completion.zsh
|
|
|
|
# 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.perl" $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-html 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
|
|
ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk
|
|
'' 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"
|
|
"PERL_PATH=${buildPackages.perl}/bin/perl"
|
|
];
|
|
|
|
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 "/^\s*test_expect_.*$pattern/,/^\s*' *\$/{s/^/: #/}"
|
|
fi
|
|
}
|
|
|
|
# Shared permissions are forbidden in sandbox builds.
|
|
disable_test t0001-init shared
|
|
disable_test t1301-shared-repo
|
|
disable_test t5324-split-commit-graph 'split commit-graph respects core.sharedrepository'
|
|
|
|
# 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 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
|
|
''}
|
|
'' + 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;
|
|
changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt";
|
|
|
|
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; [ primeos peti wmertens globin ];
|
|
};
|
|
}
|