cinny-{unwrapped,desktop}: 4.10.5 -> 4.11.1 (#498877)

pkgs/by-name/ci/cinny-desktop/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   rustPlatform,
-  cargo-tauri_1,
+  cargo-tauri,
   cinny,
   desktop-file-utils,
   wrapGAppsHook3,
@@ -14,24 +14,25 @@
   webkitgtk_4_1,
   jq,
   moreutils,
+  nix-update-script,
+  _experimental-update-script-combinators,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cinny-desktop";
   # We have to be using the same version as cinny-web or this isn't going to work.
-  version = "4.10.5";
+  version = "4.11.1";
 
-  # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DRSafPNED9fpm3w5K4a9r8581xMpttfo7BEDBIJ87Kc=";
+    hash = "sha256-/zHXlAqIxWN1obFO3H/eqFj38pjopF4D5ooz0YiVgD0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src-tauri";
 
-  cargoHash = "sha256-q6YMAjK+BBYBpk8menA1sM3x/FCnAh40t70fs9knnRo=";
+  cargoHash = "sha256-bchjUTC0/hWPf/cOs+cxRbqho/B9LMJ3ChW530zEoXU=";
 
   postPatch =
     let
@@ -47,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     in
     ''
       ${lib.getExe jq} \
-        'del(.tauri.updater) | .build.distDir = "${cinny'}" | del(.build.beforeBuildCommand)' tauri.conf.json \
+        'del(.plugins.tauri.updater) | .build.frontendDist = "${cinny'}" | del(.build.beforeBuildCommand) | .bundle.createUpdaterArtifacts = false' tauri.conf.json \
         | ${lib.getExe' moreutils "sponge"} tauri.conf.json
     '';
 
@@ -60,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       desktop-file-edit \
         --set-comment "Yet another matrix client for desktop" \
         --set-key="Categories" --set-value="Network;InstantMessaging;" \
-        $out/share/applications/cinny.desktop
+        $out/share/applications/Cinny.desktop
     '';
 
   preFixup = ''
@@ -70,7 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeBuildInputs = [
-    cargo-tauri_1.hook
+    cargo-tauri.hook
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     desktop-file-utils
@@ -87,6 +88,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     webkitgtk_4_1
   ];
 
+  passthru = {
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script { attrPath = "cinny-unwrapped"; })
+      (nix-update-script { })
+    ];
+  };
+
   meta = {
     description = "Yet another matrix client for desktop";
     homepage = "https://github.com/cinnyapp/cinny-desktop";
@@ -98,8 +106,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.agpl3Only;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "cinny";
-    # Waiting for update to Tauri v2, webkitgtk_4_0 is deprecated
-    # See https://github.com/cinnyapp/cinny-desktop/issues/398 and https://github.com/NixOS/nixpkgs/pull/450065
-    broken = stdenv.hostPlatform.isLinux;
   };
 })

pkgs/by-name/ci/cinny-unwrapped/package.nix

@@ -2,26 +2,22 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
-  nodejs_22,
-  stdenv,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "cinny-unwrapped";
   # Remember to update cinny-desktop when bumping this version.
-  version = "4.10.5";
+  version = "4.11.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
-    tag = "v${version}";
-    hash = "sha256-Napy3AcsLRDZPcBh3oq1U30FNtvoNtob0+AZtZSvcbM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dwI3zNey/ukF3t2fhH/ePf4o4iBDwZyLWMYebPgXmWU=";
   };
 
-  nodejs = nodejs_22;
-
-  npmDepsHash = "sha256-2Lrd0jAwAH6HkwLHyivqwaEhcpFAIALuno+MchSIfxo=";
+  npmDepsHash = "sha256-27WFjb08p09aJRi0S2PvYq3bivEuG5+z2QhFahTSj4Q=";
 
   # Skip rebuilding native modules since they're not needed for the web app
   npmRebuildFlags = [
@@ -46,4 +42,4 @@ buildNpmPackage rec {
     license = lib.licenses.agpl3Only;
     platforms = lib.platforms.all;
   };
-}
+})