diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 707426d2c22..350c0010d3c 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -56,6 +56,7 @@ mapAliases {
   inherit (pkgs) carto; # added 2023-08-17
   castnow = pkgs.castnow; # added 2023-07-30
   inherit (pkgs) clean-css-cli; # added 2023-08-18
+  inherit (pkgs) clubhouse-cli; # added 2023-08-18
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) configurable-http-proxy; # added 2023-08-19
   inherit (pkgs) cordova; # added 2023-08-18
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index abb33628028..7e638b5d352 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -31,7 +31,6 @@
   cdk8s-cli = "cdk8s";
   cdktf-cli = "cdktf";
   clipboard-cli = "clipboard";
-  clubhouse-cli = "club";
   conventional-changelog-cli = "conventional-changelog";
   cpy-cli = "cpy";
   diff2html-cli = "diff2html";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index be3b1826e12..35f88567a63 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -40,7 +40,6 @@
 , "cdk8s-cli"
 , "cdktf-cli"
 , "clipboard-cli"
-, "clubhouse-cli"
 , "coc-clangd"
 , "coc-cmake"
 , "coc-css"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f73e03a6be1..9370347d5f8 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -78095,74 +78095,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  clubhouse-cli = nodeEnv.buildNodePackage {
-    name = "clubhouse-cli";
-    packageName = "clubhouse-cli";
-    version = "2.7.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/clubhouse-cli/-/clubhouse-cli-2.7.0.tgz";
-      sha512 = "Vu0ZPruo16+CbH/kCEALHV3lQ4WnRoaqTb+HPy2fY9ywtdOxPCiT//3WSxv8YN5qFwMbI2Fu931mmU9sR/O0ZA==";
-    };
-    dependencies = [
-      sources."@colors/colors-1.5.0"
-      sources."ansi-styles-3.2.1"
-      sources."async-3.2.3"
-      sources."chalk-2.4.2"
-      sources."cli-spinner-0.2.10"
-      sources."clubhouse-lib-0.10.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."colors-1.0.3"
-      sources."commander-2.20.3"
-      sources."cycle-1.0.3"
-      sources."debug-4.3.4"
-      sources."decode-uri-component-0.2.2"
-      sources."encoding-0.1.13"
-      sources."escape-string-regexp-1.0.5"
-      sources."eyes-0.1.8"
-      sources."fetch-everywhere-1.0.5"
-      sources."filter-obj-1.1.0"
-      sources."has-flag-3.0.0"
-      sources."hasurl-1.0.0"
-      sources."iconv-lite-0.6.3"
-      sources."is-stream-1.1.0"
-      sources."isstream-0.1.2"
-      sources."lodash-4.17.21"
-      sources."lodash.sortby-4.7.0"
-      sources."ms-2.1.2"
-      sources."mute-stream-0.0.8"
-      sources."node-fetch-1.7.3"
-      sources."prompt-1.3.0"
-      sources."punycode-2.3.0"
-      sources."query-string-6.14.1"
-      sources."read-1.0.7"
-      sources."revalidator-0.1.8"
-      sources."safer-buffer-2.1.2"
-      sources."split-on-first-1.1.0"
-      sources."stack-trace-0.0.10"
-      sources."strict-uri-encode-2.0.0"
-      sources."supports-color-5.5.0"
-      sources."tr46-1.0.1"
-      sources."universal-url-2.0.0"
-      sources."webidl-conversions-4.0.2"
-      sources."whatwg-fetch-3.6.17"
-      sources."whatwg-url-7.1.0"
-      (sources."winston-2.4.7" // {
-        dependencies = [
-          sources."async-2.6.4"
-        ];
-      })
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A command line tool for viewing, creating and updating clubhouse.io stories";
-      homepage = "https://github.com/andjosh/clubhouse-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-clangd = nodeEnv.buildNodePackage {
     name = "coc-clangd";
     packageName = "coc-clangd";
diff --git a/pkgs/tools/misc/clubhouse-cli/default.nix b/pkgs/tools/misc/clubhouse-cli/default.nix
new file mode 100644
index 00000000000..22148f820d4
--- /dev/null
+++ b/pkgs/tools/misc/clubhouse-cli/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "clubhouse-cli";
+  version = "2.7.0";
+
+  src = fetchFromGitHub {
+    owner = "andjosh";
+    repo = "clubhouse-cli";
+    rev = "v${version}";
+    hash = "sha256-OGUEPWKL3GBIQHEDljX1gXMRDEztIrJT5ivAIcyW91k=";
+  };
+
+  npmDepsHash = "sha256-QlCLEvmqLVkWwgTVlToYD6bptLp/MVfQ10Wdfr3PIr4=";
+
+  meta = {
+    description = "A command line tool for viewing, creating and updating clubhouse.io stories";
+    homepage = "https://github.com/andjosh/clubhouse-cli";
+    changelog = "https://github.com/andjosh/clubhouse-cli/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    mainProgram = "club";
+    maintainers = with lib.maintainers; [ tobim ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f9b93adf07..bbda6bb6d69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1705,6 +1705,8 @@ with pkgs;
 
   clematis = callPackage ../tools/misc/clematis { };
 
+  clubhouse-cli = callPackage ../tools/misc/clubhouse-cli { };
+
   colorless = callPackage ../tools/misc/colorless { };
 
   configurable-http-proxy = callPackage ../tools/networking/configurable-http-proxy { };