From cb38921b4d659e45e326c8276bc94d18e1f87df2 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Tue, 28 Apr 2026 23:28:28 +0300 Subject: [PATCH] corepack: fix for Yarn 4.14 --- pkgs/by-name/co/corepack/package.nix | 7 +++++-- pkgs/by-name/co/corepack/yarn-4.14-support.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/co/corepack/yarn-4.14-support.patch diff --git a/pkgs/by-name/co/corepack/package.nix b/pkgs/by-name/co/corepack/package.nix index 5f6644896f49..b7b3845f2976 100644 --- a/pkgs/by-name/co/corepack/package.nix +++ b/pkgs/by-name/co/corepack/package.nix @@ -7,7 +7,6 @@ fetchFromGitHub, nix-update-script, versionCheckHook, - fetchpatch2, writeScriptBin, }: @@ -30,6 +29,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { # We can use the built-in SQLite module instead (and skip the installCheck phase on version of # Node.js that do not have built-in SQLite support). ./use-builtin-sqlite.patch + + # Remove after upstream updates to Yarn 4.14 + # https://github.com/nodejs/corepack/blob/main/package.json#L19 + ./yarn-4.14-support.patch ]; nativeBuildInputs = [ @@ -49,7 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { patches src ; - hash = "sha256-cmY6e29ryLs0psZ/TEqRfs4RdB7eCzfXU7aUH+yCE/s="; + hash = "sha256-WIXXaam6OoIQrAUiLtF/Fst3vYTFj3mqBr7UxhUcXMI="; }; postPatch = '' diff --git a/pkgs/by-name/co/corepack/yarn-4.14-support.patch b/pkgs/by-name/co/corepack/yarn-4.14-support.patch new file mode 100644 index 000000000000..2d23ed3e118c --- /dev/null +++ b/pkgs/by-name/co/corepack/yarn-4.14-support.patch @@ -0,0 +1,11 @@ +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 +