-
-
Notifications
You must be signed in to change notification settings - Fork 16.6k
gitbutler: 0.14.19 -> 0.15.2 #424156
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.
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
base: master
Are you sure you want to change the base?
gitbutler: 0.14.19 -> 0.15.2 #424156
Conversation
https://github.com/NixOS/nixpkgs/actions/runs/16206295002/job/45757257515?pr=424156 Well this is awkward... |
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. 1 nit.
./vendor-gix-testtools-from-github.patch | ||
|
||
# Frontend doesn't build if dependencies like svelte-comment-injector haven't been built yet | ||
./build-dependencies-before-frontend.patch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could/should this patch get upstreamed? If so, we could do fetchpatch2
.
Merge conflict caused by #425149 |
|
Damn, should've seen that coming. Let me push this. |
Okay, after
|
Getting the following on
|
Yup, that's been addressed I think |
version | ||
src | ||
patches | ||
; | ||
fetcherVersion = 1; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you try updating to the latest fetcherVersion? You also need to regenerate the hash. It hopefully fixes the hash mismatch error that happened to a few people
fetcherVersion = 1; | |
fetcherVersion = 2; |
Changelog: https://github.com/gitbutlerapp/gitbutler/releases/tag/release/0.15.2
Full diff: gitbutlerapp/gitbutler@release/0.14.19...release/0.15.2
Resolves: #419314
See: gitbutlerapp/gitbutler#9144
This PR adds a Cargo.lock to the tree as a result of the patches that got added in order to resolve conflicts between vendored dependencies.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.
cc @getchoo @techknowlogick