diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-03-24 09:12:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-24 09:12:15 +0100 |
| commit | 505a51ee7d4402258fba8a5a16320a5daf5ad8e9 (patch) | |
| tree | 8e4ac49e0b117041de26b74fad504bd7d3b974f3 /pkgs/applications/version-management | |
| parent | a54d54582656b7dea6c4b97b825e8a7f7076aa52 (diff) | |
| parent | 91753acc4fc1d3df9745adfb41e0ee2addb49b28 (diff) | |
| download | nixlib-505a51ee7d4402258fba8a5a16320a5daf5ad8e9.tar nixlib-505a51ee7d4402258fba8a5a16320a5daf5ad8e9.tar.gz nixlib-505a51ee7d4402258fba8a5a16320a5daf5ad8e9.tar.bz2 nixlib-505a51ee7d4402258fba8a5a16320a5daf5ad8e9.tar.lz nixlib-505a51ee7d4402258fba8a5a16320a5daf5ad8e9.tar.xz nixlib-505a51ee7d4402258fba8a5a16320a5daf5ad8e9.tar.zst nixlib-505a51ee7d4402258fba8a5a16320a5daf5ad8e9.zip | |
Merge pull request #298309 from minijackson/fix-git-branchless
git-branchless: fix tests with Git > 2.44.0
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-branchless/default.nix | 14 |
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 a8041f2698bb..d214f7b90608 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 ]; |