[Backport release-24.11] cargo-tauri: 2.1.0 -> 2.1.1 (#356597)

pkgs/by-name/ca/cargo-tauri/Cargo.lock

@@ -8994,7 +8994,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "bytes",

pkgs/by-name/ca/cargo-tauri/package.nix

@@ -9,19 +9,18 @@
   nix-update-script,
   openssl,
   pkg-config,
-  testers,
   webkitgtk_4_1,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tauri";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     rev = "refs/tags/tauri-v${version}";
-    hash = "sha256-n1rSffVef9G9qtLyheuK5k6anAHsZANSu0C73QDdg2o=";
+    hash = "sha256-HPmViOowP1xAjDJ89YS0BTjNnKI1P0L777ywkqAhhc4=";
   };
 
   cargoLock = {
@@ -49,7 +48,6 @@ rustPlatform.buildRustPackage rec {
 
     tests = {
       hook = callPackage ./test-app.nix { };
-      version = testers.testVersion { package = cargo-tauri; };
     };
 
     updateScript = nix-update-script {

pkgs/by-name/ca/cargo-tauri/test-app.nix

@@ -1,37 +1,34 @@
 {
   lib,
   stdenv,
-  rustPlatform,
   cargo-tauri,
-  darwin,
   glib-networking,
   libayatana-appindicator,
   nodejs,
   openssl,
   pkg-config,
   pnpm_9,
+  rustPlatform,
   webkitgtk_4_1,
   wrapGAppsHook4,
 }:
 
-rustPlatform.buildRustPackage rec {
+let
+  pnpm = pnpm_9;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "test-app";
   inherit (cargo-tauri) version src;
 
-  cargoLock = {
-    inherit (cargo-tauri.cargoDeps) lockFile;
-    outputHashes = {
-      "schemars_derive-0.8.21" = "sha256-AmxBKZXm2Eb+w8/hLQWTol5f22uP8UqaIh+LVLbS20g=";
-    };
-  };
-
-  postPatch = ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
       --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
   '';
 
-  pnpmDeps = pnpm_9.fetchDeps {
-    inherit
+  inherit (cargo-tauri) cargoDeps;
+
+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs)
       pname
       version
       src
@@ -45,7 +42,9 @@ rustPlatform.buildRustPackage rec {
 
     nodejs
     pkg-config
-    pnpm_9.configHook
+    pnpm.configHook
+    rustPlatform.cargoCheckHook
+    rustPlatform.cargoSetupHook
     wrapGAppsHook4
   ];
 
@@ -55,9 +54,6 @@ rustPlatform.buildRustPackage rec {
       glib-networking
       libayatana-appindicator
       webkitgtk_4_1
-    ]
-    ++ lib.optionals stdenv.isDarwin [
-      darwin.apple_sdk.frameworks.WebKit
     ];
 
   buildAndTestSubdir = "examples/api/src-tauri";
@@ -74,4 +70,4 @@ rustPlatform.buildRustPackage rec {
   meta = {
     inherit (cargo-tauri.hook.meta) platforms;
   };
-}
+})