Merge pull request #250269 from dotlambda/hsd-buildNpmPackage

hsd: use buildNpmPackage

pkgs/development/node-packages/aliases.nix

@@ -71,6 +71,8 @@ mapAliases {
   inherit (pkgs) gqlint; # added 2023-08-19
   inherit (pkgs) graphqurl; # added 2023-08-19
   gtop = pkgs.gtop; # added 2023-07-31
+  hs-client = pkgs.hsd; # added 2023-08-20
+  inherit (pkgs) hsd; # added 2023-08-19
   inherit (pkgs) html-minifier; # added 2023-08-19
   inherit (pkgs) htmlhint; # added 2023-08-19
   hueadm = pkgs.hueadm; # added 2023-07-31

pkgs/development/node-packages/node-packages.json

@@ -143,9 +143,7 @@
 , "gulp-cli"
 , "he"
 , "http-server"
-, "hsd"
 , "hs-airdrop"
-, "hs-client"
 , "ijavascript"
 , "inliner"
 , "imapnotify"

pkgs/development/node-packages/node-packages.nix

@@ -90797,71 +90797,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  hsd = nodeEnv.buildNodePackage {
-    name = "hsd";
-    packageName = "hsd";
-    version = "6.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/hsd/-/hsd-6.0.0.tgz";
-      sha512 = "pl57FtFzrzL2jSsiOru/WvHLlhZuwM+wskme/d6S96tpj5kOmp8zJaNsZ9bpXZBIawtrM6+hZvRaNvE4pegbLg==";
-    };
-    dependencies = [
-      sources."bcfg-0.2.1"
-      (sources."bcrypto-5.4.0" // {
-        dependencies = [
-          sources."bufio-1.0.7"
-        ];
-      })
-      sources."bcurl-0.2.0"
-      sources."bdb-1.4.0"
-      sources."bdns-0.1.5"
-      sources."bevent-0.1.5"
-      sources."bfile-0.2.3"
-      (sources."bfilter-1.0.5" // {
-        dependencies = [
-          sources."bufio-1.0.7"
-        ];
-      })
-      sources."bheep-0.1.5"
-      sources."binet-0.3.7"
-      sources."blgr-0.2.0"
-      sources."blru-0.1.6"
-      sources."blst-0.1.5"
-      sources."bmutex-0.1.6"
-      (sources."bns-0.15.0" // {
-        dependencies = [
-          sources."bufio-1.0.7"
-        ];
-      })
-      sources."brq-0.1.8"
-      sources."bs32-0.1.6"
-      sources."bsert-0.0.12"
-      sources."bsock-0.1.9"
-      sources."bsocks-0.2.6"
-      sources."btcp-0.1.5"
-      sources."budp-0.1.6"
-      sources."buffer-map-0.0.7"
-      sources."bufio-1.2.0"
-      sources."bupnp-0.2.6"
-      sources."bval-0.1.8"
-      sources."bweb-0.2.0"
-      sources."goosig-0.10.0"
-      sources."loady-0.0.5"
-      sources."mrmr-0.1.10"
-      sources."n64-0.2.10"
-      sources."unbound-0.4.3"
-      sources."urkel-1.0.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Cryptocurrency bike-shed";
-      homepage = "https://github.com/handshake-org/hsd";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   hs-airdrop = nodeEnv.buildNodePackage {
     name = "hs-airdrop";
     packageName = "hs-airdrop";
@@ -90889,31 +90824,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  hs-client = nodeEnv.buildNodePackage {
-    name = "hs-client";
-    packageName = "hs-client";
-    version = "6.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/hs-client/-/hs-client-6.0.0.tgz";
-      sha512 = "zjAOSyMeDtzGpOmIg+GPgZ+D/3CHtswSSn0C1CJUcHL3goPr9Tmc5ZpBxQeFkwkAys3RADWPfxiWNcL8nvDCtQ==";
-    };
-    dependencies = [
-      sources."bcfg-0.2.1"
-      sources."bcurl-0.2.0"
-      sources."brq-0.1.8"
-      sources."bsert-0.0.12"
-      sources."bsock-0.1.9"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "HSD node and wallet client";
-      homepage = "https://github.com/handshake-org/hsd";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   ijavascript = nodeEnv.buildNodePackage {
     name = "ijavascript";
     packageName = "ijavascript";

pkgs/development/node-packages/overrides.nix

@@ -118,9 +118,6 @@ final: prev: {
     '';
   };
 
-  hsd = prev.hsd.override {
-    buildInputs = [ final.node-gyp-build pkgs.unbound ];
-  };
 
   ijavascript = prev.ijavascript.override (oldAttrs: {
     preRebuild = ''

pkgs/tools/misc/hsd/default.nix

@@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, buildNpmPackage
+, fetchFromGitHub
+, python3
+, unbound
+, darwin
+}:
+
+buildNpmPackage rec {
+  pname = "hsd";
+  version = "6.0.0";
+
+  src = fetchFromGitHub {
+    owner = "handshake-org";
+    repo = "hsd";
+    rev = "v${version}";
+    hash = "sha256-4dWCCybhcdrkLFqUVTajRMnhzNgjpXUN2a+TNIi+Dqo=";
+  };
+
+  npmDepsHash = "sha256-ZbBu9hnRsC9LrHozny3OlHhgcDbp6ACjXRV4UHneHQc=";
+
+  nativeBuildInputs = [
+    python3
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.cctools
+  ];
+
+  buildInputs = [
+    unbound
+  ];
+
+  dontNpmBuild = true;
+
+  meta = {
+    changelog = "https://github.com/handshake-org/hsd/blob/${src.rev}/CHANGELOG.md";
+    description = "Implementation of the Handshake protocol";
+    homepage = "https://github.com/handshake-org/hsd";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ d-xo ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -1833,6 +1833,8 @@ with pkgs;
 
   hostmux = callPackage ../tools/misc/hostmux { };
 
+  hsd = callPackage ../tools/misc/hsd { };
+
   httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };
 
   hyperpotamus = callPackage ../tools/misc/hyperpotamus { };