gitbutler: 0.14.19 -> 0.15.10 (#431873)

pkgs/by-name/gi/gitbutler/package.nix

@@ -17,7 +17,7 @@
   nodejs,
   openssl,
   pkg-config,
-  pnpm_9,
+  pnpm_10,
   rust,
   rustPlatform,
   turbo,
@@ -27,23 +27,27 @@
 }:
 
 let
+  pnpm = pnpm_10;
   excludeSpec = spec: [
     "--exclude"
     spec
   ];
 in
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitbutler";
-  version = "0.14.19";
+  version = "0.15.10";
 
   src = fetchFromGitHub {
     owner = "gitbutlerapp";
     repo = "gitbutler";
-    tag = "release/${version}";
-    hash = "sha256-NopuZbgF2jdwuf/p/JzubS0IM5xBnlkh9Tj234auBnE=";
+    tag = "release/${finalAttrs.version}";
+    hash = "sha256-6sRSH7OSprOsRMoORjy9HI8SoOAXqPak2kqtgRx2bWI=";
   };
 
+  # Workaround for https://github.com/NixOS/nixpkgs/issues/359340
+  cargoPatches = [ ./gix-from-crates-io.patch ];
+
   # Let Tauri know what version we're building
   #
   # Remove references to non-existent workspaces in `gix` crates
@@ -51,7 +55,7 @@ rustPlatform.buildRustPackage rec {
   # Deactivate the built-in updater
   postPatch = ''
     tauriConfRelease="crates/gitbutler-tauri/tauri.conf.release.json"
-    jq '.version = "${version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease"
+    jq '.version = "${finalAttrs.version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease"
 
     tomlq -ti 'del(.lints) | del(.workspace.lints)' "$cargoDepsCopy"/gix*/Cargo.toml
 
@@ -59,12 +63,12 @@ rustPlatform.buildRustPackage rec {
       --replace-fail 'checkUpdate = check;' 'checkUpdate = () => null;'
   '';
 
-  cargoHash = "sha256-wzSRUZeB5f9Z/D+Sa5Nl77jh7GDnnUehcmwanPcaSKM=";
+  cargoHash = "sha256-H8YR+euwMGiGckURAWJIE9fOcu/ddJ6ENcnA1gHD9B8=";
 
-  pnpmDeps = pnpm_9.fetchDeps {
-    inherit pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-5NtfstUuIYyntt09Mu9GAFAOImfO6VMmJ7g15kvGaLE=";
+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 2;
+    hash = "sha256-I55RNWP6csT08SBIFEyUp9JTC5EzQXjKIPPSxkSpg7Y=";
   };
 
   nativeBuildInputs = [
@@ -76,7 +80,7 @@ rustPlatform.buildRustPackage rec {
     moreutils
     nodejs
     pkg-config
-    pnpm_9.configHook
+    pnpm.configHook
     turbo
     wrapGAppsHook4
     yq # For `tomlq`
@@ -141,6 +145,11 @@ rustPlatform.buildRustPackage rec {
     LIBGIT2_NO_VENDOR = 1;
   };
 
+  preBuild = ''
+    turbo run --filter @gitbutler/svelte-comment-injector build
+    pnpm build:desktop -- --mode production
+  '';
+
   postInstall =
     lib.optionalString stdenv.hostPlatform.isDarwin ''
       makeBinaryWrapper $out/Applications/GitButler.app/Contents/MacOS/gitbutler-tauri $out/bin/gitbutler-tauri
@@ -165,7 +174,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Git client for simultaneous branches on top of your existing workflow";
     homepage = "https://gitbutler.com";
-    changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}";
+    changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${finalAttrs.version}";
     license = lib.licenses.fsl11Mit;
     maintainers = with lib.maintainers; [
       getchoo
@@ -174,4 +183,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "gitbutler-tauri";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
-}
+})