pyrox.dev
git: 2.12.2 -> 2.13.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
···
11
}:
12
13
let
14
-
version = "2.12.2";
15
svn = subversionClient.override { perlBindings = true; };
16
in
17
···
20
21
src = fetchurl {
22
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
23
-
sha256 = "0jlccxx7l4c76h830y8lhrxr4kqksrxqlnmj3xb8sqbfa0irw6nj";
24
};
25
26
hardeningDisable = [ "format" ];
···
11
}:
12
13
let
14
+
version = "2.13.0";
15
svn = subversionClient.override { perlBindings = true; };
16
in
17
···
20
21
src = fetchurl {
22
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
23
+
sha256 = "0n0j36rapw31zb0sabap88ffncv8jg3nwc4miyim64ilyav2mgsb";
24
};
25
26
hardeningDisable = [ "format" ];
+6
-6
pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
+6
-6
pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
···
2
index fd7ffe1..20cd992 100644
3
--- a/connect.c
4
+++ b/connect.c
5
-
@@ -768,7 +768,7 @@ struct child_process *git_connect(int fd[2], const char *url,
6
-
7
ssh = getenv("GIT_SSH");
8
if (!ssh)
9
- ssh = "ssh";
10
+ ssh = "@ssh@";
11
-
12
-
ssh_dup = xstrdup(ssh);
13
-
base = basename(ssh_dup);
14
diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
15
index 50029d0..17b9594 100644
16
--- a/git-gui/lib/remote_add.tcl
17
+++ b/git-gui/lib/remote_add.tcl
18
-
@@ -139,7 +139,7 @@ method _add {} {
19
# Parse the location
20
if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]
21
|| [regexp {([^:][^:]+):(.+)} $location xx host path]} {
···
2
index fd7ffe1..20cd992 100644
3
--- a/connect.c
4
+++ b/connect.c
5
+
@@ -768,7 +768,7 @@
6
+
7
ssh = getenv("GIT_SSH");
8
if (!ssh)
9
- ssh = "ssh";
10
+ ssh = "@ssh@";
11
+
else
12
+
handle_ssh_variant(ssh, 0,
13
+
&port_option,
14
diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
15
index 50029d0..17b9594 100644
16
--- a/git-gui/lib/remote_add.tcl
17
+++ b/git-gui/lib/remote_add.tcl
18
+
@@ -139,7 +139,7 @@
19
# Parse the location
20
if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]
21
|| [regexp {([^:][^:]+):(.+)} $location xx host path]} {