diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index b47901d00e9e..e11bf85c123d 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchFromGitHub, rustPlatform, cargo-tauri_1, @@ -14,33 +13,34 @@ dbus, glib, glib-networking, - libayatana-appindicator, webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.2.3"; + # TODO: this is temporarily not true for Cinny Desktop v4.3.1 + version = "4.3.1"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${version}"; - hash = "sha256-yNGzgkZXz/VroGGnZFqo5n2v3cE6/tvpQv5U4p27row="; + hash = "sha256-lVBKzajxsQ33zC6NhRLMbWK81GxCbIQPtSR61yJHUL4="; }; sourceRoot = "${src.name}/src-tauri"; useFetchCargoVendor = true; - cargoHash = "sha256-79MO2JaOBKVfiE7OLFR3kobnE2yH5g44mRt2TKIEfxA="; + cargoHash = "sha256-a2IyJ5a11cxgHpb2WRDxVF+aoL8kNnjBNwaQpgT3goo="; postPatch = let cinny' = - assert lib.assertMsg ( - cinny.version == version - ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; + # TODO: temporarily disabled for Cinny Desktop v4.3.1 (cinny-unwrapped is still at 4.3.0) + # assert lib.assertMsg ( + # cinny.version == version + # ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; cinny.override { conf = { hashRouter.enabled = true; @@ -82,16 +82,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - dbus - glib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus + glib glib-networking webkitgtk_4_0 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.DarwinTools - darwin.apple_sdk.frameworks.WebKit ]; meta = { diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 7705885f3699..9978f08c32ab 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -9,26 +9,20 @@ cairo, pango, stdenv, - olm, - nodejs_20, }: buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.2.3"; + version = "4.3.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-BoUQURCfEu5kocMm8T25cVl8hgZGxcxrMzQZOl2fAbY="; + hash = "sha256-cRsjzIq8uFipyYYmxK4JzmG3Ba/0NaScyiebGqoZJFE="; }; - # canvas, a transitive dependency of cinny, fails to build with Node 22 - # https://github.com/Automattic/node-canvas/issues/2448 - nodejs = nodejs_20; - - npmDepsHash = "sha256-fDoia6evCmXZgeIKL0coRo3yunX1dfud31ROgmop2Sc="; + npmDepsHash = "sha256-ZmeXZN9sW17y4aIeIthvs4YiFF77xabeVXGwr6O49lQ="; nativeBuildInputs = [ python3 @@ -55,6 +49,5 @@ buildNpmPackage rec { maintainers = with lib.maintainers; [ abbe ]; license = lib.licenses.agpl3Only; platforms = lib.platforms.all; - inherit (olm.meta) knownVulnerabilities; }; }