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

Merge pull request #298309 from minijackson/fix-git-branchless 

git-branchless: fix tests with Git > 2.44.0
This commit is contained in:
Pol Dellaiera 2024-03-24 09:12:15 +01:00 committed by GitHub
parent a54d545826 91753acc4f
commit 505a51ee7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/version-management/git-branchless/default.nix
View File

@ -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 ];