clubhouse-cli: use buildNpmPackage

ryantm · Sep 3, 2023 · cf466c3 · cf466c3
1 parent ac3d200
commit cf466c3
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 70 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/pkgs/tools/misc/clubhouse-cli/default.nix 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
@@ -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 { };