public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: 2.9.3 -> 2.10.0

Browse Source
This commit is contained in:
J Phani Mahesh 2016-09-03 16:20:32 +05:30
parent 297008b959
commit 2b86ccbf32
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -10,7 +10,7 @@
}: }:
let let
version = "2.9.3"; version = "2.10.0";
svn = subversionClient.override { perlBindings = true; }; svn = subversionClient.override { perlBindings = true; };
in in
@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0qzs681a64k3shh5p0rg41l1z16fbk5sj0xga45k34hp1hsp654z"; sha256 = "1rr9zyafb6q3wixyjar6cc7z7vdh1dqa4b5irz3gz1df02n68cy7";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

30
pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
View File

@ -1,8 +1,6 @@
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index e6c3116..4e34a2c 100644
--- a/git-sh-i18n.sh --- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh +++ b/git-sh-i18n.sh
@@ -15,69 +15,11 @@ else @@ -15,87 +15,11 @@
fi fi
export TEXTDOMAINDIR export TEXTDOMAINDIR
@ -44,6 +42,13 @@ index e6c3116..4e34a2c 100644
- git sh-i18n--envsubst "$1" - 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) -poison)
- # Emit garbage so that tests that incorrectly rely on translatable - # Emit garbage so that tests that incorrectly rely on translatable
@ -55,21 +60,32 @@ index e6c3116..4e34a2c 100644
- eval_gettext () { - eval_gettext () {
- printf "%s" "# GETTEXT POISON #" - printf "%s" "# GETTEXT POISON #"
- } - }
-
- eval_ngettext () {
- printf "%s" "# GETTEXT POISON #"
- }
- ;; - ;;
-*) -*)
- gettext () { - gettext () {
- printf "%s" "$1" - printf "%s" "$1"
- } - }
+# GNU gettext -
+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
+export PATH=@gettext@/bin:$PATH
- eval_gettext () { - eval_gettext () {
- printf "%s" "$1" | ( - printf "%s" "$1" | (
- export PATH $(git sh-i18n--envsubst --variables "$1"); - export PATH $(git sh-i18n--envsubst --variables "$1");
- git sh-i18n--envsubst "$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 -esac
+. @gettext@/bin/gettext.sh +. @gettext@/bin/gettext.sh