peacock: fix for Yarn 4.14

This commit is contained in:
Dimitar Nestorov
2026-05-09 11:08:15 +03:00
committed by K900
parent 6d9c6c463f
commit bbf6afa2ce
2 changed files with 31 additions and 2 deletions
+8 -2
View File
@@ -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 = {
@@ -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