diff --git a/pkgs/by-name/ti/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix index c9522a620638..49bbf01ba051 100644 --- a/pkgs/by-name/ti/tilt/assets.nix +++ b/pkgs/by-name/ti/tilt/assets.nix @@ -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 { diff --git a/pkgs/by-name/ti/tilt/yarn-4.14-support.patch b/pkgs/by-name/ti/tilt/yarn-4.14-support.patch new file mode 100644 index 000000000000..44b7fd0a4008 --- /dev/null +++ b/pkgs/by-name/ti/tilt/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.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 +