diff options
| author | J Phani Mahesh <phanimahesh@gmail.com> | 2016-09-03 16:20:32 +0530 |
|---|---|---|
| committer | J Phani Mahesh <phanimahesh@gmail.com> | 2016-09-03 16:20:32 +0530 |
| commit | 2b86ccbf321bc75100c86446aa6706b335445270 (patch) | |
| tree | b67a61668004d10cc33adab77fc5db3e1f7e863f /pkgs | |
| parent | 297008b9593d0be4c0eedb084b0e99cf850ce3a4 (diff) | |
| download | nixlib-2b86ccbf321bc75100c86446aa6706b335445270.tar nixlib-2b86ccbf321bc75100c86446aa6706b335445270.tar.gz nixlib-2b86ccbf321bc75100c86446aa6706b335445270.tar.bz2 nixlib-2b86ccbf321bc75100c86446aa6706b335445270.tar.lz nixlib-2b86ccbf321bc75100c86446aa6706b335445270.tar.xz nixlib-2b86ccbf321bc75100c86446aa6706b335445270.tar.zst nixlib-2b86ccbf321bc75100c86446aa6706b335445270.zip | |
git: 2.9.3 -> 2.10.0
Diffstat (limited to 'pkgs')
| -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 | 34 |
2 files changed, 27 insertions, 11 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 4eea75ad4ef8..9cbc596bbb1a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ }: let - version = "2.9.3"; + version = "2.10.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0qzs681a64k3shh5p0rg41l1z16fbk5sj0xga45k34hp1hsp654z"; + sha256 = "1rr9zyafb6q3wixyjar6cc7z7vdh1dqa4b5irz3gz1df02n68cy7"; }; 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 8e3ee2bce896..97f50064bc3f 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 @@ -1,11 +1,9 @@ -diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh -index e6c3116..4e34a2c 100644 --- a/git-sh-i18n.sh +++ b/git-sh-i18n.sh -@@ -15,69 +15,11 @@ else +@@ -15,87 +15,11 @@ fi export TEXTDOMAINDIR - + -# First decide what scheme to use... -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough -if test -n "@@USE_GETTEXT_SCHEME@@" @@ -44,6 +42,13 @@ index e6c3116..4e34a2c 100644 - git sh-i18n--envsubst "$1" - ) - } +- +- eval_ngettext () { +- ngettext "$1" "$2" "$3" | ( +- export PATH $(git sh-i18n--envsubst --variables "$2"); +- git sh-i18n--envsubst "$2" +- ) +- } - ;; -poison) - # Emit garbage so that tests that incorrectly rely on translatable @@ -55,24 +60,35 @@ index e6c3116..4e34a2c 100644 - eval_gettext () { - printf "%s" "# GETTEXT POISON #" - } +- +- eval_ngettext () { +- printf "%s" "# GETTEXT POISON #" +- } - ;; -*) - gettext () { - printf "%s" "$1" - } -+# GNU gettext -+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu -+export PATH=@gettext@/bin:$PATH - +- - eval_gettext () { - printf "%s" "$1" | ( - export PATH $(git sh-i18n--envsubst --variables "$1"); - git sh-i18n--envsubst "$1" - ) - } ++# GNU gettext ++export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu ++export PATH=@gettext@/bin:$PATH + +- eval_ngettext () { +- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | ( +- export PATH $(git sh-i18n--envsubst --variables "$2"); +- git sh-i18n--envsubst "$2" +- ) +- } - ;; -esac +. @gettext@/bin/gettext.sh - + # Git-specific wrapper functions gettextln () { |