diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-20 06:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-20 06:00:55 +0000 |
| commit | 08ab9ccd58e62c627a0c6cb43d1d437b429d8fc6 (patch) | |
| tree | 24f1d102e90b2f4f661de89567046e56c48e87d8 /pkgs/applications/version-management | |
| parent | 8dbb068bd39477b494c21152065c06a3d7e394fa (diff) | |
| parent | 026f02ce7dfeba48a1c1a2b3cd8c7d8329f1f5b2 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-branchless/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index cccbb0503fedd..44047945728a9 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -27,12 +27,14 @@ rustPlatform.buildRustPackage rec { patches = [ # Fix tests with Git 2.44.0+ (fetchpatch { - url = "https://github.com/arxanas/git-branchless/pull/1245.patch"; + name = "1245.patch"; # https://github.com/arxanas/git-branchless/pull/1245 + url = "https://github.com/arxanas/git-branchless/commit/c8436aed3d616409b4d6fb1eedb383077f435497.patch"; hash = "sha256-gBm0A478Uhg9IQVLQppvIeTa8s1yHUMddxiUbpHUvGw="; }) # Fix tests with Git 2.44.0+ (fetchpatch { - url = "https://github.com/arxanas/git-branchless/pull/1161.patch"; + name = "1161.patch"; # https://github.com/arxanas/git-branchless/pull/1161 + url = "https://github.com/arxanas/git-branchless/commit/6e1f26900a0dd60d10d9aa3552cab9181fa7be03.patch"; hash = "sha256-KHobEIXhlDar8CvIVUi4I695jcJZXgGRhU86b99x86Y="; }) ]; |