From 7048a87e3cad9d4e9705df692d50143d2e9b2271 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 5 May 2023 19:49:15 +0200
Subject: nodePackages.triton: convert to buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix        |   1 +
 pkgs/development/node-packages/node-packages.json |   1 -
 pkgs/development/node-packages/node-packages.nix  | 202 ----------------------
 pkgs/development/node-packages/overrides.nix      |   8 -
 pkgs/tools/admin/triton/default.nix               |  44 +++++
 pkgs/top-level/all-packages.nix                   |   2 +-
 6 files changed, 46 insertions(+), 212 deletions(-)
 create mode 100644 pkgs/tools/admin/triton/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 5fefdc7c3f537..3fc7a3d82e67c 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -37,4 +37,5 @@ mapAliases {
   "@antora/cli" = pkgs.antora;
   "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02
   "@nestjs/cli" = pkgs.nest-cli;
+  trito = pkgs.triton; # Added 2023-05-06
 }
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 0a19cdca83ee9..7f17c3967293b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -365,7 +365,6 @@
 , "three"
 , "tiddlywiki"
 , "titanium"
-, "triton"
 , "tsun"
 , "ts-node"
 , "ttf2eot"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 04143a8a838ad..db373c55a142e 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -149660,208 +149660,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  triton = nodeEnv.buildNodePackage {
-    name = "triton";
-    packageName = "triton";
-    version = "7.15.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/triton/-/triton-7.15.4.tgz";
-      sha512 = "xGR0oMmwiP4eiCGn4kLN5TWi8Dh+hMrLQ30KJQy7gRf9uhcBX3bQXTeuWVC9Yh8WUuHKJ2Wdgii88JZ4hIIUHw==";
-    };
-    dependencies = [
-      sources."asn1-0.2.6"
-      sources."assert-plus-0.2.0"
-      sources."backoff-2.4.1"
-      sources."balanced-match-1.0.2"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."bigspinner-3.1.0"
-      sources."brace-expansion-1.1.11"
-      sources."bunyan-1.8.12"
-      sources."clone-0.1.5"
-      (sources."cmdln-4.1.2" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-          sources."extsprintf-1.4.1"
-        ];
-      })
-      sources."concat-map-0.0.1"
-      sources."core-util-is-1.0.3"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."dtrace-provider-0.8.8"
-      sources."ecc-jsbn-0.1.2"
-      sources."extsprintf-1.0.2"
-      sources."fast-safe-stringify-1.2.3"
-      sources."fuzzyset.js-0.0.1"
-      (sources."getpass-0.1.6" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."glob-5.0.15"
-      (sources."http-signature-1.3.6" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-          sources."extsprintf-1.3.0"
-          sources."json-schema-0.4.0"
-          sources."jsprim-2.0.2"
-        ];
-      })
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."is-absolute-0.1.7"
-      sources."is-relative-0.1.3"
-      sources."isarray-1.0.0"
-      sources."isexe-1.1.2"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.2.3"
-      (sources."jsprim-1.4.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-          sources."verror-1.3.6"
-        ];
-      })
-      sources."keep-alive-agent-0.0.1"
-      sources."lodash-4.17.21"
-      (sources."lomstream-1.1.0" // {
-        dependencies = [
-          sources."assert-plus-0.1.5"
-          sources."extsprintf-1.3.0"
-        ];
-      })
-      sources."lru-cache-4.1.5"
-      sources."lstream-0.0.4"
-      sources."mime-1.6.0"
-      sources."minimatch-3.1.2"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."moment-2.29.4"
-      sources."mooremachine-2.3.0"
-      sources."mute-stream-0.0.8"
-      sources."mv-2.1.1"
-      sources."nan-2.17.0"
-      sources."ncp-2.0.0"
-      sources."once-1.3.2"
-      sources."path-is-absolute-1.0.1"
-      sources."precond-0.2.3"
-      sources."process-nextick-args-2.0.1"
-      sources."pseudomap-1.0.2"
-      sources."read-1.0.7"
-      (sources."readable-stream-2.3.8" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
-      (sources."restify-clients-1.5.2" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-          (sources."restify-errors-3.1.0" // {
-            dependencies = [
-              sources."assert-plus-0.2.0"
-              sources."lodash-3.10.1"
-            ];
-          })
-        ];
-      })
-      (sources."restify-errors-3.0.0" // {
-        dependencies = [
-          sources."assert-plus-0.1.5"
-          sources."lodash-3.10.1"
-        ];
-      })
-      sources."rimraf-2.4.4"
-      sources."safe-buffer-5.2.1"
-      sources."safe-json-stringify-1.2.0"
-      sources."safer-buffer-2.1.2"
-      sources."semver-5.1.0"
-      (sources."smartdc-auth-2.5.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-          (sources."dashdash-1.10.1" // {
-            dependencies = [
-              sources."assert-plus-0.1.5"
-            ];
-          })
-          sources."extsprintf-1.0.0"
-          sources."json-schema-0.2.2"
-          (sources."jsprim-0.3.0" // {
-            dependencies = [
-              sources."verror-1.3.3"
-            ];
-          })
-          sources."once-1.3.0"
-          sources."vasync-1.4.3"
-          sources."verror-1.1.0"
-        ];
-      })
-      (sources."sshpk-1.17.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      (sources."sshpk-agent-1.7.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-          sources."sshpk-1.14.2"
-        ];
-      })
-      (sources."string_decoder-1.1.1" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
-      sources."strsplit-1.0.0"
-      (sources."tabula-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."util-deprecate-1.0.2"
-      sources."uuid-3.4.0"
-      (sources."vasync-1.6.3" // {
-        dependencies = [
-          sources."extsprintf-1.2.0"
-          sources."verror-1.6.0"
-        ];
-      })
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-          sources."core-util-is-1.0.2"
-          sources."extsprintf-1.4.1"
-        ];
-      })
-      (sources."vstream-0.1.0" // {
-        dependencies = [
-          sources."assert-plus-0.1.5"
-          sources."extsprintf-1.2.0"
-        ];
-      })
-      (sources."watershed-0.3.4" // {
-        dependencies = [
-          sources."readable-stream-1.0.2"
-        ];
-      })
-      sources."which-1.2.4"
-      sources."wordwrap-1.0.0"
-      sources."wrappy-1.0.2"
-      sources."yallist-2.1.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Triton CLI and client (https://www.tritondatacenter.com/)";
-      homepage = "https://github.com/TritonDataCenter/node-triton";
-      license = "MPL-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   tsun = nodeEnv.buildNodePackage {
     name = "tsun";
     packageName = "tsun";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 11ab1f8b54759..d31262267ab36 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -560,14 +560,6 @@ final: prev: {
     '';
   };
 
-  triton = prev.triton.override (oldAttrs: {
-    nativeBuildInputs = [ pkgs.installShellFiles ];
-    postInstall = ''
-      installShellCompletion --cmd triton --bash <($out/bin/triton completion)
-    '';
-    meta = oldAttrs.meta // { maintainers = with lib.maintainers; [ teutat3s ]; };
-  });
-
   ts-node = prev.ts-node.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postInstall = ''
diff --git a/pkgs/tools/admin/triton/default.nix b/pkgs/tools/admin/triton/default.nix
new file mode 100644
index 0000000000000..d5841e924571d
--- /dev/null
+++ b/pkgs/tools/admin/triton/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+, installShellFiles
+, testers
+, triton
+}:
+
+buildNpmPackage rec {
+  pname = "triton";
+  version = "7.15.4";
+
+  src = fetchFromGitHub {
+    owner = "TritonDataCenter";
+    repo = "node-triton";
+    rev = version;
+    hash = "sha256-RjYJT8Iw9JZzvd2d9zh2CS27qUx12nDi12k+YuTh7tk=";
+  };
+
+  npmDepsHash = "sha256-2ZTTgJ4LzmlfFoNNNPrrmna5pbREshdw5x9w5N7nasc=";
+
+  dontBuild = true;
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --cmd triton --bash <($out/bin/triton completion)
+    # Strip timestamp from generated bash completion
+    sed -i '/Bash completion generated.*/d' $out/share/bash-completion/completions/triton.bash
+  '';
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = triton;
+    };
+  };
+
+  meta = with lib; {
+    description = "TritonDataCenter Client CLI and Node.js SDK";
+    homepage = "https://github.com/TritonDataCenter/node-triton";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ teutat3s ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dcf2ad74bee1..4dd79b54eacaa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13080,7 +13080,7 @@ with pkgs;
 
   trickle = callPackage ../tools/networking/trickle { };
 
-  inherit (nodePackages) triton;
+  triton = callPackage ../tools/admin/triton { };
 
   triggerhappy = callPackage ../tools/inputmethods/triggerhappy { };
 
-- 
cgit 1.4.1