Skip to content

Conversation

25huizengek1
Copy link
Contributor

@25huizengek1 25huizengek1 commented Jul 10, 2025

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

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

cc @getchoo @techknowlogick

@25huizengek1
Copy link
Contributor Author

@nix-owners nix-owners bot requested review from techknowlogick and getchoo July 10, 2025 21:29
@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. 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 Jul 10, 2025
@25huizengek1
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 424156
Commit: c13e9e75464ade9ef337ac109e835344d8d20c2e


x86_64-linux

✅ 1 package built:
  • gitbutler

(this was definitely not a waste of time)

Copy link
Contributor

@dtomvan dtomvan left a 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
Copy link
Contributor

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.

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 10, 2025
@25huizengek1 25huizengek1 changed the title gitbutler: 0.4.19 -> 0.15.2 gitbutler: 0.14.19 -> 0.15.2 Jul 12, 2025
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 15, 2025
@hey2022
Copy link

hey2022 commented Jul 16, 2025

Merge conflict caused by #425149

@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 18, 2025
@dtomvan
Copy link
Contributor

dtomvan commented Jul 19, 2025

aarch64-linux seems like an OOM (which, well, the build made it far enough so I think it should actually work on hydra), and both darwin targets seem to want another pnpm-deps hash, probably because they ship with different prebuilt native npm dependencies.

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 424156

Logs: https://github.com/dtomvan/nixpkgs-review-gha/actions/runs/16390198908


x86_64-linux

✅ 1 package built:
  • gitbutler

aarch64-linux

❌ 1 package failed to build:
  • gitbutler

Error logs: `aarch64-linux`
gitbutler
   Compiling but-action v0.0.0 (/build/source/crates/but-action)
   Compiling tauri-plugin-single-instance v2.3.0
   Compiling tracing-appender v0.2.3
   Compiling tracing-forest v0.1.6
   Compiling gitbutler-edit-mode v0.0.0 (/build/source/crates/gitbutler-edit-mode)
   Compiling gitbutler-forge v0.0.0 (/build/source/crates/gitbutler-forge)
warning: unused import: `env`
  --> crates/gitbutler-tauri/src/main.rs:18:51
   |
18 |     action, askpass, cli, commands, config, diff, env, forge, github, logs, menu, modes, open,
   |                                                   ^^^
   |
   = note: `#[warn(unused_imports)]` on by default

warning: gitbutler-tauri (bin "gitbutler-tauri") generated 1 warning (run cargo fix --bin "gitbutler-tauri" to apply 1 suggestion)
error: could not compile gitbutler-tauri (bin "gitbutler-tauri"); 1 warning emitted

Caused by:
process didn't exit successfully: rustc --crate-name gitbutler_tauri --edition=2021 crates/gitbutler-tauri/src/main.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C opt-level=s -C lto -C codegen-units=1 -C debuginfo=2 '--deny=clippy::perf' '--deny=clippy::correctness' '--deny=clippy::all' --cfg 'feature="custom-protocol"' --cfg 'feature="default"' --cfg 'feature="devtools"' --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values("custom-protocol", "default", "devtools", "error-context", "windows"))' -C metadata=8cf51baf3a6acdba -C extra-filename=-7fce3d63be01c1d2 --out-dir /build/source/target/aarch64-unknown-linux-gnu/release/deps --target aarch64-unknown-linux-gnu -C linker=/nix/store/93spmf188qkl70b3816g6kkqzlgvs4vc-gcc-wrapper-14.3.0/bin/cc -L dependency=/build/source/target/aarch64-unknown-linux-gnu/release/deps -L dependency=/build/source/target/release/deps --extern anyhow=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libanyhow-45dd26b2faa81d60.rlib --extern but_action=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libbut_action-a187dd353d2d775a.rlib --extern but_core=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libbut_core-82eecf053a011df5.rlib --extern but_db=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libbut_db-2c38b36c0659b147.rlib --extern but_graph=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libbut_graph-0d6c90dc2a241d8e.rlib --extern but_hunk_assignment=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libbut_hunk_assignment-8796da52d376bf2e.rlib --extern but_hunk_dependency=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libbut_hunk_dependency-8dd4c191db553fea.rlib --extern but_settings=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libbut_settings-ac4d3fef7402aca3.rlib --extern but_workspace=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libbut_workspace-313ec3396b98a45e.rlib --extern console_subscriber=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libconsole_subscriber-bd2f3679079b8442.rlib --extern dirs=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libdirs-f2f9e7ac60dca255.rlib --extern git2=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgit2-bcabbee4bd2ed30f.rlib --extern gitbutler_branch=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_branch-911e660f680ada44.rlib --extern gitbutler_branch_actions=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_branch_actions-1f5333d55747ffcc.rlib --extern gitbutler_command_context=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_command_context-1d92cb317916541d.rlib --extern gitbutler_diff=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_diff-546c83e273a55fc1.rlib --extern gitbutler_edit_mode=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_edit_mode-b73423cd174e5cb6.rlib --extern gitbutler_error=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_error-e436da3dd093a663.rlib --extern gitbutler_feedback=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_feedback-dcb5f74eaf0dbe42.rlib --extern gitbutler_forge=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_forge-1f44051887f054b3.rlib --extern gitbutler_id=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_id-75700cc729885162.rlib --extern gitbutler_operating_modes=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_operating_modes-aef7444905ac882f.rlib --extern gitbutler_oplog=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_oplog-82080f3b344afea1.rlib --extern gitbutler_oxidize=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_oxidize-d822b89e4503ca5c.rlib --extern gitbutler_project=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_project-633a1261ffe5cc19.rlib --extern gitbutler_reference=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_reference-1f6299176b60d11b.rlib --extern gitbutler_repo=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_repo-d3bfd7cff0ef1b97.rlib --extern gitbutler_repo_actions=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_repo_actions-ffbd102b1d0e1822.rlib --extern gitbutler_secret=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_secret-0a0b407d9e7ed048.rlib --extern gitbutler_stack=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_stack-fb4c84b004d72f14.rlib --extern gitbutler_sync=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_sync-e3a950ec8d4aae27.rlib --extern gitbutler_tauri=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_tauri.rlib --extern gitbutler_user=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_user-3bf27c355ce446f4.rlib --extern gitbutler_watcher=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgitbutler_watcher-d49f7737f99c703b.rlib --extern gix=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libgix-9c13bdd2635f16aa.rlib --extern log=/build/source/target/aarch64-unknown-linux-gnu/release/deps/liblog-b6fbd34c6252b778.rlib --extern open=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libopen-f9b1e65275f41464.rlib --extern parking_lot=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libparking_lot-de9f6ef562571e87.rlib --extern reqwest=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libreqwest-253130720dd2f8f6.rlib --extern serde=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libserde-5753456a99afe70a.rlib --extern serde_error=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libserde_error-2f2f98c35f8e040f.rlib --extern serde_json=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libserde_json-8b07a415759b4cfb.rlib --extern tauri=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri-115d1083939fdef1.rlib --extern tauri_plugin_clipboard_manager=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_clipboard_manager-b0f9d1dd0495556a.rlib --extern tauri_plugin_dialog=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_dialog-85cba16cab358d81.rlib --extern tauri_plugin_fs=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_fs-7a792b23e957c075.rlib --extern tauri_plugin_http=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_http-8f7503d29759c9f1.rlib --extern tauri_plugin_log=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_log-c3fb8b6b849e8136.rlib --extern tauri_plugin_os=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_os-d46444a3ca29ac4e.rlib --extern tauri_plugin_process=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_process-06f8d3e4a7222b67.rlib --extern tauri_plugin_shell=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_shell-96eaa9373ad22a8d.rlib --extern tauri_plugin_single_instance=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_single_instance-03b6c8d393648f2e.rlib --extern tauri_plugin_store=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_store-ab9a6f053b60366c.rlib --extern tauri_plugin_updater=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_updater-b8a4cc69afbeaff2.rlib --extern tauri_plugin_window_state=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtauri_plugin_window_state-9ddd43b02693f233.rlib --extern tokio=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtokio-4d832445aad60481.rlib --extern tracing=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtracing-e59f8d29561ff629.rlib --extern tracing_appender=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtracing_appender-e768f273361c9018.rlib --extern tracing_forest=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtracing_forest-331eeb1203162bb6.rlib --extern tracing_subscriber=/build/source/target/aarch64-unknown-linux-gnu/release/deps/libtracing_subscriber-987c6d05187a3bad.rlib --extern url=/build/source/target/aarch64-unknown-linux-gnu/release/deps/liburl-61e266ea1c456c03.rlib --cfg tokio_unstable -L native=/build/source/target/aarch64-unknown-linux-gnu/release/build/ring-57d04411a145acc7/out -L native=/build/source/target/aarch64-unknown-linux-gnu/release/build/libssh2-sys-527f29d237b40817/out/build -L native=/build/source/target/aarch64-unknown-linux-gnu/release/build/curl-sys-93513c21eeead4af/out/build -L native=/build/source/target/aarch64-unknown-linux-gnu/release/build/libsqlite3-sys-9841fded401f487d/out -L native=/build/source/target/aarch64-unknown-linux-gnu/release/build/zstd-sys-a36bbe59d96854c0/out -L native=/nix/store/nxgc9iw2hpd4djf68qg4bpvxx1kjbm3y-openssl-3.5.1/lib -L native=/nix/store/26bsc9r8sdv1q3bg1aysm7yx5mslk6s9-libgit2-1.9.1-lib/lib -L native=/nix/store/xyn01hmys05xrdc96jyy664ga6vf6nh9-zlib-1.3.1/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/sqf1jv4fv5ym9llfijw4nzd34bk4flp4-at-spi2-core-2.56.2/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/bffyizx90a2d5yxsbhmbzf4k1m6cc6sn-cairo-1.18.4/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/bffyizx90a2d5yxsbhmbzf4k1m6cc6sn-cairo-1.18.4/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/91l83jnnsa0vm2pnb4c14vw8had1y7p4-gdk-pixbuf-2.42.12/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/91l83jnnsa0vm2pnb4c14vw8had1y7p4-gdk-pixbuf-2.42.12/lib -L native=/nix/store/bffyizx90a2d5yxsbhmbzf4k1m6cc6sn-cairo-1.18.4/lib -L native=/nix/store/kvpxrkvz11brjxq8485vlsqnvb5430n1-pango-1.56.3/lib -L native=/nix/store/gybhwv3hbbaly5rryfvzlqsbvn9dna4n-harfbuzz-11.2.1/lib -L native=/nix/store/asn98q7ghq28gwki76gh0ir791b1qqib-gtk+3-3.24.49/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/kvpxrkvz11brjxq8485vlsqnvb5430n1-pango-1.56.3/lib -L native=/nix/store/gybhwv3hbbaly5rryfvzlqsbvn9dna4n-harfbuzz-11.2.1/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/91l83jnnsa0vm2pnb4c14vw8had1y7p4-gdk-pixbuf-2.42.12/lib -L native=/nix/store/bffyizx90a2d5yxsbhmbzf4k1m6cc6sn-cairo-1.18.4/lib -L native=/nix/store/kvpxrkvz11brjxq8485vlsqnvb5430n1-pango-1.56.3/lib -L native=/nix/store/gybhwv3hbbaly5rryfvzlqsbvn9dna4n-harfbuzz-11.2.1/lib -L native=/nix/store/asn98q7ghq28gwki76gh0ir791b1qqib-gtk+3-3.24.49/lib -L native=/nix/store/sqf1jv4fv5ym9llfijw4nzd34bk4flp4-at-spi2-core-2.56.2/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/91l83jnnsa0vm2pnb4c14vw8had1y7p4-gdk-pixbuf-2.42.12/lib -L native=/nix/store/bffyizx90a2d5yxsbhmbzf4k1m6cc6sn-cairo-1.18.4/lib -L native=/nix/store/kvpxrkvz11brjxq8485vlsqnvb5430n1-pango-1.56.3/lib -L native=/nix/store/gybhwv3hbbaly5rryfvzlqsbvn9dna4n-harfbuzz-11.2.1/lib -L native=/nix/store/asn98q7ghq28gwki76gh0ir791b1qqib-gtk+3-3.24.49/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/6cps6fzx9rcx1m69yq7zxa1qz8hrq4v8-webkitgtk-2.48.3+abi=4.1/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/za99nfh70b524kix0j5wvba2ag7nxd7c-libsoup-3.6.5/lib -L native=/nix/store/wvli18c88a2a4y14i3jxmr48dbvgjp26-glib-2.84.3/lib -L native=/nix/store/91l83jnnsa0vm2pnb4c14vw8had1y7p4-gdk-pixbuf-2.42.12/lib -L native=/nix/store/bffyizx90a2d5yxsbhmbzf4k1m6cc6sn-cairo-1.18.4/lib -L native=/nix/store/kvpxrkvz11brjxq8485vlsqnvb5430n1-pango-1.56.3/lib -L native=/nix/store/gybhwv3hbbaly5rryfvzlqsbvn9dna4n-harfbuzz-11.2.1/lib -L native=/nix/store/6cps6fzx9rcx1m69yq7zxa1qz8hrq4v8-webkitgtk-2.48.3+abi=4.1/lib -L native=/nix/store/asn98q7ghq28gwki76gh0ir791b1qqib-gtk+3-3.24.49/lib -L native=/nix/store/sqf1jv4fv5ym9llfijw4nzd34bk4flp4-at-spi2-core-2.56.2/lib -L native=/nix/store/za99nfh70b524kix0j5wvba2ag7nxd7c-libsoup-3.6.5/lib -L native=/nix/store/1r18f8r24xin5zmny9akhfrx78xx53np-bzip2-1.0.8/lib -L native=/nix/store/xff0avjc3dkh05n9vfnya76544hyp2l3-xz-5.8.1/lib --cfg desktop --check-cfg 'cfg(desktop)' --check-cfg 'cfg(mobile)' --check-cfg 'cfg(dev)' (signal: 9, SIGKILL: kill)
Error failed to build app:


x86_64-darwin (sandbox = relaxed)

❌ 1 package failed to build:
  • gitbutler
error: hash mismatch in fixed-output derivation '/nix/store/rk6j3zs98yrqas1nqnjdz4sjfdwr3v2d-gitbutler-pnpm-deps.drv':
         specified: sha256-ieCejiVwqtQLDLfjJumj6OF9I+Y6chQE8ATU1PLTzeo=
            got:    sha256-XdAC+t1Aax6nSo2tbRSxA8aUR3QbHO09DuNZ5TMriHA=

aarch64-darwin (sandbox = relaxed)

❌ 1 package failed to build:
  • gitbutler
error: hash mismatch in fixed-output derivation '/nix/store/27nxb69i4mvkjnfxw6y44iss74b9sdps-gitbutler-pnpm-deps.drv':
       specified: sha256-ieCejiVwqtQLDLfjJumj6OF9I+Y6chQE8ATU1PLTzeo=
          got:    sha256-XdAC+t1Aax6nSo2tbRSxA8aUR3QbHO09DuNZ5TMriHA=

@25huizengek1
Copy link
Contributor Author

Damn, should've seen that coming. Let me push this.

@dtomvan
Copy link
Contributor

dtomvan commented Jul 21, 2025

Okay, after aarch64-linux runner deadlocking or running extremely low on memory (who knows), here's my frankenstein nixpkgs-review output (from this GHA job):

x86_64-linux

✅ 1 package built:
  • gitbutler
Error logs: `aarch64-darwin`
gitbutler
running 2 tests
test refspec::tests::parse_invalid_third_refspec ... ok�(B
test executor::tokio::tests::test_askpass ... FAILED�(B

failures:

---- executor::tokio::tests::test_askpass stdout ----

thread 'executor::tokio::tests::test_askpass' panicked at crates/gitbutler-git/src/executor/tokio/mod.rs:149:14:
create_askpass_server():: Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" }
note: run with RUST_BACKTRACE=1 environment variable to display a backtrace

failures:
executor::tokio::tests::test_askpass

test result: FAILED�(B. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

error: test failed, to rerun pass -p gitbutler-git --lib

Error logs: `x86_64-darwin`
gitbutler
running 2 tests
test refspec::tests::parse_invalid_third_refspec ... ok�(B
test executor::tokio::tests::test_askpass ... FAILED�(B

failures:

---- executor::tokio::tests::test_askpass stdout ----

thread 'executor::tokio::tests::test_askpass' panicked at crates/gitbutler-git/src/executor/tokio/mod.rs:149:14:
create_askpass_server():: Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" }
note: run with RUST_BACKTRACE=1 environment variable to display a backtrace

failures:
executor::tokio::tests::test_askpass

test result: FAILED�(B. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

error: test failed, to rerun pass -p gitbutler-git --lib

@techknowlogick
Copy link
Member

Getting the following on aarch64-darwin:

error: hash mismatch in fixed-output derivation '/nix/store/3wgw3ll002rpk3nv3f22zl6815d64vds-gitbutler-pnpm-deps.drv':
         specified: sha256-XdAC+t1Aax6nSo2tbRSxA8aUR3QbHO09DuNZ5TMriHA=
            got:    sha256-ieCejiVwqtQLDLfjJumj6OF9I+Y6chQE8ATU1PLTzeo=

@dtomvan
Copy link
Contributor

dtomvan commented Jul 25, 2025

Yup, that's been addressed I think

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 28, 2025
version
src
patches
;
fetcherVersion = 1;
Copy link
Contributor

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

Suggested change
fetcherVersion = 1;
fetcherVersion = 2;

@getchoo getchoo mentioned this pull request Aug 7, 2025
13 tasks
@dtomvan
Copy link
Contributor

dtomvan commented Aug 10, 2025

0.15.10 is out, but maybe @getchoo wants to handle that...

@getchoo
Copy link
Member

getchoo commented Aug 11, 2025

0.15.10 is out, but maybe @getchoo wants to handle that...

#431873 has been bumped

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 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. 12.approvals: 1 This PR was reviewed and approved by one person.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Request: gitbutler 0.14.19 → 0.14.35
7 participants