Unverified Commit 1e95f6ca authored by TomaSajt's avatar TomaSajt
Browse files

sourcegit: 2025.01 -> 2025.03

parent e47c5369
Loading
Loading
Loading
Loading
+8 −18
Original line number Diff line number Diff line
@@ -104,11 +104,6 @@
    "version": "8.3.2",
    "hash": "sha256-zY+iB5Rj/8ru0xpRWwFLFO6JI3UFB/XHnx9pWmrZCAs="
  },
  {
    "pname": "HarfBuzzSharp",
    "version": "7.3.0.2",
    "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
  },
  {
    "pname": "HarfBuzzSharp",
    "version": "7.3.0.3",
@@ -136,18 +131,18 @@
  },
  {
    "pname": "LiveChartsCore",
    "version": "2.0.0-rc4.5",
    "hash": "sha256-2Fgn9Bo1aM6dZHCU+OVykOhggTzpcEfFNfYtWc4yvHc="
    "version": "2.0.0-rc5",
    "hash": "sha256-NHgYbeIdAoZlrC6QgVb1oLo3dlo17R8yTbPgiHMmJZc="
  },
  {
    "pname": "LiveChartsCore.SkiaSharpView",
    "version": "2.0.0-rc4.5",
    "hash": "sha256-03RR14tA0DtYHiLdgmAI4Gp5/e2H6QPkNFOBeqiFaJU="
    "version": "2.0.0-rc5",
    "hash": "sha256-zppOFKHGn2HJMP8AAuk6mxJXqvgjfN7o8f0sInUWZGc="
  },
  {
    "pname": "LiveChartsCore.SkiaSharpView.Avalonia",
    "version": "2.0.0-rc4.5",
    "hash": "sha256-lzG/5e6WDpUiHZ8GvovOMvwXyYoVBeB1Ktuuw2Fx5No="
    "version": "2.0.0-rc5",
    "hash": "sha256-xyFEZWWkRlBi8GNCDpyOUzt6aEe+9sR1+VN2yY59mhg="
  },
  {
    "pname": "MicroCom.Runtime",
@@ -159,11 +154,6 @@
    "version": "1.0.6",
    "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU="
  },
  {
    "pname": "SkiaSharp",
    "version": "2.88.8",
    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
  },
  {
    "pname": "SkiaSharp",
    "version": "2.88.9",
@@ -171,8 +161,8 @@
  },
  {
    "pname": "SkiaSharp.HarfBuzz",
    "version": "2.88.8",
    "hash": "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="
    "version": "2.88.9",
    "hash": "sha256-JH8Jr25eftPfq0BztamvxfDcAZtnx/jLRj5DGCS5/G8="
  },
  {
    "pname": "SkiaSharp.NativeAssets.Linux",
+4 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index 5721fe8..bc2a57d 100644
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@@ -25,12 +25,7 @@ namespace SourceGit.Native
@@ -25,13 +25,7 @@ namespace SourceGit.Native
 
         public string FindGitExecutable()
         {
@@ -23,7 +23,8 @@ index 5721fe8..bc2a57d 100644
-                 "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git"
-            };
-            foreach (var path in gitPathVariants)
-                if (File.Exists(path)) return path;
-                if (File.Exists(path))
-                    return path;
-            return string.Empty;
+            return Linux.FindExecutable("git");
         }
+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@

buildDotnetModule (finalAttrs: {
  pname = "sourcegit";
  version = "2025.01";
  version = "2025.03";

  src = fetchFromGitHub {
    owner = "sourcegit-scm";
    repo = "sourcegit";
    tag = "v${finalAttrs.version}";
    hash = "sha256-6FO0WRUcWm7xnuw6Br97+cWZhvzIOesg/eANZzeyxZo=";
    hash = "sha256-l1M3ix0HY87y2ES/iwT2Ju/Mwb8CCmnz95amHlYKFS4=";
  };

  patches = [ ./fix-darwin-git-path.patch ];