diff options
author | Will Dietz <github@wdtz.org> | 2018-03-28 09:41:41 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-28 09:41:41 -0500 |
commit | 3d12d78ebcc297ab08aabddaec84f10ccff2dcb3 (patch) | |
tree | 2ca67159e89338027d9db348a20db71bfde03b6d /pkgs/applications/version-management | |
parent | 05e375d7103ac51e2da917965c37246c99f1ae4f (diff) | |
parent | dcaea58eb724c03726b0bf8cfd9c1620fb5d2c34 (diff) | |
download | nixlib-3d12d78ebcc297ab08aabddaec84f10ccff2dcb3.tar nixlib-3d12d78ebcc297ab08aabddaec84f10ccff2dcb3.tar.gz nixlib-3d12d78ebcc297ab08aabddaec84f10ccff2dcb3.tar.bz2 nixlib-3d12d78ebcc297ab08aabddaec84f10ccff2dcb3.tar.lz nixlib-3d12d78ebcc297ab08aabddaec84f10ccff2dcb3.tar.xz nixlib-3d12d78ebcc297ab08aabddaec84f10ccff2dcb3.tar.zst nixlib-3d12d78ebcc297ab08aabddaec84f10ccff2dcb3.zip |
Merge pull request #37672 from dtzWill/update/git-2.16.3
git: 2.16.2 -> 2.16.3
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch | 8 |
2 files changed, 6 insertions, 8 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 e545cb33befe..b336f72c7ac1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.16.2"; + version = "2.16.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m"; + sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; hardeningDisable = [ "format" ]; @@ -58,8 +58,6 @@ stdenv.mkDerivation { + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ") - # XXX: USE_PCRE2 might be useful in general, look into it - # XXX other alpine options? + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else ""); # build git-credential-osxkeychain if darwin diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 97f50064bc3f..216c0e56b44c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -6,15 +6,15 @@ -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "@@USE_GETTEXT_SCHEME@@" +-if test -n "$GIT_GETTEXT_POISON" +-then +- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison +-elif test -n "@@USE_GETTEXT_SCHEME@@" -then - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -then - : no probing necessary --elif test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison -elif type gettext.sh >/dev/null 2>&1 -then - # GNU libintl's gettext.sh |