Skip to content

gitbutler: 0.14.19 -> 0.15.10 #431873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

gitbutler: 0.14.19 -> 0.15.10 #431873

wants to merge 2 commits into from

Conversation

getchoo
Copy link
Member

@getchoo getchoo commented Aug 7, 2025 •
edited
Loading

Diff: gitbutlerapp/gitbutler@release/0.14.9...release/0.15.10
Changelog: https://github.com/gitbutlerapp/gitbutler/releases/tag/release%2F0.15.10

Fixes: #419314
Supersedes: #424156

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@getchoo getchoo added the backport release-25.05 Backport PR automatically label Aug 7, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Aug 7, 2025
@nix-owners nix-owners bot requested a review from techknowlogick August 7, 2025 22:59
@nixpkgs-ci nixpkgs-ci bot added 9.needs: reviewer This PR currently has no reviewers requested and needs attention. and removed 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Aug 7, 2025
@getchoo getchoo force-pushed the pkgs/gitbutler/0.15.9 branch from 11ad493 to b343c89 Compare August 11, 2025 15:00
@getchoo getchoo force-pushed the pkgs/gitbutler/0.15.9 branch from b343c89 to 565a527 Compare August 11, 2025 15:02
@getchoo getchoo changed the title gitbutler: 0.14.19 -> 0.15.9 gitbutler: 0.14.19 -> 0.15.10 Aug 11, 2025
@getchoo getchoo mentioned this pull request Aug 11, 2025
Open
13 tasks
@getchoo
Copy link
Member Author

getchoo commented Aug 11, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 431873
Commit: 565a5270d0e605dbfbecb2762e34b246e0538425

x86_64-linux

✅ 1 package built:
  • gitbutler

@dtomvan
Copy link
Contributor

dtomvan commented Aug 11, 2025

Uhh, that patch file is very hard to look at. I'm guessing it patches Cargo.toml and then replaces half of Cargo.lock, but in this case I'd rather see cp ${./Cargo.lock} Cargo.lock in postPatch or something, since then the patch file can be around 10 lines, which is much more reasonable.

@getchoo
Copy link
Member Author

getchoo commented Aug 11, 2025

I'm guessing it patches Cargo.toml and then replaces half of Cargo.lock, but in this case I'd rather see cp ${./Cargo.lock} Cargo.lock in postPatch or something

That'd force us into vendoring a file 3x the size of the current patch at ~12k lines, which I don't think is a great idea either

An alternative could be to separate the Cargo.toml and Cargo.lock patch files? But honestly I've seen and done this many times without issue 🤷

@getchoo
Copy link
Member Author

getchoo commented Aug 11, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 431873
Commit: 565a5270d0e605dbfbecb2762e34b246e0538425

aarch64-darwin

✅ 1 package built:
  • gitbutler

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@techknowlogick techknowlogick Awaiting requested review from techknowlogick

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. backport release-25.05 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update Request: gitbutler 0.14.19 → 0.14.35
2 participants
@getchoo @dtomvan