diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-01 06:13:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-01 06:13:02 +0000 |
| commit | fc5f95bde9d9ddc0b885d1e4c8487fed7a77fb6f (patch) | |
| tree | 99d2cdc70bdeaaf3d071978de524e83dd3db9680 /pkgs/applications/version-management | |
| parent | 51e600a3e59d43909b7e6db14e1bba12505ab968 (diff) | |
| parent | 348518c7ef7a07ca17cdf2e4c090573e24f7d858 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-branchless/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index 902211ef3d7fe..c6cd7079191d4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -15,16 +15,24 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-WFrN5TRFr9xHBUawTfvri0qlTiWCfAeC5SL+T6mwlU0="; + sha256 = "sha256-jAc17poNTld3eptN1Vd1MOKS5iloMWkq3oZgpWBkGTY="; }; - cargoSha256 = "sha256-AGW1jUKPc5iiuDlgIDHG1sOn1flAB3UdxJJNKPH5+f8="; + cargoPatches = [ + (fetchpatch { + name = "build-run-cargo-update"; + url = "https://github.com/arxanas/git-branchless/commit/0ac3f325520f79d15368aa9d14893ebc17313ab6.patch"; + sha256 = "sha256-S1kazUzvz3FzFpphSRhWiv/l2b/+zC9HtAl7ndq5aJA="; + }) + ]; + + cargoSha256 = "sha256-Lo/Q6OSIzWrRNiTGsOWRX+6FEcj4fk1kn7V9tw67UVo="; nativeBuildInputs = [ pkg-config ]; |