From 14b9cf8edff1089a808bed96a46f5bc27fe77609 Mon Sep 17 00:00:00 2001
From: Robert Schütz <nix@dotlambda.de>
Date: Thu, 17 Aug 2023 21:12:48 -0700
Subject: carbon-now-cli: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix        |   1 +
 pkgs/development/node-packages/main-programs.nix  |   1 -
 pkgs/development/node-packages/node-packages.json |   1 -
 pkgs/development/node-packages/node-packages.nix  | 561 ----------------------
 pkgs/development/node-packages/overrides.nix      |  11 -
 pkgs/tools/typesetting/carbon-now-cli/default.nix |  37 ++
 pkgs/top-level/all-packages.nix                   |   2 +
 7 files changed, 40 insertions(+), 574 deletions(-)
 create mode 100644 pkgs/tools/typesetting/carbon-now-cli/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 2980890ecab..ec60a9de8f9 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -50,6 +50,7 @@ mapAliases {
   bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
   bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
   inherit (pkgs) btc-rpc-explorer; # added 2023-08-17
+  inherit (pkgs) carbon-now-cli; # added 2023-08-17
   inherit (pkgs) carto; # added 2023-08-17
   castnow = pkgs.castnow; # added 2023-07-30
   inherit (pkgs) clean-css-cli; # added 2023-08-18
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index 7bc78c62399..a0aee7713f4 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -29,7 +29,6 @@
   "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen";
   "@webassemblyjs/wast-refmt-1.11.1" = "wast-refmt";
   aws-cdk = "cdk";
-  carbon-now-cli = "carbon-now";
   cdk8s-cli = "cdk8s";
   cdktf-cli = "cdktf";
   clipboard-cli = "clipboard";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 2291b27fca3..5c96d4f93c9 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -39,7 +39,6 @@
 , "bower2nix"
 , "browserify"
 , "browser-sync"
-, "carbon-now-cli"
 , "cdk8s-cli"
 , "cdktf-cli"
 , "clipboard-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 072980b6d4e..22dade34243 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -89710,567 +89710,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  carbon-now-cli = nodeEnv.buildNodePackage {
-    name = "carbon-now-cli";
-    packageName = "carbon-now-cli";
-    version = "2.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/carbon-now-cli/-/carbon-now-cli-2.0.0.tgz";
-      sha512 = "nad2waGHrt4ISKU3VAPdf+cyeXdPRVuNmJSQtLD4KSNcPwR3wqpgCo7Y4PBZYdYU+E0IRSaS5a1QfIU25Inqxw==";
-    };
-    dependencies = [
-      (sources."@babel/code-frame-7.22.10" // {
-        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."@babel/helper-validator-identifier-7.22.5"
-      (sources."@babel/highlight-7.22.10" // {
-        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."@babel/runtime-7.22.10" // {
-        dependencies = [
-          sources."regenerator-runtime-0.14.0"
-        ];
-      })
-      sources."@jimp/bmp-0.14.0"
-      sources."@jimp/core-0.14.0"
-      sources."@jimp/custom-0.14.0"
-      sources."@jimp/gif-0.14.0"
-      sources."@jimp/jpeg-0.14.0"
-      sources."@jimp/plugin-blit-0.14.0"
-      sources."@jimp/plugin-blur-0.14.0"
-      sources."@jimp/plugin-circle-0.14.0"
-      sources."@jimp/plugin-color-0.14.0"
-      sources."@jimp/plugin-contain-0.14.0"
-      sources."@jimp/plugin-cover-0.14.0"
-      sources."@jimp/plugin-crop-0.14.0"
-      sources."@jimp/plugin-displace-0.14.0"
-      sources."@jimp/plugin-dither-0.14.0"
-      sources."@jimp/plugin-fisheye-0.14.0"
-      sources."@jimp/plugin-flip-0.14.0"
-      sources."@jimp/plugin-gaussian-0.14.0"
-      sources."@jimp/plugin-invert-0.14.0"
-      sources."@jimp/plugin-mask-0.14.0"
-      sources."@jimp/plugin-normalize-0.14.0"
-      sources."@jimp/plugin-print-0.14.0"
-      sources."@jimp/plugin-resize-0.14.0"
-      sources."@jimp/plugin-rotate-0.14.0"
-      sources."@jimp/plugin-scale-0.14.0"
-      sources."@jimp/plugin-shadow-0.14.0"
-      sources."@jimp/plugin-threshold-0.14.0"
-      sources."@jimp/plugins-0.14.0"
-      sources."@jimp/png-0.14.0"
-      sources."@jimp/tiff-0.14.0"
-      sources."@jimp/types-0.14.0"
-      sources."@jimp/utils-0.14.0"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@playwright/test-1.36.2"
-      sources."@pnpm/config.env-replace-1.1.0"
-      (sources."@pnpm/network.ca-file-1.0.2" // {
-        dependencies = [
-          sources."graceful-fs-4.2.10"
-        ];
-      })
-      sources."@pnpm/npm-conf-2.2.2"
-      sources."@sindresorhus/is-5.6.0"
-      sources."@szmarczak/http-timer-5.0.1"
-      sources."@types/http-cache-semantics-4.0.1"
-      sources."@types/minimist-1.2.2"
-      sources."@types/node-20.4.9"
-      sources."@types/normalize-package-data-2.4.1"
-      sources."@xmldom/xmldom-0.8.10"
-      sources."aggregate-error-3.1.0"
-      (sources."ansi-align-3.0.1" // {
-        dependencies = [
-          sources."ansi-regex-5.0.1"
-          sources."emoji-regex-8.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."string-width-4.2.3"
-          sources."strip-ansi-6.0.1"
-        ];
-      })
-      sources."ansi-colors-4.1.3"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-3.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."any-base-1.1.0"
-      (sources."app-path-3.3.0" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-          sources."execa-1.0.0"
-          sources."get-stream-4.1.0"
-          sources."is-stream-1.1.0"
-          sources."npm-run-path-2.0.2"
-          sources."path-key-2.0.1"
-          sources."shebang-command-1.2.0"
-          sources."shebang-regex-1.0.0"
-          sources."which-1.3.1"
-        ];
-      })
-      sources."arch-2.2.0"
-      sources."array-range-1.0.1"
-      sources."array-union-2.1.0"
-      sources."arrify-1.0.1"
-      sources."astral-regex-2.0.0"
-      sources."balanced-match-1.0.2"
-      sources."base64-js-1.5.1"
-      sources."bmp-js-0.1.0"
-      (sources."boxen-7.1.1" // {
-        dependencies = [
-          sources."ansi-regex-6.0.1"
-          sources."camelcase-7.0.1"
-          sources."chalk-5.3.0"
-          sources."string-width-5.1.2"
-          sources."strip-ansi-7.1.0"
-          sources."type-fest-2.19.0"
-        ];
-      })
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.2"
-      sources."buffer-5.7.1"
-      sources."buffer-equal-0.0.1"
-      sources."cacheable-lookup-7.0.0"
-      sources."cacheable-request-10.2.13"
-      sources."camelcase-5.3.1"
-      sources."camelcase-keys-6.2.2"
-      sources."chalk-4.1.2"
-      sources."chardet-0.7.0"
-      sources."ci-info-3.8.0"
-      sources."clean-stack-2.2.0"
-      sources."cli-boxes-3.0.0"
-      sources."cli-cursor-2.1.0"
-      (sources."cli-truncate-3.1.0" // {
-        dependencies = [
-          sources."ansi-regex-6.0.1"
-          sources."string-width-5.1.2"
-          sources."strip-ansi-7.1.0"
-        ];
-      })
-      sources."cli-width-2.2.1"
-      sources."clipboard-sys-1.2.1"
-      (sources."clipboardy-2.3.0" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-          sources."execa-1.0.0"
-          sources."get-stream-4.1.0"
-          sources."is-stream-1.1.0"
-          sources."npm-run-path-2.0.2"
-          sources."path-key-2.0.1"
-          sources."shebang-command-1.2.0"
-          sources."shebang-regex-1.0.0"
-          sources."which-1.3.1"
-        ];
-      })
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."colorette-2.0.20"
-      sources."concat-map-0.0.1"
-      (sources."config-chain-1.1.13" // {
-        dependencies = [
-          sources."ini-1.3.8"
-        ];
-      })
-      (sources."configstore-6.0.0" // {
-        dependencies = [
-          sources."crypto-random-string-4.0.0"
-          sources."unique-string-3.0.0"
-        ];
-      })
-      sources."cross-spawn-7.0.3"
-      sources."crypto-random-string-2.0.0"
-      sources."cycled-1.2.0"
-      sources."decamelize-1.2.0"
-      (sources."decamelize-keys-1.1.1" // {
-        dependencies = [
-          sources."map-obj-1.0.1"
-        ];
-      })
-      sources."decode-gif-1.0.1"
-      sources."decode-uri-component-0.2.2"
-      (sources."decompress-response-6.0.0" // {
-        dependencies = [
-          sources."mimic-response-3.1.0"
-        ];
-      })
-      sources."deep-extend-0.6.0"
-      sources."defer-to-connect-2.0.1"
-      sources."define-lazy-prop-2.0.0"
-      sources."del-6.1.1"
-      sources."delay-4.4.1"
-      sources."dir-glob-3.0.1"
-      sources."dom-walk-0.1.2"
-      sources."dot-prop-6.0.1"
-      sources."eastasianwidth-0.2.0"
-      sources."emoji-regex-9.2.2"
-      sources."end-of-stream-1.4.4"
-      (sources."enquirer-2.4.1" // {
-        dependencies = [
-          sources."ansi-regex-5.0.1"
-          sources."strip-ansi-6.0.1"
-        ];
-      })
-      sources."error-ex-1.3.2"
-      sources."escape-goat-4.0.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."eventemitter3-5.0.1"
-      sources."execa-5.1.1"
-      sources."exif-parser-0.1.12"
-      sources."external-editor-3.1.0"
-      sources."fast-glob-3.3.1"
-      sources."fastq-1.15.0"
-      sources."figures-2.0.0"
-      sources."file-exists-5.0.1"
-      sources."file-extension-4.0.5"
-      sources."file-type-9.0.0"
-      sources."fill-range-7.0.1"
-      sources."filter-obj-1.1.0"
-      sources."find-up-4.1.0"
-      sources."form-data-encoder-2.1.4"
-      sources."fs-extra-10.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.2"
-      sources."function-bind-1.1.1"
-      sources."get-stdin-8.0.0"
-      sources."get-stream-6.0.1"
-      sources."gifwrap-0.9.4"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."global-4.4.0"
-      sources."global-dirs-3.0.1"
-      sources."globby-11.1.0"
-      sources."got-12.6.1"
-      sources."graceful-fs-4.2.11"
-      sources."hard-rejection-2.1.0"
-      sources."has-1.0.3"
-      sources."has-flag-4.0.0"
-      sources."has-yarn-3.0.0"
-      sources."hosted-git-info-4.1.0"
-      sources."http-cache-semantics-4.1.1"
-      (sources."http2-wrapper-2.2.0" // {
-        dependencies = [
-          sources."quick-lru-5.1.1"
-        ];
-      })
-      sources."human-signals-2.1.0"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."ignore-5.2.4"
-      (sources."image-q-4.0.0" // {
-        dependencies = [
-          sources."@types/node-16.9.1"
-        ];
-      })
-      sources."import-lazy-4.0.0"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-4.0.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-2.0.0"
-      (sources."inquirer-6.5.2" // {
-        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."is-arrayish-0.2.1"
-      sources."is-ci-3.0.1"
-      sources."is-core-module-2.13.0"
-      sources."is-docker-2.2.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."is-function-1.0.2"
-      sources."is-glob-4.0.3"
-      sources."is-installed-globally-0.4.0"
-      sources."is-npm-6.0.0"
-      sources."is-number-7.0.0"
-      sources."is-obj-2.0.0"
-      sources."is-path-cwd-2.2.0"
-      sources."is-path-inside-3.0.3"
-      sources."is-plain-obj-1.1.0"
-      sources."is-stream-2.0.1"
-      sources."is-typedarray-1.0.0"
-      sources."is-wsl-2.2.0"
-      sources."is-yarn-global-0.4.1"
-      sources."isexe-2.0.0"
-      sources."iterm2-version-4.2.0"
-      sources."jimp-0.14.0"
-      sources."jpeg-js-0.4.4"
-      sources."js-tokens-4.0.0"
-      sources."json-buffer-3.0.1"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."jsonfile-6.1.0"
-      sources."keyv-4.5.3"
-      sources."kind-of-6.0.3"
-      sources."latest-version-7.0.0"
-      sources."lines-and-columns-1.2.4"
-      sources."listr2-6.6.1"
-      sources."load-bmfont-1.4.1"
-      sources."locate-path-5.0.0"
-      sources."lodash-4.17.21"
-      (sources."log-update-5.0.1" // {
-        dependencies = [
-          sources."ansi-escapes-5.0.0"
-          sources."ansi-regex-6.0.1"
-          sources."cli-cursor-4.0.0"
-          sources."restore-cursor-4.0.0"
-          sources."strip-ansi-7.1.0"
-        ];
-      })
-      sources."lowercase-keys-3.0.0"
-      sources."lru-cache-6.0.0"
-      sources."map-obj-4.3.0"
-      (sources."meow-9.0.0" // {
-        dependencies = [
-          sources."type-fest-0.18.1"
-        ];
-      })
-      sources."merge-stream-2.0.0"
-      sources."merge2-1.4.1"
-      sources."micromatch-4.0.5"
-      sources."mime-1.6.0"
-      sources."mimic-fn-2.1.0"
-      sources."mimic-response-4.0.0"
-      sources."min-document-2.19.0"
-      sources."min-indent-1.0.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minimist-options-4.1.0"
-      sources."mkdirp-0.5.6"
-      sources."mute-stream-0.0.7"
-      sources."nanoid-3.3.6"
-      sources."nice-try-1.0.5"
-      (sources."normalize-package-data-3.0.3" // {
-        dependencies = [
-          sources."semver-7.5.4"
-        ];
-      })
-      sources."normalize-url-8.0.0"
-      sources."npm-run-path-4.0.1"
-      sources."omggif-1.0.10"
-      sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."open-8.4.2"
-      sources."os-tmpdir-1.0.2"
-      sources."p-cancelable-3.0.0"
-      sources."p-finally-1.0.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-map-4.0.0"
-      sources."p-try-2.2.0"
-      (sources."package-json-8.1.1" // {
-        dependencies = [
-          sources."semver-7.5.4"
-        ];
-      })
-      sources."pako-1.0.11"
-      sources."parse-bmfont-ascii-1.0.6"
-      sources."parse-bmfont-binary-1.0.6"
-      sources."parse-bmfont-xml-1.1.4"
-      sources."parse-headers-2.0.5"
-      sources."parse-json-5.2.0"
-      sources."path-exists-4.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
-      sources."path-parse-1.0.7"
-      sources."path-type-4.0.0"
-      sources."phin-2.9.3"
-      sources."picomatch-2.3.1"
-      sources."pixelmatch-4.0.2"
-      sources."playwright-1.36.2"
-      sources."playwright-core-1.36.2"
-      (sources."plist-3.1.0" // {
-        dependencies = [
-          sources."xmlbuilder-15.1.1"
-        ];
-      })
-      sources."pngjs-3.4.0"
-      sources."process-0.11.10"
-      sources."proto-list-1.2.4"
-      sources."pump-3.0.0"
-      sources."pupa-3.1.0"
-      sources."query-string-7.1.3"
-      sources."queue-microtask-1.2.3"
-      sources."quick-lru-4.0.1"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."ini-1.3.8"
-        ];
-      })
-      (sources."read-pkg-5.2.0" // {
-        dependencies = [
-          sources."hosted-git-info-2.8.9"
-          sources."normalize-package-data-2.5.0"
-          sources."type-fest-0.6.0"
-        ];
-      })
-      (sources."read-pkg-up-7.0.1" // {
-        dependencies = [
-          sources."type-fest-0.8.1"
-        ];
-      })
-      sources."redent-3.0.0"
-      sources."regenerator-runtime-0.13.11"
-      sources."registry-auth-token-5.0.2"
-      sources."registry-url-6.0.1"
-      sources."render-gif-2.0.4"
-      sources."resolve-1.22.4"
-      sources."resolve-alpn-1.2.1"
-      sources."responselike-3.0.0"
-      (sources."restore-cursor-2.0.0" // {
-        dependencies = [
-          sources."mimic-fn-1.2.0"
-          sources."onetime-2.0.1"
-        ];
-      })
-      sources."reusify-1.0.4"
-      sources."rfdc-1.3.0"
-      sources."rimraf-3.0.2"
-      sources."run-async-2.4.1"
-      sources."run-parallel-1.2.0"
-      sources."rxjs-6.6.7"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.2.4"
-      sources."semver-5.7.2"
-      (sources."semver-diff-4.0.0" // {
-        dependencies = [
-          sources."semver-7.5.4"
-        ];
-      })
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-3.0.7"
-      sources."slash-3.0.0"
-      (sources."slice-ansi-5.0.0" // {
-        dependencies = [
-          sources."ansi-styles-6.2.1"
-          sources."is-fullwidth-code-point-4.0.0"
-        ];
-      })
-      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."split-on-first-1.1.0"
-      sources."strict-uri-encode-2.0.0"
-      (sources."string-width-2.1.1" // {
-        dependencies = [
-          sources."strip-ansi-4.0.0"
-        ];
-      })
-      (sources."strip-ansi-5.2.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.1"
-        ];
-      })
-      sources."strip-eof-1.0.0"
-      sources."strip-final-newline-2.0.0"
-      sources."strip-indent-3.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-7.2.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."temp-dir-2.0.0"
-      (sources."tempy-1.0.1" // {
-        dependencies = [
-          sources."type-fest-0.16.0"
-        ];
-      })
-      (sources."term-img-5.0.0" // {
-        dependencies = [
-          sources."ansi-escapes-4.3.2"
-          sources."type-fest-0.21.3"
-        ];
-      })
-      (sources."terminal-image-1.2.1" // {
-        dependencies = [
-          sources."ansi-escapes-4.3.2"
-          sources."ansi-regex-5.0.1"
-          sources."cli-cursor-3.1.0"
-          sources."emoji-regex-8.0.0"
-          sources."is-fullwidth-code-point-3.0.0"
-          sources."log-update-4.0.0"
-          sources."restore-cursor-3.1.0"
-          sources."slice-ansi-4.0.0"
-          sources."string-width-4.2.3"
-          sources."strip-ansi-6.0.1"
-          sources."type-fest-0.21.3"
-          sources."wrap-ansi-6.2.0"
-        ];
-      })
-      sources."through-2.3.8"
-      sources."timm-1.7.1"
-      sources."tinycolor2-1.6.0"
-      sources."tmp-0.0.33"
-      sources."to-regex-range-5.0.1"
-      sources."trim-newlines-3.0.1"
-      sources."tslib-1.14.1"
-      sources."type-fest-1.4.0"
-      sources."typedarray-to-buffer-3.1.5"
-      sources."unique-string-2.0.0"
-      sources."universalify-2.0.0"
-      (sources."update-notifier-6.0.2" // {
-        dependencies = [
-          sources."chalk-5.3.0"
-          sources."semver-7.5.4"
-        ];
-      })
-      sources."utif-2.0.1"
-      sources."validate-npm-package-license-3.0.4"
-      sources."which-2.0.2"
-      (sources."widest-line-4.0.1" // {
-        dependencies = [
-          sources."ansi-regex-6.0.1"
-          sources."string-width-5.1.2"
-          sources."strip-ansi-7.1.0"
-        ];
-      })
-      (sources."wrap-ansi-8.1.0" // {
-        dependencies = [
-          sources."ansi-regex-6.0.1"
-          sources."ansi-styles-6.2.1"
-          sources."string-width-5.1.2"
-          sources."strip-ansi-7.1.0"
-        ];
-      })
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.3"
-      sources."xdg-basedir-5.1.0"
-      sources."xhr-2.6.0"
-      sources."xml-parse-from-string-1.0.1"
-      sources."xml2js-0.4.23"
-      sources."xmlbuilder-11.0.1"
-      sources."xtend-4.0.2"
-      sources."yallist-4.0.0"
-      sources."yargs-parser-20.2.9"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Beautiful images of your code — from right inside your terminal.";
-      homepage = "https://github.com/mixn/carbon-now-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   cdk8s-cli = nodeEnv.buildNodePackage {
     name = "cdk8s-cli";
     packageName = "cdk8s-cli";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index c4ddc2a40a5..fbd71db501d 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -92,17 +92,6 @@ final: prev: {
     '';
   };
 
-  carbon-now-cli = prev.carbon-now-cli.override {
-    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
-    prePatch = ''
-      export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
-    '';
-    postInstall = ''
-      wrapProgram $out/bin/carbon-now \
-        --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium
-    '';
-  };
-
   coc-imselect = prev.coc-imselect.override (oldAttrs: {
     meta = oldAttrs.meta // { broken = since "10"; };
   });
diff --git a/pkgs/tools/typesetting/carbon-now-cli/default.nix b/pkgs/tools/typesetting/carbon-now-cli/default.nix
new file mode 100644
index 00000000000..7d35283ab74
--- /dev/null
+++ b/pkgs/tools/typesetting/carbon-now-cli/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "carbon-now-cli";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "mixn";
+    repo = "carbon-now-cli";
+    rev = "v${version}";
+    hash = "sha256-2fqZdPkVM3qBZKacBv9dX99Q9WnM5m7OpChG2n1TnXg=";
+  };
+
+  npmDepsHash = "sha256-UgrgnaA+GXRQT3dtAoMq6tsZZ2gV1CQNoYG58IuSZUM=";
+
+  postPatch = ''
+    substituteInPlace package.json \
+      --replace "bundle/cli.js" "dist/cli.js" \
+      --replace "trash " "rm -rf " \
+      --replace "npx playwright install --with-deps" "true"
+  '';
+
+  env = {
+    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1;
+  };
+
+  meta = {
+    description = "Beautiful images of your code — from right inside your terminal";
+    homepage = "https://github.com/mixn/carbon-now-cli";
+    license = lib.licenses.mit;
+    mainProgram = "carbon-now";
+    maintainers = with lib.maintainers; [ rmcgibbo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ebd7ddb32e..98b4a45a113 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1664,6 +1664,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
+  carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { };
+
   cf-vault = callPackage ../tools/admin/cf-vault { };
 
   cfonts = callPackage ../tools/misc/cfonts { };
-- 
cgit 1.4.1