From 924e6e26cd4d1693a0c3e62d1db4abc4ed67da28 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Tue, 28 Apr 2026 23:28:33 +0300 Subject: [PATCH] rocketchat-desktop: fix for Yarn 4.14 --- .../by-name/ro/rocketchat-desktop/package.nix | 10 ++++++-- .../yarn-4.14-support.patch | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/ro/rocketchat-desktop/yarn-4.14-support.patch diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix index ff8b89b8a7d9..20c37876c342 100644 --- a/pkgs/by-name/ro/rocketchat-desktop/package.nix +++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix @@ -30,13 +30,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5p0WmTKHqiRtNeWxJuBUKVHc2DHtAGMyBsXq9SpytWA="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/RocketChat/Rocket.Chat.Electron/blob/master/package.json#L182 + ./yarn-4.14-support.patch + ]; + # This might need to be updated between releases. # See https://nixos.org/manual/nixpkgs/stable/#javascript-yarnBerry-missing-hashes missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-Y6wdGp8Q5DW3f7pIrcE3ElKHFHYPxcAQFiM4R1cSYUA="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-xb4HwmLjO1xCQ/KEav3EM2FwCu0vi/tXZVY+gSoonyQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/rocketchat-desktop/yarn-4.14-support.patch b/pkgs/by-name/ro/rocketchat-desktop/yarn-4.14-support.patch new file mode 100644 index 000000000000..2977561bd557 --- /dev/null +++ b/pkgs/by-name/ro/rocketchat-desktop/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -6,4 +6,7 @@ enableGlobalCache: false + + nodeLinker: node-modules + +-yarnPath: .yarn/releases/yarn-4.6.0.cjs ++approvedGitRepositories: ++ - "**" ++ ++enableScripts: true +diff --git a/yarn.lock b/yarn.lock +--- a/yarn.lock ++++ b/yarn.lock +@@ -2,6 +2,6 @@ + # Manual changes might be lost - proceed with caution! + + __metadata: +- version: 8 ++ version: 9 + cacheKey: 10 +