diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 55ebe329d88f..46189eb8f1ff 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -66,6 +66,7 @@ mapAliases { karma = pkgs.karma-runner; # added 2023-07-29 manta = pkgs.node-manta; # Added 2023-05-06 markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 + inherit (pkgs) markdownlint-cli2; # added 2023-08-22 readability-cli = pkgs.readability-cli; # Added 2023-06-12 reveal-md = pkgs.reveal-md; # added 2023-07-31 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2d891a114df5..0ad1815bcaa2 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -196,7 +196,6 @@ , "lua-fmt" , "lv_font_conv" , "madoko" -, "markdownlint-cli2" , "markdown-link-check" , {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"} , "mastodon-bot" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c68dddcf5b27..48336d300c9f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -114963,61 +114963,6 @@ in bypassCache = true; reconstructLock = true; }; - markdownlint-cli2 = nodeEnv.buildNodePackage { - name = "markdownlint-cli2"; - packageName = "markdownlint-cli2"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.8.1.tgz"; - sha512 = "y0Siwt+RApKxSSb0CT9p7z1DcAO+ncjrB9IpC/jflJRIet4namCFmxLTbfBBQdPF6EntPk5yyXKe7vcoPGlnXw=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."argparse-2.0.1" - sources."braces-3.0.2" - sources."dir-glob-3.0.1" - sources."entities-3.0.1" - sources."fast-glob-3.3.1" - sources."fastq-1.15.0" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."globby-13.1.4" - sources."ignore-5.2.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."linkify-it-4.0.1" - sources."markdown-it-13.0.1" - sources."markdownlint-0.29.0" - sources."markdownlint-cli2-0.8.1" - sources."markdownlint-cli2-formatter-default-0.0.4" - sources."markdownlint-micromark-0.1.5" - sources."mdurl-1.0.1" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."slash-4.0.0" - sources."strip-json-comments-5.0.0" - sources."to-regex-range-5.0.1" - sources."uc.micro-1.0.6" - sources."yaml-2.3.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A fast, flexible, configuration-based command-line interface for linting Markdown/CommonMark files with the `markdownlint` library"; - homepage = "https://github.com/DavidAnson/markdownlint-cli2"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; diff --git a/pkgs/tools/text/markdownlint-cli2/default.nix b/pkgs/tools/text/markdownlint-cli2/default.nix new file mode 100644 index 000000000000..86e1338a09ef --- /dev/null +++ b/pkgs/tools/text/markdownlint-cli2/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "markdownlint-cli2"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "DavidAnson"; + repo = "markdownlint-cli2"; + rev = "v${version}"; + hash = "sha256-qtdR7Rhz+HLZJX82OrN+twOsvFOv99e4BBDVV1UayPI="; + }; + + npmDepsHash = "sha256-Fx0lDcvzLRVSAX0apKmu1CBfnGmGQR9FQEdhHUtue/c="; + + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json + ''; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/DavidAnson/markdownlint-cli2/blob/${src.rev}/CHANGELOG.md"; + description = "A fast, flexible, configuration-based command-line interface for linting Markdown/CommonMark files with the markdownlint library"; + homepage = "https://github.com/DavidAnson/markdownlint-cli2"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 274311f5b4d5..0dbb8c375228 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1842,6 +1842,8 @@ with pkgs; markdownlint-cli = callPackage ../tools/text/markdownlint-cli { }; + markdownlint-cli2 = callPackage ../tools/text/markdownlint-cli2 { }; + mbidled = callPackage ../tools/networking/mbidled { }; metapixel = callPackage ../tools/graphics/metapixel { };