pyrox.dev
git: 2.9.3 -> 2.10.0
+2
-2
pkgs/applications/version-management/git-and-tools/git/default.nix
+2
-2
pkgs/applications/version-management/git-and-tools/git/default.nix
···
10
10
}:
11
11
12
12
let
13
-
version = "2.9.3";
13
+
version = "2.10.0";
14
14
svn = subversionClient.override { perlBindings = true; };
15
15
in
16
16
···
19
19
20
20
src = fetchurl {
21
21
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
22
-
sha256 = "0qzs681a64k3shh5p0rg41l1z16fbk5sj0xga45k34hp1hsp654z";
22
+
sha256 = "1rr9zyafb6q3wixyjar6cc7z7vdh1dqa4b5irz3gz1df02n68cy7";
23
23
};
24
24
25
25
hardeningDisable = [ "format" ];
+25
-9
pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
+25
-9
pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
···
1
-
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
2
-
index e6c3116..4e34a2c 100644
3
1
--- a/git-sh-i18n.sh
4
2
+++ b/git-sh-i18n.sh
5
-
@@ -15,69 +15,11 @@ else
3
+
@@ -15,87 +15,11 @@
6
4
fi
7
5
export TEXTDOMAINDIR
8
-
6
+
9
7
-# First decide what scheme to use...
10
8
-GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
11
9
-if test -n "@@USE_GETTEXT_SCHEME@@"
···
44
42
- git sh-i18n--envsubst "$1"
45
43
- )
46
44
- }
45
+
-
46
+
- eval_ngettext () {
47
+
- ngettext "$1" "$2" "$3" | (
48
+
- export PATH $(git sh-i18n--envsubst --variables "$2");
49
+
- git sh-i18n--envsubst "$2"
50
+
- )
51
+
- }
47
52
- ;;
48
53
-poison)
49
54
- # Emit garbage so that tests that incorrectly rely on translatable
···
53
58
- }
54
59
-
55
60
- eval_gettext () {
61
+
- printf "%s" "# GETTEXT POISON #"
62
+
- }
63
+
-
64
+
- eval_ngettext () {
56
65
- printf "%s" "# GETTEXT POISON #"
57
66
- }
58
67
- ;;
···
60
69
- gettext () {
61
70
- printf "%s" "$1"
62
71
- }
63
-
+# GNU gettext
64
-
+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
65
-
+export PATH=@gettext@/bin:$PATH
66
-
72
+
-
67
73
- eval_gettext () {
68
74
- printf "%s" "$1" | (
69
75
- export PATH $(git sh-i18n--envsubst --variables "$1");
70
76
- git sh-i18n--envsubst "$1"
71
77
- )
72
78
- }
79
+
+# GNU gettext
80
+
+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
81
+
+export PATH=@gettext@/bin:$PATH
82
+
83
+
- eval_ngettext () {
84
+
- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
85
+
- export PATH $(git sh-i18n--envsubst --variables "$2");
86
+
- git sh-i18n--envsubst "$2"
87
+
- )
88
+
- }
73
89
- ;;
74
90
-esac
75
91
+. @gettext@/bin/gettext.sh
76
-
92
+
77
93
# Git-specific wrapper functions
78
94
gettextln () {