diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-22 18:06:10 -0500 |
|---|---|---|
| committer | Guillaume Maudoux <guillaume.maudoux@uclouvain.be> | 2018-04-11 17:54:08 +0200 |
| commit | 260194193c333a3d939a07989f160f3d6e1b3047 (patch) | |
| tree | 737addeae92f5124ceef8fa8c906678470a1781b /pkgs/applications/version-management | |
| parent | d117204d1727d9216580e8990a630b5b84503789 (diff) | |
| download | nixlib-260194193c333a3d939a07989f160f3d6e1b3047.tar nixlib-260194193c333a3d939a07989f160f3d6e1b3047.tar.gz nixlib-260194193c333a3d939a07989f160f3d6e1b3047.tar.bz2 nixlib-260194193c333a3d939a07989f160f3d6e1b3047.tar.lz nixlib-260194193c333a3d939a07989f160f3d6e1b3047.tar.xz nixlib-260194193c333a3d939a07989f160f3d6e1b3047.tar.zst nixlib-260194193c333a3d939a07989f160f3d6e1b3047.zip | |
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 | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch | 8 |
2 files changed, 6 insertions, 6 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 38509dddeb8f..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" ]; 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 |