Merge master into staging-next

3 files changed, 1 insertions, 30 deletions

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 815197aba46e3..4a4e34e25070d 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -79,6 +79,7 @@ mapAliases {
   inherit (pkgs) degit; # added 2023-08-18
   inherit (pkgs) diagnostic-languageserver; # added 2024-06-25
   inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18
+  inherit (pkgs) dotenv-cli; # added 2024-06-26
   eask = pkgs.eask; # added 2023-08-17
   inherit (pkgs.elmPackages) elm-test;
   eslint_d = pkgs.eslint_d; # Added 2023-05-26
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index c19de2e230304..4cb74a9183ec5 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -89,7 +89,6 @@
 , "csslint"
 , "dhcp"
 , "diff2html-cli"
-, "dotenv-cli"
 , "dotenv-vault"
 , "elasticdump"
 , "@electron-forge/cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index de2d6d5765872..db0e664c77138 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -68617,35 +68617,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  dotenv-cli = nodeEnv.buildNodePackage {
-    name = "dotenv-cli";
-    packageName = "dotenv-cli";
-    version = "7.4.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-7.4.2.tgz";
-      sha512 = "SbUj8l61zIbzyhIbg0FwPJq6+wjbzdn9oEtozQpZ6kW2ihCcapKVZj49oCT3oPM+mgQm+itgvUQcG5szxVrZTA==";
-    };
-    dependencies = [
-      sources."cross-spawn-7.0.3"
-      sources."dotenv-16.4.5"
-      sources."dotenv-expand-10.0.0"
-      sources."isexe-2.0.0"
-      sources."minimist-1.2.8"
-      sources."path-key-3.1.1"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."which-2.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A global executable to run applications with the ENV variables loaded by dotenv";
-      homepage = "https://github.com/entropitor/dotenv-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   dotenv-vault = nodeEnv.buildNodePackage {
     name = "dotenv-vault";
     packageName = "dotenv-vault";