diff options
author | Robert Schütz <nix@dotlambda.de> | 2023-09-03 21:17:54 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-03 21:17:54 +0000 |
commit | a14805afa3d0c7565dc84c5e4feffef5942d7b56 (patch) | |
tree | 8fe5b0d734c9d2f3f3562ce2ac6c5f541aa5612e /pkgs/development/node-packages | |
parent | c0ea1684646de9074a7ddb618f46ba56ea090cf3 (diff) | |
parent | f4c5b8747c85b4a8df0bf0f851e931ef55278161 (diff) |
Merge pull request #250269 from dotlambda/hsd-buildNpmPackage
hsd: use buildNpmPackage
Diffstat (limited to 'pkgs/development/node-packages')
-rw-r--r-- | pkgs/development/node-packages/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.json | 2 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.nix | 90 | ||||
-rw-r--r-- | pkgs/development/node-packages/overrides.nix | 3 |
4 files changed, 2 insertions, 95 deletions
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6401f78573f3b..40036cc622bb7 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/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 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6644758d0a1f1..c1715443b9ffc 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -143,9 +143,7 @@ , "gulp-cli" , "he" , "http-server" -, "hsd" , "hs-airdrop" -, "hs-client" , "ijavascript" , "inliner" , "imapnotify" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1dad9ed6f234d..503cfdfdd3186 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/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"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 4b94a320362e9..b6d6aa9e6e385 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/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 = '' |