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

sourcegit: 2025.25 -> 2025.29 (#430897)

Browse Source
This commit is contained in:
Mathew Polzin
2025-09-04 21:28:35 -05:00
committed by GitHub
parent 839424b137 085f714777
commit 3246edf6fe
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch
View File

@@ -1,8 +1,8 @@
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index a24f1b6..4102274 100644 index f6eb4eb..1840db7 100644
--- a/src/Native/Linux.cs --- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs +++ b/src/Native/Linux.cs
@@ -97,7 +97,7 @@ namespace SourceGit.Native @@ -119,7 +119,7 @@ namespace SourceGit.Native
} }
} }
@@ -10,21 +10,26 @@ index a24f1b6..4102274 100644
+ public static string FindExecutable(string filename) + public static string FindExecutable(string filename)
{ {
var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty; var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
var pathes = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries); var paths = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index 5721fe8..bc2a57d 100644 index a021a16..6b3dff0 100644
--- a/src/Native/MacOS.cs --- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs +++ b/src/Native/MacOS.cs
@@ -25,13 +25,7 @@ namespace SourceGit.Native @@ -46,18 +46,7 @@ namespace SourceGit.Native
public string FindGitExecutable() public string FindGitExecutable()
{ {
- var gitPathVariants = new List<string>() { - var gitPathVariants = new List<string>() {
- "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git" - "/usr/bin/git",
- "/usr/local/bin/git",
- "/opt/homebrew/bin/git",
- "/opt/homebrew/opt/git/bin/git"
- }; - };
-
- foreach (var path in gitPathVariants) - foreach (var path in gitPathVariants)
- if (File.Exists(path)) - if (File.Exists(path))
- return path; - return path;
-
- return string.Empty; - return string.Empty;
+ return Linux.FindExecutable("git"); + return Linux.FindExecutable("git");
} }

4
pkgs/by-name/so/sourcegit/package.nix
View File

@@ -21,13 +21,13 @@
buildDotnetModule (finalAttrs: { buildDotnetModule (finalAttrs: {
pname = "sourcegit"; pname = "sourcegit";
version = "2025.25"; version = "2025.29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sourcegit-scm"; owner = "sourcegit-scm";
repo = "sourcegit"; repo = "sourcegit";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-WPwvOfbCOCQBOvJU2HuGU9/Rh00MCmhZEaKn9Nr1Q0I="; hash = "sha256-ptHiC5BaX0EP2uInGE7/FV61wsCU2V+FE1VHxJKN+70=";
}; };
patches = [ ./fix-darwin-git-path.patch ]; patches = [ ./fix-darwin-git-path.patch ];