about summary refs log tree commit diff
path: root/pkgs/applications/version-management/git-branchless
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2024-03-23 09:34:04 +0100
committerMinijackson <minijackson@riseup.net>2024-03-24 07:54:25 +0100
commit91753acc4fc1d3df9745adfb41e0ee2addb49b28 (patch)
tree4909ca13ba0023af34a1cf732217506811e2e9b2 /pkgs/applications/version-management/git-branchless
parenta986eec15c397b90595c633c3c1bdce06997c582 (diff)
git-branchless: fix tests with Git > 2.44.0
Diffstat (limited to 'pkgs/applications/version-management/git-branchless')
-rw-r--r--pkgs/applications/version-management/git-branchless/default.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix
index a8041f2698bb9..d214f7b90608a 100644
--- a/pkgs/applications/version-management/git-branchless/default.nix
+++ b/pkgs/applications/version-management/git-branchless/default.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, fetchpatch
 , git
 , libiconv
 , ncurses
@@ -23,6 +24,19 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ev56NzrEF7xm3WmR2a0pHPs69Lvmb4He7+kIBYiJjKY=";
   };
 
+  patches = [
+    # Fix tests with Git 2.44.0+
+    (fetchpatch {
+      url = "https://github.com/arxanas/git-branchless/pull/1245.patch";
+      hash = "sha256-gBm0A478Uhg9IQVLQppvIeTa8s1yHUMddxiUbpHUvGw=";
+    })
+    # Fix tests with Git 2.44.0+
+    (fetchpatch {
+      url = "https://github.com/arxanas/git-branchless/pull/1161.patch";
+      hash = "sha256-KHobEIXhlDar8CvIVUi4I695jcJZXgGRhU86b99x86Y=";
+    })
+  ];
+
   cargoHash = "sha256-Ppw5TN/6zMNxFAx90Q9hQ7RdGxV+TT8UlOm68ldK8oc=";
 
   nativeBuildInputs = [ pkg-config ];