From eb2901d582733d83e326bb5f025aab1858219ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 17 Aug 2023 09:41:05 -0700
Subject: [PATCH] eask: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |  2 ++
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 36 -------------------
 pkgs/development/node-packages/overrides.nix  |  3 --
 pkgs/development/tools/eask/default.nix       | 29 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 6 files changed, 33 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/development/tools/eask/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index ef2f132a2f2f..9a4cea2f1ade 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -40,6 +40,7 @@ in
 mapAliases {
   "@antora/cli" = pkgs.antora; # Added 2023-05-06
   "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25
+  "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17
   "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02
   "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07
   "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
@@ -48,6 +49,7 @@ mapAliases {
   bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
   bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
   castnow = pkgs.castnow; # added 2023-07-30
+  eask = pkgs.eask; # added 2023-08-17
   eslint_d = pkgs.eslint_d; # Added 2023-05-26
   flood = pkgs.flood; # Added 2023-07-25
   gtop = pkgs.gtop; # added 2023-07-31
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 16bde703ebba..2b5094c1bc47 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -5,7 +5,6 @@
 , "@babel/cli"
 , "@commitlint/cli"
 , "@commitlint/config-conventional"
-, "@emacs-eask/cli"
 , "@forge/cli"
 , "@maizzle/cli"
 , "@medable/mdctl-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 153b9e23f41c..50705c2eef18 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -81163,42 +81163,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@emacs-eask/cli" = nodeEnv.buildNodePackage {
-    name = "_at_emacs-eask_slash_cli";
-    packageName = "@emacs-eask/cli";
-    version = "0.8.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.8.1.tgz";
-      sha512 = "+Z54Sh/vHWOXcbb495SjH5+4h9D3c5wNPebz83yfZIUHQ4DqxSB53l//Dse5P3UVt3okQeXdwGNuRN1VBf3brg==";
-    };
-    dependencies = [
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."cliui-8.0.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."emoji-regex-8.0.0"
-      sources."escalade-3.1.1"
-      sources."get-caller-file-2.0.5"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."require-directory-2.1.1"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
-      sources."wrap-ansi-7.0.0"
-      sources."y18n-5.0.8"
-      sources."yargs-17.7.2"
-      sources."yargs-parser-21.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A set of command-line tools to build Emacs packages";
-      homepage = "https://github.com/emacs-eask/cli#readme";
-      license = "GPL-3.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@forge/cli" = nodeEnv.buildNodePackage {
     name = "_at_forge_slash_cli";
     packageName = "@forge/cli";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index c32ce3868047..c4ddc2a40a59 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -112,9 +112,6 @@ final: prev: {
     meta = oldAttrs.meta // { broken = since "12"; };
   });
 
-  eask = prev."@emacs-eask/cli".override {
-    name = "eask";
-  };
 
   expo-cli = prev."expo-cli".override (oldAttrs: {
     # The traveling-fastlane-darwin optional dependency aborts build on Linux.
diff --git a/pkgs/development/tools/eask/default.nix b/pkgs/development/tools/eask/default.nix
new file mode 100644
index 000000000000..799a507fee35
--- /dev/null
+++ b/pkgs/development/tools/eask/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "eask";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "emacs-eask";
+    repo = "cli";
+    rev = version;
+    hash = "sha256-NoYWRIkJEOUsHsjBYTtCNrCmAGG0pqaAHDOc9VcaRwk=";
+  };
+
+  npmDepsHash = "sha256-ctIVBrx9fagSX3f2/wn5wWkReOYK0nldFoxTJWVsx0g=";
+
+  dontBuild = true;
+
+  meta = {
+    changelog = "https://github.com/emacs-eask/cli/blob/${src.rev}/CHANGELOG.md";
+    description = "CLI for building, runing, testing, and managing your Emacs Lisp dependencies";
+    homepage = "https://emacs-eask.github.io/";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "eask";
+    maintainers = with lib.maintainers; [ jcs090218 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6b5a8bf8e3f..ec63a7d85f3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19047,6 +19047,8 @@ with pkgs;
 
   dwz = callPackage ../development/tools/misc/dwz { };
 
+  eask = callPackage ../development/tools/eask { };
+
   easypdkprog = callPackage ../development/embedded/easypdkprog { };
 
   eclint = callPackage ../development/tools/eclint { };