From 87d6cc69a4f962f053ef7af58a3d86e97915dd87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 13 Aug 2024 06:55:04 -0700
Subject: [PATCH] nodePackages.yarn: drop

---
 .../misc/tandoor-recipes/frontend.nix          |  4 ++--
 pkgs/by-name/me/mealie/mealie-frontend.nix     |  4 ++--
 pkgs/development/node-packages/aliases.nix     |  1 +
 .../node-packages/node-packages.json           |  1 -
 .../node-packages/node-packages.nix            | 18 ------------------
 .../tools/electron-fiddle/default.nix          |  2 +-
 .../matrix-appservice-irc/default.nix          |  3 ++-
 7 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix
index 2b53e1efa9305..76867f67a2cc1 100644
--- a/pkgs/applications/misc/tandoor-recipes/frontend.nix
+++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchYarnDeps, fixup-yarn-lock, callPackage, nodejs }:
+{ stdenv, fetchYarnDeps, fixup-yarn-lock, callPackage, nodejs, yarn }:
 let
   common = callPackage ./common.nix { };
 in
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     fixup-yarn-lock
     nodejs
-    nodejs.pkgs.yarn
+    yarn
   ];
 
   configurePhase = ''
diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix
index 477dcd993abcf..072f27af67268 100644
--- a/pkgs/by-name/me/mealie/mealie-frontend.nix
+++ b/pkgs/by-name/me/mealie/mealie-frontend.nix
@@ -1,5 +1,5 @@
 src: version:
-{ lib, fetchYarnDeps, nodejs_18, fixup-yarn-lock, stdenv }: stdenv.mkDerivation {
+{ lib, fetchYarnDeps, nodejs_18, fixup-yarn-lock, stdenv, yarn }: stdenv.mkDerivation {
   name = "mealie-frontend";
   inherit version;
   src = "${src}/frontend";
@@ -12,7 +12,7 @@ src: version:
   nativeBuildInputs = [
     fixup-yarn-lock
     nodejs_18
-    nodejs_18.pkgs.yarn
+    (yarn.override { nodejs = nodejs_18; })
   ];
 
   configurePhase = ''
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index abea586975153..62f1beba8b635 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -191,6 +191,7 @@ mapAliases {
   inherit (pkgs) wrangler; # added 2024-07-01
   inherit (pkgs) write-good; # added 2023-08-20
   inherit (pkgs) yaml-language-server; # added 2023-09-05
+  inherit (pkgs) yarn; # added 2024-08-13
   inherit (pkgs) yo; # added 2023-08-20
   zx = pkgs.zx; # added 2023-08-01
 }
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index f3e45e80c7161..0d0da8c753e1c 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -256,5 +256,4 @@
 , "wring"
 , "@yaegassy/coc-nginx"
 , "yalc"
-, "yarn"
 ]
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index add29d5b90dc7..0e456d4e38602 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -89266,22 +89266,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  yarn = nodeEnv.buildNodePackage {
-    name = "yarn";
-    packageName = "yarn";
-    version = "1.22.22";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz";
-      sha512 = "prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "📦🐈 Fast, reliable, and secure dependency management.";
-      homepage = "https://github.com/yarnpkg/yarn#readme";
-      license = "BSD-2-Clause";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
 }
diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix
index 2588a85de2e83..4add8cadb7d39 100644
--- a/pkgs/development/tools/electron-fiddle/default.nix
+++ b/pkgs/development/tools/electron-fiddle/default.nix
@@ -10,6 +10,7 @@
 , nodejs_18
 , stdenvNoCC
 , util-linux
+, yarn
 , zip
 }:
 
@@ -34,7 +35,6 @@ let
     hash = "sha256-1sxd3eJ6/WjXS6XQbrgKUTNUmrhuc1dAvy+VAivGErg=";
   };
 
-  inherit (nodejs.pkgs) yarn;
   offlineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
     hash = "sha256-dwhwUWwv6RYKEMdhRBvKVXvM8n1r+Qo0D3/uFsWIOpw=";
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
index ac18967dcab25..993fa909b1a8c 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
@@ -8,6 +8,7 @@
 , matrix-sdk-crypto-nodejs
 , nixosTests
 , nix-update-script
+, yarn
 }:
 
 let
@@ -36,7 +37,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     fixup-yarn-lock
     nodejs-slim
-    nodejs.pkgs.yarn
+    yarn
     nodejs.pkgs.node-gyp-build
   ];