diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 1e316ac71015..861bd2dd43ef 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -15,29 +15,29 @@ moreutils, }: -rustPlatform.buildRustPackage rec { +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.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; - tag = "v${version}"; - hash = "sha256-ls0ZxXiIrjyLL0MoxOTU/RK0k323nUiQfxtlwsEL45U="; + tag = "v${finalAttrs.version}"; + hash = "sha256-cixpsn0jMufd6VrBCsCH9t3bpkKdgi1i0qnkBlLgLG0="; }; - sourceRoot = "${src.name}/src-tauri"; + sourceRoot = "${finalAttrs.src.name}/src-tauri"; useFetchCargoVendor = true; - cargoHash = "sha256-NSzGB6o6BBoak2gbSOu8ucWA+R+behuTxeMnKpyA7no="; + cargoHash = "sha256-twfRuoA4z+Xgyyn7aIRy6MV1ozN2+qhSLh8i+qOTa2Q="; postPatch = let cinny' = assert lib.assertMsg ( - cinny.version == version - ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; + cinny.version == finalAttrs.version + ) "cinny.version (${cinny.version}) != cinny-desktop.version (${finalAttrs.version})"; cinny.override { conf = { hashRouter.enabled = true; @@ -95,4 +95,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "cinny"; }; -} +}) diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 8bd7e28df524..5fc3c304f7f4 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.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; - rev = "v${version}"; - hash = "sha256-x4cRZ0XfyvRqOWIqtsVBiIPDxC3J9SUdoReiWNUB/X8="; + tag = "v${version}"; + hash = "sha256-yM+P7KXT/cspKt2l4+COoH68jCJUSs2TrfJGZHF/lYY="; }; - npmDepsHash = "sha256-s8dKMGwg6DL+aEq0Sk04VF1pSDpAW18Dok113xDWb8Q="; + npmDepsHash = "sha256-RWc8nSh/HuXUokU2RZnmwYUCfBxpL9Wp1Sgi2l1CN38="; nativeBuildInputs = [ python3