diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index c37b2a3b6025..4654b89dc523 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -20,35 +20,30 @@ 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.12.2"; + version = "4.12.5"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-gaTgNTn0/HHzULHRL03+t73MEUOGdqcEyqaIt8CWA0k="; + hash = "sha256-/A/O42jwwK2iDV1IdRjOO8fE/AZ0h7UWAZZLozOqUWs="; }; sourceRoot = "${finalAttrs.src.name}/src-tauri"; - cargoHash = "sha256-x7rpnhTz454Ftolu4x50NSGKdg8NfenUwdhPY4a+lbA="; + cargoHash = "sha256-EF8gpfeZasazq0NKrjItt4bkgautQjYjEegf1OlWLOw="; postPatch = let - cinny' = - assert lib.assertMsg ( - cinny.version == finalAttrs.version - ) "cinny.version (${cinny.version}) != cinny-desktop.version (${finalAttrs.version})"; - cinny.override { - conf = { - hashRouter.enabled = true; - }; + cinny' = cinny.override { + conf = { + hashRouter.enabled = true; }; + }; in '' ${lib.getExe jq} \ - 'del(.plugins.tauri.updater) | .build.frontendDist = "${cinny'}" | del(.build.beforeBuildCommand) | .bundle.createUpdaterArtifacts = false' tauri.conf.json \ + '.build.frontendDist = "${cinny'}" | del(.build.beforeBuildCommand) | .bundle.createUpdaterArtifacts = false' tauri.conf.json \ | ${lib.getExe' moreutils "sponge"} tauri.conf.json ''; @@ -82,6 +77,9 @@ rustPlatform.buildRustPackage (finalAttrs: { webkitgtk_4_1 ]; + buildNoDefaultFeatures = true; + buildFeatures = [ "custom-protocol" ]; + passthru = { updateScript = _experimental-update-script-combinators.sequence [ (nix-update-script { attrPath = "cinny-unwrapped"; }) diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index add2f7191cc7..f8b00f00cf07 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -7,17 +7,17 @@ buildNpmPackage (finalAttrs: { pname = "cinny-unwrapped"; # Remember to update cinny-desktop when bumping this version. - version = "4.12.2"; + version = "4.12.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; tag = "v${finalAttrs.version}"; - hash = "sha256-UF5MwV02G0oYIXtvyzHn+DifYM8PFlyb9DZ4w1fuyDE="; + hash = "sha256-RjPdq9xNvUbJESV7CqxmgfqAx+MoKZbhUtJNTcH9aUk="; }; - npmDepsHash = "sha256-8SyUFv1wgnqfSyBlykmeGI8RAmFt5Q5uS6OFLi+qPPY="; + npmDepsHash = "sha256-CU8AVRuMFOGI0/LbN0LGysBk+qc2XQYxQGfrrH72stc="; # Skip rebuilding native modules since they're not needed for the web app npmRebuildFlags = [