diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 0a5ff76f605f..f5a94b70e1b1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -219,6 +219,7 @@ mapAliases { }; }); # added 2024-10-04 inherit (pkgs) npm-check-updates; # added 2023-08-22 + npm-merge-driver = throw "'npm-merge-driver' has been removed, since the upstream repo was archived on Aug 11, 2021"; # Added 2025-11-07 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 orval = throw "orval has been removed because it was broken"; # added 2025-03-23 parcel = throw "parcel has been removed because it was broken"; # added 2025-03-12 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 93dc30789725..41ba101d9ee1 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -66,7 +66,6 @@ , "node-gyp-build" , "node2nix" , "np" -, "npm-merge-driver" , "nrm" , "parsoid" , "peerflix" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d8daeb941a20..522a63354ee8 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -41175,24 +41175,6 @@ in bypassCache = true; reconstructLock = true; }; - npm-merge-driver = nodeEnv.buildNodePackage { - name = "npm-merge-driver"; - packageName = "npm-merge-driver"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.6.tgz"; - sha512 = "uPjCEWZ93f379zw0AMEgFtZIlpSSnpXc8BEIcs8yYHEZs5Y3d85OZHisLjNhjbYnbdAznxTq+VbyBWAQZDEm9w=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "git merge driver for automatically merging lockfiles"; - homepage = "https://github.com/npm/npm-merge-driver#readme"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; nrm = nodeEnv.buildNodePackage { name = "nrm"; packageName = "nrm";