From da0529917e54805d068f6813632a74a381fee1f0 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Wed, 30 Sep 2026 17:38:17 +0300
Subject: [PATCH] yarn-zpm: 6.0.0-rc.19 -> 6.0.0-rc.22

---
 pkgs/by-name/ya/yarn-zpm/package.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ya/yarn-zpm/package.nix b/pkgs/by-name/ya/yarn-zpm/package.nix
index 388fb901531f..55c0a1257dbe 100644
--- a/pkgs/by-name/ya/yarn-zpm/package.nix
+++ b/pkgs/by-name/ya/yarn-zpm/package.nix
@@ -1,30 +1,36 @@
 {
   lib,
   fetchFromGitHub,
-  git,
+  gitMinimal,
   jq,
   nix-update-script,
   runCommand,
   rustPlatform,
   versionCheckHook,
+  stdenv,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yarn-zpm";
-  version = "6.0.0-rc.19";
+  version = "6.0.0-rc.22";
 
   src = fetchFromGitHub {
     owner = "yarnpkg";
     repo = "zpm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I7iMmTcz+NfZfSebOTNDTe1YTwqGCU3zC+5pRhkYgsQ=";
+    hash = "sha256-hUofl9mo/lBHasVR/7/2l8fek0dHr2E0aiSq28R+uVk=";
   };
 
-  cargoHash = "sha256-6TPis4c/2uLGfG3NppY72x8YPo8WyAGRXt4urIwIGt0=";
+  cargoHash = "sha256-OhlTQ/NMXwUnvyEJv20hPN7g1eaZWIQdJcWWDeKOK+s=";
 
   cargoBuildFlags = [ "--package=zpm" ];
   cargoTestFlags = [ "--package=zpm" ];
 
+  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    "--skip=http::tests::network_concurrency_permit_is_released_after_failure"
+    "--skip=http::tests::network_concurrency_limits_in_flight_response_bodies"
+  ];
+
   # yarn is the Yarn Switch binary (zpm-switch package), yarn-bin is the actual package manager (zpm package)
   # See https://yarn6.netlify.app/getting-started/#:~:text=You%20can%20bypass%20Yarn%20Switch
   postInstall = ''
@@ -42,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
           {
             nativeBuildInputs = [
               jq
-              git
+              gitMinimal
               finalAttrs.finalPackage
             ];
           }
@@ -61,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
             jq -n '{name: "workspace-test"}' > workspace-test/package.json
             yarn install
             jq -e '.name == "workspace-test"' node_modules/workspace-test/package.json
-            jq -e '.workspaces | has("workspace-test")' yarn.lock
+            jq -e '.project.workspaces | has("workspace-test")' yarn.lock
             touch $out
           '';
     };