Merge pull request #298309 from minijackson/fix-git-branchless
git-branchless: fix tests with Git > 2.44.0
This commit is contained in:
commit
505a51ee7d
1 changed files with 14 additions and 0 deletions
|
@ -1,5 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, git
|
, git
|
||||||
, libiconv
|
, libiconv
|
||||||
, ncurses
|
, ncurses
|
||||||
|
@ -23,6 +24,19 @@ rustPlatform.buildRustPackage rec {
|
||||||
hash = "sha256-ev56NzrEF7xm3WmR2a0pHPs69Lvmb4He7+kIBYiJjKY=";
|
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=";
|
cargoHash = "sha256-Ppw5TN/6zMNxFAx90Q9hQ7RdGxV+TT8UlOm68ldK8oc=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
Loading…
Reference in a new issue