Unverified Commit f180ca39 authored by Matthieu Coudron's avatar Matthieu Coudron Committed by GitHub
Browse files

Merge pull request #250264 from dotlambda/htmlhint-buildNpmPackage 

htmlhint: use buildNpmPackage
parents d9356a6d ac0c704c

pkgs/development/node-packages/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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) 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

  inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19

pkgs/development/node-packages/node-packages.json

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ 
, "gulp-cli"

, "he"

, "html-minifier"

, "htmlhint"

, "http-server"

, "hsd"

, "hs-airdrop"

pkgs/development/node-packages/node-packages.nix

+0 −50
Original line number Diff line number Diff line
@@ -107882,56 +107882,6 @@ in 
    bypassCache = true;

    reconstructLock = true;

  };

  htmlhint = nodeEnv.buildNodePackage {

    name = "htmlhint";

    packageName = "htmlhint";

    version = "1.1.4";

    src = fetchurl {

      url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.4.tgz";

      sha512 = "tSKPefhIaaWDk/vKxAOQbN+QwZmDeJCq3bZZGbJMoMQAfTjepudC+MkuT9MOBbuQI3dLLzDWbmU7fLV3JASC7Q==";

    };

    dependencies = [

      sources."ansi-styles-4.3.0"

      sources."async-3.2.3"

      sources."balanced-match-1.0.2"

      sources."brace-expansion-1.1.11"

      sources."chalk-4.1.2"

      sources."color-convert-2.0.1"

      sources."color-name-1.1.4"

      sources."commander-9.5.0"

      sources."concat-map-0.0.1"

      sources."encoding-0.1.13"

      sources."fs.realpath-1.0.0"

      sources."glob-7.2.3"

      sources."has-flag-4.0.0"

      sources."iconv-lite-0.6.3"

      sources."inflight-1.0.6"

      sources."inherits-2.0.4"

      sources."is-extglob-2.1.1"

      sources."is-glob-4.0.3"

      sources."minimatch-3.1.2"

      sources."node-fetch-2.6.12"

      sources."once-1.4.0"

      sources."path-is-absolute-1.0.1"

      sources."safer-buffer-2.1.2"

      sources."strip-json-comments-3.1.0"

      sources."supports-color-7.2.0"

      sources."tr46-0.0.3"

      sources."webidl-conversions-3.0.1"

      sources."whatwg-url-5.0.0"

      sources."wrappy-1.0.2"

      sources."xml-1.0.1"

    ];

    buildInputs = globalBuildInputs;

    meta = {

      description = "The Static Code Analysis Tool for your HTML";

      homepage = "https://htmlhint.com";

      license = "MIT";

    };

    production = true;

    bypassCache = true;

    reconstructLock = true;

  };

  http-server = nodeEnv.buildNodePackage {

    name = "http-server";

    packageName = "http-server";

pkgs/development/tools/htmlhint/default.nix

0 → 100644
+27 −0
Original line number Diff line number Diff line 
{ lib

, buildNpmPackage

, fetchFromGitHub

}:



buildNpmPackage rec {

  pname = "htmlhint";

  version = "1.1.4";



  src = fetchFromGitHub {

    owner = "htmlhint";

    repo = "HTMLHint";

    rev = "v${version}";

    hash = "sha256-6R+/uwqWpuTjUnFeUFMzZBzhlFBxYceYZfLLuaYhc6k=";

  };



  npmDepsHash = "sha256-m5hHxA2YTk7qNpc1Z6TXxNTfIMY5LCM9Il9JHJxQJlI=";



  meta = {

    changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md";

    description = "Static code analysis tool for HTML";

    homepage = "https://github.com/htmlhint/HTMLHint";

    license = lib.licenses.mit;

    mainProgram = "htmlhint";

    maintainers = with lib.maintainers; [ ];

  };

}

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -19367,6 +19367,8 @@ with pkgs; 














  confluent-cli = callPackage ../development/tools/confluent-cli { };



























  htmlhint = callPackage ../development/tools/htmlhint { };



























  htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };





























  hyenae = callPackage ../tools/networking/hyenae { };