From c55a420857802a81b84b62e6f1d8e3f4aa5de751 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 17 Feb 2025 12:33:45 +0100 Subject: [PATCH 1/2] cinny: 4.3.0 -> 4.3.2 --- pkgs/by-name/ci/cinny-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 9978f08c32ab..a033fb364593 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-cRsjzIq8uFipyYYmxK4JzmG3Ba/0NaScyiebGqoZJFE="; + hash = "sha256-PXh3ouPPgSm4BFq6lE4vr2L+Eu7rsANvhXzqYY0rpVw="; }; - npmDepsHash = "sha256-ZmeXZN9sW17y4aIeIthvs4YiFF77xabeVXGwr6O49lQ="; + npmDepsHash = "sha256-Ktz82HzbWeMvx5McWS11qpqWNVWJU6yxIFzUkMoT6WE="; nativeBuildInputs = [ python3 From a63e1561d9c0075f45f27647f8db59d20cd25bb3 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 17 Feb 2025 12:36:46 +0100 Subject: [PATCH 2/2] cinny-desktop: 4.3.1 -> 4.3.2 --- pkgs/by-name/ci/cinny-desktop/package.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index e11bf85c123d..39b03424d322 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -19,28 +19,26 @@ rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - # TODO: this is temporarily not true for Cinny Desktop v4.3.1 - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${version}"; - hash = "sha256-lVBKzajxsQ33zC6NhRLMbWK81GxCbIQPtSR61yJHUL4="; + hash = "sha256-GwLfeQG19s35sEfeZmWa+PkJtAcSUHcbe05KnJ+jttY="; }; sourceRoot = "${src.name}/src-tauri"; useFetchCargoVendor = true; - cargoHash = "sha256-a2IyJ5a11cxgHpb2WRDxVF+aoL8kNnjBNwaQpgT3goo="; + cargoHash = "sha256-cX6nVNdSpy1Kbccuiv0XG+MysCjrLem42osTvhn2aMA="; postPatch = let cinny' = - # 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})"; + assert lib.assertMsg ( + cinny.version == version + ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; cinny.override { conf = { hashRouter.enabled = true;