diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 7d1b6a924694..ec7db2ee8a1c 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -3,6 +3,8 @@
 , "@antora/cli"
 , "@antora/site-generator-default"
 , "@bitwarden/cli"
+, "@commitlint/cli"
+, "@commitlint/config-conventional"
 , "@hyperspace/cli"
 , "@nestjs/cli"
 , "@squoosh/cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 0406e4659448..6f7594f4129f 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -1687,6 +1687,132 @@ let
         sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ==";
       };
     };
+    "@commitlint/ensure-13.1.0" = {
+      name = "_at_commitlint_slash_ensure";
+      packageName = "@commitlint/ensure";
+      version = "13.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-13.1.0.tgz";
+        sha512 = "NRGyjOdZQnlYwm9it//BZJ2Vm+4x7G9rEnHpLCvNKYY0c6RA8Qf7hamLAB8dWO12RLuFt06JaOpHZoTt/gHutA==";
+      };
+    };
+    "@commitlint/execute-rule-13.0.0" = {
+      name = "_at_commitlint_slash_execute-rule";
+      packageName = "@commitlint/execute-rule";
+      version = "13.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-13.0.0.tgz";
+        sha512 = "lBz2bJhNAgkkU/rFMAw3XBNujbxhxlaFHY3lfKB/MxpAa+pIfmWB3ig9i1VKe0wCvujk02O0WiMleNaRn2KJqw==";
+      };
+    };
+    "@commitlint/format-13.1.0" = {
+      name = "_at_commitlint_slash_format";
+      packageName = "@commitlint/format";
+      version = "13.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/format/-/format-13.1.0.tgz";
+        sha512 = "n46rYvzf+6Sm99TJjTLjJBkjm6JVcklt31lDO5Q+pCIV0NnJ4qIUcwa6wIL9a9Vqb1XzlMgtp27E0zyYArkvSg==";
+      };
+    };
+    "@commitlint/is-ignored-13.1.0" = {
+      name = "_at_commitlint_slash_is-ignored";
+      packageName = "@commitlint/is-ignored";
+      version = "13.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-13.1.0.tgz";
+        sha512 = "P6zenLE5Tn3FTNjRzmL9+/KooTXEI0khA2TmUbuei9KiycemeO4q7Xk7w7aXwFPNAbN0O9oI7z3z7cFpzKJWmQ==";
+      };
+    };
+    "@commitlint/lint-13.1.0" = {
+      name = "_at_commitlint_slash_lint";
+      packageName = "@commitlint/lint";
+      version = "13.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/lint/-/lint-13.1.0.tgz";
+        sha512 = "qH9AYSQDDTaSWSdtOvB3G1RdPpcYSgddAdFYqpFewlKQ1GJj/L+sM7vwqCG7/ip6AiM04Sry1sgmFzaEoFREUA==";
+      };
+    };
+    "@commitlint/load-13.1.0" = {
+      name = "_at_commitlint_slash_load";
+      packageName = "@commitlint/load";
+      version = "13.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/load/-/load-13.1.0.tgz";
+        sha512 = "zlZbjJCWnWmBOSwTXis8H7I6pYk6JbDwOCuARA6B9Y/qt2PD+NCo0E/7EuaaFoxjHl+o56QR5QttuMBrf+BJzg==";
+      };
+    };
+    "@commitlint/message-13.0.0" = {
+      name = "_at_commitlint_slash_message";
+      packageName = "@commitlint/message";
+      version = "13.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/message/-/message-13.0.0.tgz";
+        sha512 = "W/pxhesVEk8747BEWJ+VGQ9ILHmCV27/pEwJ0hGny1wqVquUR8SxvScRCbUjHCB1YtWX4dEnOPXOS9CLH/CX7A==";
+      };
+    };
+    "@commitlint/parse-13.1.0" = {
+      name = "_at_commitlint_slash_parse";
+      packageName = "@commitlint/parse";
+      version = "13.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/parse/-/parse-13.1.0.tgz";
+        sha512 = "xFybZcqBiKVjt6vTStvQkySWEUYPI0AcO4QQELyy29o8EzYZqWkhUfrb7K61fWiHsplWL1iL6F3qCLoxSgTcrg==";
+      };
+    };
+    "@commitlint/read-13.1.0" = {
+      name = "_at_commitlint_slash_read";
+      packageName = "@commitlint/read";
+      version = "13.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/read/-/read-13.1.0.tgz";
+        sha512 = "NrVe23GMKyL6i1yDJD8IpqCBzhzoS3wtLfDj8QBzc01Ov1cYBmDojzvBklypGb+MLJM1NbzmRM4PR5pNX0U/NQ==";
+      };
+    };
+    "@commitlint/resolve-extends-13.0.0" = {
+      name = "_at_commitlint_slash_resolve-extends";
+      packageName = "@commitlint/resolve-extends";
+      version = "13.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-13.0.0.tgz";
+        sha512 = "1SyaE+UOsYTkQlTPUOoj4NwxQhGFtYildVS/d0TJuK8a9uAJLw7bhCLH2PEeH5cC2D1do4Eqhx/3bLDrSLH3hg==";
+      };
+    };
+    "@commitlint/rules-13.1.0" = {
+      name = "_at_commitlint_slash_rules";
+      packageName = "@commitlint/rules";
+      version = "13.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/rules/-/rules-13.1.0.tgz";
+        sha512 = "b6F+vBqEXsHVghrhomG0Y6YJimHZqkzZ0n5QEpk03dpBXH2OnsezpTw5e+GvbyYCc7PutGbYVQkytuv+7xCxYA==";
+      };
+    };
+    "@commitlint/to-lines-13.0.0" = {
+      name = "_at_commitlint_slash_to-lines";
+      packageName = "@commitlint/to-lines";
+      version = "13.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-13.0.0.tgz";
+        sha512 = "mzxWwCio1M4/kG9/69TTYqrraQ66LmtJCYTzAZdZ2eJX3I5w52pSjyP/DJzAUVmmJCYf2Kw3s+RtNVShtnZ+Rw==";
+      };
+    };
+    "@commitlint/top-level-13.0.0" = {
+      name = "_at_commitlint_slash_top-level";
+      packageName = "@commitlint/top-level";
+      version = "13.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-13.0.0.tgz";
+        sha512 = "baBy3MZBF28sR93yFezd4a5TdHsbXaakeladfHK9dOcGdXo9oQe3GS5hP3BmlN680D6AiQSN7QPgEJgrNUWUCg==";
+      };
+    };
+    "@commitlint/types-13.1.0" = {
+      name = "_at_commitlint_slash_types";
+      packageName = "@commitlint/types";
+      version = "13.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/types/-/types-13.1.0.tgz";
+        sha512 = "zcVjuT+OfKt8h91vhBxt05RMcTGEx6DM7Q9QZeuMbXFk6xgbsSEDMMapbJPA1bCZ81fa/1OQBijSYPrKvtt06g==";
+      };
+    };
     "@corestore/networker-1.2.0" = {
       name = "_at_corestore_slash_networker";
       packageName = "@corestore/networker";
@@ -1696,6 +1822,16 @@ let
         sha512 = "ErfgH7yuwh6C7Y4AYM6A+Vv0lYV2c3sx9NNzCkIOB8pgp1cPmht4T4ZbLu0GiVj1XJ67AOPI0nhYfi4DB/h2rA==";
       };
     };
+    "cosmiconfig-7.0.1" = {
+      name = "cosmiconfig";
+      packageName = "cosmiconfig";
+      version = "7.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz";
+        sha512 =
+          "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==";
+      };
+    };
     "@cronvel/get-pixels-3.4.0" = {
       name = "_at_cronvel_slash_get-pixels";
       packageName = "@cronvel/get-pixels";
@@ -4090,6 +4226,17 @@ let
         sha512 = "iWtpXfn1Zh4Vm37BzY8OSJ60Y9TqNOjk8J+KLIwcql9EuP+0C/C4WUn+vIQMfmnut3MxRmAYFE2B/LFYrjGC5Q==";
       };
     };
+    "resolve-global-1.0.0" = {
+      name = "resolve-global";
+      packageName = "resolve-global";
+      version = "1.0.0";
+      src = fetchurl {
+        url =
+          "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz";
+        sha512 =
+          "zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==";
+      };
+    };
     "@netflix/nerror-1.1.3" = {
       name = "_at_netflix_slash_nerror";
       packageName = "@netflix/nerror";
@@ -102355,6 +102502,227 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  "@commitlint/config-conventional" = nodeEnv.buildNodePackage {
+    name = "_at_commitlint_slash_config-conventional";
+    packageName = "@commitlint/config-conventional";
+    version = "13.1.0";
+    src = fetchurl {
+      url =
+        "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-13.1.0.tgz";
+      sha512 =
+        "zukJXqdr6jtMiVRy3tTHmwgKcUMGfqKDEskRigc5W3k2aYF4gBAtCEjMAJGZgSQE4DMcHeok0pEV2ANmTpb0cw==";
+    };
+    dependencies = [
+      sources."array-ify-1.0.0"
+      sources."compare-func-2.0.0"
+      sources."conventional-changelog-conventionalcommits-4.6.0"
+      sources."dot-prop-5.3.0"
+      sources."is-obj-2.0.0"
+      sources."lodash-4.17.21"
+      sources."q-1.5.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description =
+        "Shareable commitlint config enforcing conventional commits";
+      homepage = "https://github.com/conventional-changelog/commitlint#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  "@commitlint/cli" = nodeEnv.buildNodePackage {
+    name = "_at_commitlint_slash_cli";
+    packageName = "@commitlint/cli";
+    version = "13.1.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/@commitlint/cli/-/cli-13.1.0.tgz";
+      sha512 =
+        "xN/uNYWtGTva5OMSd+xA6e6/c2jk8av7MUbdd6w2cw89u6z3fAWoyiH87X0ewdSMNYmW/6B3L/2dIVGHRDID5w==";
+    };
+    dependencies = [
+      sources."@babel/code-frame-7.14.5"
+      sources."@babel/helper-validator-identifier-7.14.9"
+      (sources."@babel/highlight-7.14.5" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."has-flag-3.0.0"
+          sources."supports-color-5.5.0"
+        ];
+      })
+      sources."@commitlint/ensure-13.1.0"
+      sources."@commitlint/execute-rule-13.0.0"
+      sources."@commitlint/format-13.1.0"
+      sources."@commitlint/is-ignored-13.1.0"
+      sources."@commitlint/lint-13.1.0"
+      sources."@commitlint/load-13.1.0"
+      sources."@commitlint/message-13.0.0"
+      sources."@commitlint/parse-13.1.0"
+      sources."@commitlint/read-13.1.0"
+      sources."@commitlint/resolve-extends-13.0.0"
+      sources."@commitlint/rules-13.1.0"
+      sources."@commitlint/to-lines-13.0.0"
+      (sources."@commitlint/top-level-13.0.0" // {
+        dependencies = [
+          sources."find-up-5.0.0"
+          sources."locate-path-6.0.0"
+          sources."p-limit-3.1.0"
+          sources."p-locate-5.0.0"
+        ];
+      })
+      sources."@commitlint/types-13.1.0"
+      sources."@types/minimist-1.2.2"
+      sources."@types/normalize-package-data-2.4.1"
+      sources."@types/parse-json-4.0.0"
+      sources."JSONStream-1.3.5"
+      sources."ansi-regex-5.0.0"
+      sources."ansi-styles-4.3.0"
+      sources."array-ify-1.0.0"
+      sources."arrify-1.0.1"
+      sources."callsites-3.1.0"
+      sources."camelcase-5.3.1"
+      sources."camelcase-keys-6.2.2"
+      sources."chalk-4.1.2"
+      sources."cliui-7.0.4"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
+      sources."compare-func-2.0.0"
+      sources."conventional-changelog-angular-5.0.12"
+      sources."conventional-commits-parser-3.2.1"
+      sources."cosmiconfig-7.0.1"
+      sources."cross-spawn-7.0.3"
+      sources."dargs-7.0.0"
+      sources."decamelize-1.2.0"
+      (sources."decamelize-keys-1.1.0" // {
+        dependencies = [ sources."map-obj-1.0.1" ];
+      })
+      sources."dot-prop-5.3.0"
+      sources."emoji-regex-8.0.0"
+      sources."error-ex-1.3.2"
+      sources."escalade-3.1.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."execa-5.1.1"
+      sources."find-up-4.1.0"
+      sources."fs-extra-10.0.0"
+      sources."function-bind-1.1.1"
+      sources."get-caller-file-2.0.5"
+      sources."get-stream-6.0.1"
+      sources."git-raw-commits-2.0.10"
+      sources."global-dirs-0.1.1"
+      sources."graceful-fs-4.2.8"
+      sources."hard-rejection-2.1.0"
+      sources."has-1.0.3"
+      sources."has-flag-4.0.0"
+      sources."hosted-git-info-4.0.2"
+      sources."human-signals-2.1.0"
+      (sources."import-fresh-3.3.0" // {
+        dependencies = [ sources."resolve-from-4.0.0" ];
+      })
+      sources."indent-string-4.0.0"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.8"
+      sources."is-arrayish-0.2.1"
+      sources."is-core-module-2.6.0"
+      sources."is-fullwidth-code-point-3.0.0"
+      sources."is-obj-2.0.0"
+      sources."is-plain-obj-1.1.0"
+      sources."is-stream-2.0.1"
+      sources."is-text-path-1.0.1"
+      sources."isexe-2.0.0"
+      sources."js-tokens-4.0.0"
+      sources."json-parse-even-better-errors-2.3.1"
+      sources."jsonfile-6.1.0"
+      sources."jsonparse-1.3.1"
+      sources."kind-of-6.0.3"
+      sources."lines-and-columns-1.1.6"
+      sources."locate-path-5.0.0"
+      sources."lodash-4.17.21"
+      sources."lru-cache-6.0.0"
+      sources."map-obj-4.2.1"
+      sources."meow-8.1.2"
+      sources."merge-stream-2.0.0"
+      sources."mimic-fn-2.1.0"
+      sources."min-indent-1.0.1"
+      sources."minimist-options-4.1.0"
+      sources."normalize-package-data-3.0.3"
+      sources."npm-run-path-4.0.1"
+      sources."onetime-5.1.2"
+      sources."p-limit-2.3.0"
+      sources."p-locate-4.1.0"
+      sources."p-try-2.2.0"
+      sources."parent-module-1.0.1"
+      sources."parse-json-5.2.0"
+      sources."path-exists-4.0.0"
+      sources."path-key-3.1.1"
+      sources."path-parse-1.0.7"
+      sources."path-type-4.0.0"
+      sources."q-1.5.1"
+      sources."quick-lru-4.0.1"
+      (sources."read-pkg-5.2.0" // {
+        dependencies = [
+          sources."hosted-git-info-2.8.9"
+          sources."normalize-package-data-2.5.0"
+          sources."semver-5.7.1"
+          sources."type-fest-0.6.0"
+        ];
+      })
+      (sources."read-pkg-up-7.0.1" // {
+        dependencies = [ sources."type-fest-0.8.1" ];
+      })
+      sources."readable-stream-3.6.0"
+      sources."redent-3.0.0"
+      sources."require-directory-2.1.1"
+      sources."resolve-1.20.0"
+      sources."resolve-from-5.0.0"
+      sources."resolve-global-1.0.0"
+      sources."safe-buffer-5.2.1"
+      sources."semver-7.3.5"
+      sources."shebang-command-2.0.0"
+      sources."shebang-regex-3.0.0"
+      sources."signal-exit-3.0.3"
+      sources."spdx-correct-3.1.1"
+      sources."spdx-exceptions-2.3.0"
+      sources."spdx-expression-parse-3.0.1"
+      sources."spdx-license-ids-3.0.10"
+      sources."split2-3.2.2"
+      sources."string-width-4.2.2"
+      sources."string_decoder-1.3.0"
+      sources."strip-ansi-6.0.0"
+      sources."strip-final-newline-2.0.0"
+      sources."strip-indent-3.0.0"
+      sources."supports-color-7.2.0"
+      sources."text-extensions-1.9.0"
+      sources."through-2.3.8"
+      sources."through2-4.0.2"
+      sources."trim-newlines-3.0.1"
+      sources."trim-off-newlines-1.0.1"
+      sources."type-fest-0.18.1"
+      sources."universalify-2.0.0"
+      sources."util-deprecate-1.0.2"
+      sources."validate-npm-package-license-3.0.4"
+      sources."which-2.0.2"
+      sources."wrap-ansi-7.0.0"
+      sources."y18n-5.0.8"
+      sources."yallist-4.0.0"
+      sources."yaml-1.10.2"
+      sources."yargs-17.1.1"
+      sources."yargs-parser-20.2.9"
+      sources."yocto-queue-0.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Lint your commit messages";
+      homepage = "https://github.com/conventional-changelog/commitlint#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8d0c46fc2bb..9c67e1e90af0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -258,6 +258,8 @@ with pkgs;
 
   comedilib = callPackage ../development/libraries/comedilib {  };
 
+  commitlint = nodePackages."@commitlint/cli";
+
   containerpilot = callPackage ../applications/networking/cluster/containerpilot { };
 
   coordgenlibs  = callPackage ../development/libraries/coordgenlibs { };