From 1cbe6ab531cb26bfd78a9783f71404d38846ed8c 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] r2modman: fix for Yarn 4.14 --- pkgs/by-name/r2/r2modman/package.nix | 7 +++++-- .../r2/r2modman/yarn-4.14-support.patch | 21 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/r2/r2modman/yarn-4.14-support.patch diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index d6ae7ba2f694..5e16807f8899 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -25,13 +25,16 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src patches missingHashes; - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-7ty3ESydrDzXrUIdgDC1DqYrkhRX5FsIeOJ0rWP5X0k="; + hash = "sha256-6WfpOAt9XRw4fC+Ix9OoDPvg7oIxcdKRX5ttIywG14E="; }; patches = [ # Make it possible to launch Steam games from r2modman. ./steam-launch-fix.patch + + # Remove after upstream updates to Yarn 4.14 + # https://github.com/ebkr/r2modmanPlus/blob/develop/package.json#L117 + ./yarn-4.14-support.patch ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/r2/r2modman/yarn-4.14-support.patch b/pkgs/by-name/r2/r2modman/yarn-4.14-support.patch new file mode 100644 index 000000000000..017f2d295ca9 --- /dev/null +++ b/pkgs/by-name/r2/r2modman/yarn-4.14-support.patch @@ -0,0 +1,21 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -1 +1,6 @@ + nodeLinker: node-modules ++ ++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: 10c0 +