tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
sourcegit: 2025.25 -> 2025.29
TomaSajt
6 months ago
085f7147
0c52612d
+13
-8
2 changed files
expand all
collapse all
unified
split
pkgs
by-name
so
sourcegit
fix-darwin-git-path.patch
package.nix
+11
-6
pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch
···
1
1
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
2
2
-
index a24f1b6..4102274 100644
2
2
+
index f6eb4eb..1840db7 100644
3
3
--- a/src/Native/Linux.cs
4
4
+++ b/src/Native/Linux.cs
5
5
-
@@ -97,7 +97,7 @@ namespace SourceGit.Native
5
5
+
@@ -119,7 +119,7 @@ namespace SourceGit.Native
6
6
}
7
7
}
8
8
···
10
10
+ public static string FindExecutable(string filename)
11
11
{
12
12
var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
13
13
-
var pathes = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
13
13
+
var paths = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
14
14
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
15
15
-
index 5721fe8..bc2a57d 100644
15
15
+
index a021a16..6b3dff0 100644
16
16
--- a/src/Native/MacOS.cs
17
17
+++ b/src/Native/MacOS.cs
18
18
-
@@ -25,13 +25,7 @@ namespace SourceGit.Native
18
18
+
@@ -46,18 +46,7 @@ namespace SourceGit.Native
19
19
20
20
public string FindGitExecutable()
21
21
{
22
22
- var gitPathVariants = new List<string>() {
23
23
-
- "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git"
23
23
+
- "/usr/bin/git",
24
24
+
- "/usr/local/bin/git",
25
25
+
- "/opt/homebrew/bin/git",
26
26
+
- "/opt/homebrew/opt/git/bin/git"
24
27
- };
28
28
+
-
25
29
- foreach (var path in gitPathVariants)
26
30
- if (File.Exists(path))
27
31
- return path;
32
32
+
-
28
33
- return string.Empty;
29
34
+ return Linux.FindExecutable("git");
30
35
}
+2
-2
pkgs/by-name/so/sourcegit/package.nix
···
21
21
22
22
buildDotnetModule (finalAttrs: {
23
23
pname = "sourcegit";
24
24
-
version = "2025.25";
24
24
+
version = "2025.29";
25
25
26
26
src = fetchFromGitHub {
27
27
owner = "sourcegit-scm";
28
28
repo = "sourcegit";
29
29
tag = "v${finalAttrs.version}";
30
30
-
hash = "sha256-WPwvOfbCOCQBOvJU2HuGU9/Rh00MCmhZEaKn9Nr1Q0I=";
30
30
+
hash = "sha256-ptHiC5BaX0EP2uInGE7/FV61wsCU2V+FE1VHxJKN+70=";
31
31
};
32
32
33
33
patches = [ ./fix-darwin-git-path.patch ];