From bbf6afa2ce9e1047fa746d790b804e7eb76a3b3a Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Tue, 28 Apr 2026 23:28:30 +0300 Subject: [PATCH] peacock: fix for Yarn 4.14 --- pkgs/by-name/pe/peacock/package.nix | 10 ++++++-- .../pe/peacock/yarn-4.14-support.patch | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/pe/peacock/yarn-4.14-support.patch diff --git a/pkgs/by-name/pe/peacock/package.nix b/pkgs/by-name/pe/peacock/package.nix index b2ffe06fce40..e74931c727bd 100644 --- a/pkgs/by-name/pe/peacock/package.nix +++ b/pkgs/by-name/pe/peacock/package.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-kDR2ObXzo8UudjfqU/lQl6dqblFhIEgnr20EKjiWKVw="; }; + patches = [ + # Remove after upstream updates to Yarn 4.14 + # https://github.com/thepeacockproject/Peacock/blob/master/package.json#L109 + ./yarn-4.14-support.patch + ]; + nativeBuildInputs = [ nodejs yarn-berry.yarnBerryConfigHook @@ -75,8 +81,8 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes; - hash = "sha256-Ecpls4iGBVqSLm/4kyY0EsRa6NINodHc05DtwOfZYG4="; + inherit (finalAttrs) src missingHashes patches; + hash = "sha256-DgkmBd9/voLLxIo1R7MNknFmH62RUYrG0MeV074ZX7U="; }; meta = { diff --git a/pkgs/by-name/pe/peacock/yarn-4.14-support.patch b/pkgs/by-name/pe/peacock/yarn-4.14-support.patch new file mode 100644 index 000000000000..1885f6de9f13 --- /dev/null +++ b/pkgs/by-name/pe/peacock/yarn-4.14-support.patch @@ -0,0 +1,23 @@ +diff --git a/.yarnrc.yml b/.yarnrc.yml +--- a/.yarnrc.yml ++++ b/.yarnrc.yml +@@ -14,4 +14,7 @@ plugins: + - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs + spec: "https://mskelton.dev/yarn-outdated/v2" + +-yarnPath: .yarn/releases/yarn-4.7.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 +