tilt: fix for Yarn 4.14

This commit is contained in:
Dimitar Nestorov
2026-05-09 11:15:27 +03:00
committed by K900
parent 6eae1f3257
commit 57f8d9191d
2 changed files with 33 additions and 1 deletions
+10 -1
View File
@@ -8,10 +8,17 @@
src,
}:
let
patches = [
# Remove after upstream updates to Yarn 4.14
# https://github.com/tilt-dev/tilt/blob/master/web/package.json#L94
./yarn-4.14-support.patch
];
in
stdenvNoCC.mkDerivation {
pname = "tilt-assets";
src = "${src}/web";
inherit version;
inherit version patches;
nativeBuildInputs = [
nodejs
@@ -22,6 +29,8 @@ stdenvNoCC.mkDerivation {
name = "tilt-assets-deps";
src = "${src}/web";
inherit patches;
nativeBuildInputs = [ yarn-berry ];
supportedArchitectures = builtins.toJSON {
@@ -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.9.3.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