From 227f0a708e3f8e78895813c6f2bd5ff17b7d5a2c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 7 Apr 2024 04:20:00 +0000
Subject: [PATCH 1/2] yarn-berry: fix name

---
 pkgs/development/tools/yarn-berry/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix
index b1f0788dacda..3fc8cba2fedb 100644
--- a/pkgs/development/tools/yarn-berry/default.nix
+++ b/pkgs/development/tools/yarn-berry/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, lib, nodejs, stdenv, yarn }:
 
 stdenv.mkDerivation rec {
-  name = "yarn-berry";
+  pname = "yarn-berry";
   version = "4.1.1";
 
   src = fetchFromGitHub {

From ec8b9c392bd9ab48fbebcce7966967e1d7819b44 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 7 Apr 2024 04:20:00 +0000
Subject: [PATCH 2/2] yarn-berry: add version tester

---
 pkgs/development/tools/yarn-berry/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix
index 3fc8cba2fedb..47a539f6d788 100644
--- a/pkgs/development/tools/yarn-berry/default.nix
+++ b/pkgs/development/tools/yarn-berry/default.nix
@@ -1,13 +1,13 @@
-{ fetchFromGitHub, lib, nodejs, stdenv, yarn }:
+{ fetchFromGitHub, lib, nodejs, stdenv, testers, yarn }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "yarn-berry";
   version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "yarnpkg";
     repo = "berry";
-    rev = "@yarnpkg/cli/${version}";
+    rev = "@yarnpkg/cli/${finalAttrs.version}";
     hash = "sha256-75bERA1uZeywMjYznFDyk4+AtVDLo7eIajVtWdAD/RA=";
   };
 
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = ./update.sh;
 
+  passthru.tests = {
+    version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+    };
+  };
+
   meta = with lib; {
     homepage = "https://yarnpkg.com/";
     description = "Fast, reliable, and secure dependency management.";
@@ -43,4 +49,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     mainProgram = "yarn";
   };
-}
+})