From b0679238bbdf322203b482fc588055fc56a79453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 09:58:41 -0700
Subject: [PATCH] html-minifier: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 31 -------------------
 .../tools/html-minifier/default.nix           | 30 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/development/tools/html-minifier/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 90aa467bd5ea..6e82b5f2bbb0 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -57,6 +57,7 @@ mapAliases {
   eslint_d = pkgs.eslint_d; # Added 2023-05-26
   flood = pkgs.flood; # Added 2023-07-25
   gtop = pkgs.gtop; # added 2023-07-31
+  inherit (pkgs) html-minifier; # added 2023-08-19
   inherit (pkgs) htmlhint; # added 2023-08-19
   hueadm = pkgs.hueadm; # added 2023-07-31
   indium = throw "indium was removed because it was broken"; # added 2023-08-19
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 1ee6dd6e46aa..0a11794b5e5b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -157,7 +157,6 @@
 , "gulp"
 , "gulp-cli"
 , "he"
-, "html-minifier"
 , "http-server"
 , "hsd"
 , "hs-airdrop"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index be13f1cffbdd..6c1ddeae92fd 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -107851,37 +107851,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  html-minifier = nodeEnv.buildNodePackage {
-    name = "html-minifier";
-    packageName = "html-minifier";
-    version = "4.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz";
-      sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==";
-    };
-    dependencies = [
-      sources."camel-case-3.0.0"
-      sources."clean-css-4.2.4"
-      sources."commander-2.20.3"
-      sources."he-1.2.0"
-      sources."lower-case-1.1.4"
-      sources."no-case-2.3.2"
-      sources."param-case-2.1.1"
-      sources."relateurl-0.2.7"
-      sources."source-map-0.6.1"
-      sources."uglify-js-3.17.4"
-      sources."upper-case-1.1.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Highly configurable, well-tested, JavaScript-based HTML minifier.";
-      homepage = "https://kangax.github.io/html-minifier/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   http-server = nodeEnv.buildNodePackage {
     name = "http-server";
     packageName = "http-server";
diff --git a/pkgs/development/tools/html-minifier/default.nix b/pkgs/development/tools/html-minifier/default.nix
new file mode 100644
index 000000000000..6fd239fa816c
--- /dev/null
+++ b/pkgs/development/tools/html-minifier/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "html-minifier";
+  version = "4.0.0";
+
+  src = fetchFromGitHub {
+    owner = "kangax";
+    repo = "html-minifier";
+    rev = "v${version}";
+    hash = "sha256-OAykAqBxgr7tbeXXfSH23DALf7Eoh3VjDKNKWGAL3+A=";
+  };
+
+  npmDepsHash = "sha256-VWXc/nBXgvSE/DoLHR4XTFQ5kuwWC1m0/cj1CndfPH8=";
+
+  npmFlags = [ "--ignore-scripts" ];
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "Highly configurable, well-tested, JavaScript-based HTML minifier";
+    homepage = "https://github.com/kangax/html-minifier";
+    license = lib.licenses.mit;
+    mainProgram = "html-minifier";
+    maintainers = with lib.maintainers; [ chris-martin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fdcdd20e589..0b3276a0af17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19363,6 +19363,8 @@ with pkgs;
 
   confluent-cli = callPackage ../development/tools/confluent-cli { };
 
+  html-minifier = callPackage ../development/tools/html-minifier { };
+
   htmlhint = callPackage ../development/tools/htmlhint { };
 
   htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };