From db661a558ae858e64b2b6c3638ac1e7b2f343edd Mon Sep 17 00:00:00 2001 From: Lord-Valen Date: Wed, 30 Aug 2023 19:48:03 -0400 Subject: [PATCH] nodePackages.stylelint: use buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 202 ------------------ .../tools/analysis/stylelint/default.nix | 24 +++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 27 insertions(+), 203 deletions(-) create mode 100644 pkgs/development/tools/analysis/stylelint/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 47d9639be91..d640dd61b7a 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -108,6 +108,7 @@ mapAliases { "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02 ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 stf = throw "stf was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) stylelint; # added 2023-09-13 surge = pkgs.surge-cli; # Added 2023-09-08 swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09 inherit (pkgs) terser; # Added 2023-08-31 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ee7a6ae5f50..80840ba25bf 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -234,7 +234,6 @@ , "speed-test" , "sql-formatter" , "stackdriver-statsd-backend" -, "stylelint" , "svelte-check" , "svelte-language-server" , "svgo" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c3d28fc12a2..e8061a6db37 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -105377,208 +105377,6 @@ in bypassCache = true; reconstructLock = true; }; - stylelint = nodeEnv.buildNodePackage { - name = "stylelint"; - packageName = "stylelint"; - version = "15.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-15.10.3.tgz"; - sha512 = "aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA=="; - }; - dependencies = [ - sources."@babel/code-frame-7.22.10" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/highlight-7.22.10" - sources."@csstools/css-parser-algorithms-2.3.1" - sources."@csstools/css-tokenizer-2.2.0" - sources."@csstools/media-query-list-parser-2.1.4" - sources."@csstools/selector-specificity-3.0.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@types/minimist-1.2.2" - sources."@types/normalize-package-data-2.4.1" - sources."ajv-8.12.0" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."argparse-2.0.1" - sources."array-union-2.1.0" - sources."arrify-1.0.1" - sources."astral-regex-2.0.0" - sources."balanced-match-2.0.0" - (sources."brace-expansion-1.1.11" // { - dependencies = [ - sources."balanced-match-1.0.2" - ]; - }) - sources."braces-3.0.2" - sources."callsites-3.1.0" - sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.2" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."colord-2.9.3" - sources."concat-map-0.0.1" - sources."cosmiconfig-8.2.0" - sources."css-functions-list-3.2.0" - sources."css-tree-2.3.1" - sources."cssesc-3.0.0" - sources."debug-4.3.4" - sources."decamelize-5.0.1" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."decamelize-1.2.0" - sources."map-obj-1.0.1" - ]; - }) - sources."dir-glob-3.0.1" - sources."emoji-regex-8.0.0" - sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" - sources."fastest-levenshtein-1.0.16" - sources."fastq-1.15.0" - sources."file-entry-cache-6.0.1" - sources."fill-range-7.0.1" - sources."find-up-5.0.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.7" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."global-modules-2.0.0" - sources."global-prefix-3.0.0" - sources."globby-11.1.0" - sources."globjoin-0.1.4" - sources."hard-rejection-2.1.0" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."hosted-git-info-4.1.0" - sources."html-tags-3.3.1" - sources."ignore-5.2.4" - (sources."import-fresh-3.3.0" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."indent-string-5.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-plain-obj-1.1.0" - sources."is-plain-object-5.0.0" - sources."isexe-2.0.0" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-1.0.0" - sources."kind-of-6.0.3" - sources."known-css-properties-0.28.0" - sources."lines-and-columns-1.2.4" - sources."locate-path-6.0.0" - sources."lodash.truncate-4.4.2" - sources."lru-cache-6.0.0" - sources."map-obj-4.3.0" - sources."mathml-tag-names-2.1.3" - sources."mdn-data-2.0.30" - sources."meow-10.1.5" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."min-indent-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-options-4.1.0" - sources."ms-2.1.2" - sources."nanoid-3.3.6" - sources."normalize-package-data-3.0.3" - sources."normalize-path-3.0.0" - sources."once-1.4.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-type-4.0.0" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."postcss-8.4.28" - sources."postcss-resolve-nested-selector-0.1.1" - sources."postcss-safe-parser-6.0.0" - sources."postcss-selector-parser-6.0.13" - sources."postcss-value-parser-4.2.0" - sources."punycode-2.3.0" - sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - sources."read-pkg-6.0.0" - sources."read-pkg-up-8.0.0" - sources."redent-4.0.0" - sources."require-from-string-2.0.2" - sources."resolve-from-5.0.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."semver-7.5.4" - sources."signal-exit-4.1.0" - sources."slash-3.0.0" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."source-map-js-1.0.2" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."strip-indent-4.0.0" - sources."style-search-0.1.0" - sources."supports-color-5.5.0" - (sources."supports-hyperlinks-3.0.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."svg-tags-1.0.0" - sources."table-6.8.1" - sources."to-regex-range-5.0.1" - sources."trim-newlines-4.1.1" - sources."type-fest-1.4.0" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."write-file-atomic-5.0.1" - sources."yallist-4.0.0" - sources."yargs-parser-20.2.9" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A mighty CSS linter that helps you avoid errors and enforce conventions."; - homepage = "https://stylelint.io"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; diff --git a/pkgs/development/tools/analysis/stylelint/default.nix b/pkgs/development/tools/analysis/stylelint/default.nix new file mode 100644 index 00000000000..d2e583ecf91 --- /dev/null +++ b/pkgs/development/tools/analysis/stylelint/default.nix @@ -0,0 +1,24 @@ +{ buildNpmPackage, fetchFromGitHub, lib }: + +buildNpmPackage rec { + pname = "stylelint"; + version = "15.10.3"; + + src = fetchFromGitHub { + owner = "stylelint"; + repo = "stylelint"; + rev = version; + hash = "sha256-k7Ngbd4Z3/JjCK6taynIiNCDTKfqGRrjfR0ePyRFY4w="; + }; + + npmDepsHash = "sha256-tVDhaDeUKzuyJU5ABSOeYgS56BDSJTfjBZdTsuL/7tA="; + + dontNpmBuild = true; + + meta = with lib; { + description = "Mighty CSS linter that helps you avoid errors and enforce conventions"; + homepage = "https://stylelint.io"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fbff2c5a7b..b78d1718a1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20356,6 +20356,8 @@ with pkgs; strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { }; + stylelint = callPackage ../development/tools/analysis/stylelint { }; + stylua = callPackage ../development/tools/stylua { }; summon = callPackage ../development/tools/summon { };