From e0245ba6bb8fec572dcac0c3974c751e0038342e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 30 Jul 2023 21:43:01 -0700 Subject: [PATCH] antennas: use buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 194 ------------------ pkgs/servers/antennas/default.nix | 37 ++++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 39 insertions(+), 196 deletions(-) create mode 100644 pkgs/servers/antennas/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index aef00f677cc3..d76dfa124020 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -43,6 +43,7 @@ mapAliases { "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 + antennas = pkgs.antennas; # added 2023-07-30 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3ba587e27d5c..b050566fda62 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -29,7 +29,6 @@ , {"@webassemblyjs/wast-refmt": "1.11.1"} , "alex" , "alloy" -, "antennas" , "asar" , "audiosprite" , "autoprefixer" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 680595413c63..cd114a5f3cca 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -91210,200 +91210,6 @@ in bypassCache = true; reconstructLock = true; }; - antennas = nodeEnv.buildNodePackage { - name = "antennas"; - packageName = "antennas"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/antennas/-/antennas-4.2.0.tgz"; - sha512 = "jnGXyVBWZ2X6Fd//dEWmcrcjzt60sFSEN+sJniDNvOMkBJ+NyoNmS1hVxG4LLfK/vZ/tOCXqniw8yq9b/QaC+w=="; - }; - dependencies = [ - sources."accepts-1.3.8" - sources."ajv-6.12.6" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."any-promise-1.3.0" - sources."argparse-1.0.10" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-2.6.4" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."axios-0.24.0" - sources."axios-digest-0.3.0" - sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.7.2" - sources."bytes-3.1.2" - sources."cache-content-type-1.0.1" - sources."caseless-0.12.0" - sources."chalk-2.4.2" - sources."cliui-8.0.1" - sources."co-4.6.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."combined-stream-1.0.8" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookies-0.8.0" - sources."core-util-is-1.0.2" - sources."dashdash-1.14.1" - sources."debug-4.3.4" - sources."deep-equal-1.0.1" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."follow-redirects-1.15.2" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fresh-0.5.2" - sources."get-caller-file-2.0.5" - sources."getpass-0.1.7" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-flag-3.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."http-assert-1.5.0" - (sources."http-errors-1.8.1" // { - dependencies = [ - sources."depd-1.1.2" - ]; - }) - sources."http-signature-1.2.0" - sources."humanize-number-0.0.2" - sources."inherits-2.0.4" - sources."ip-1.1.8" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-typedarray-1.0.0" - sources."isarray-0.0.1" - sources."isstream-0.1.2" - sources."js-md5-0.7.3" - sources."js-sha256-0.9.0" - sources."js-sha512-0.8.0" - sources."js-yaml-3.14.1" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.2" - sources."keygrip-1.1.0" - sources."koa-2.14.2" - sources."koa-compose-4.2.0" - sources."koa-convert-2.0.0" - sources."koa-logger-3.2.1" - sources."koa-request-1.0.0" - (sources."koa-router-7.4.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."koa-compose-3.2.1" - ]; - }) - (sources."koa-send-4.1.3" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - (sources."koa-static-4.0.3" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."lodash-4.17.21" - sources."media-typer-0.3.0" - sources."methods-1.1.2" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."ms-2.1.2" - sources."mz-2.7.0" - sources."negotiator-0.6.3" - (sources."node-ssdp-3.3.0" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."on-finished-2.4.1" - sources."only-0.0.2" - sources."parseurl-1.3.3" - sources."passthrough-counter-1.0.0" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-1.8.0" - sources."performance-now-2.1.0" - sources."psl-1.9.0" - sources."punycode-2.3.0" - sources."qs-6.5.3" - sources."request-2.88.2" - sources."require-directory-2.1.1" - (sources."resolve-path-1.4.0" // { - dependencies = [ - sources."depd-1.1.2" - sources."http-errors-1.6.3" - sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."setprototypeof-1.2.0" - sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" - sources."statuses-1.5.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."supports-color-5.5.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."toidentifier-1.0.1" - sources."tough-cookie-2.5.0" - sources."tsscmp-1.0.6" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."uri-js-4.4.1" - sources."urijs-1.19.11" - sources."uuid-3.4.0" - sources."vary-1.1.2" - sources."verror-1.10.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - sources."ylru-1.3.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "HDHomeRun emulator for Plex DVR to connect to Tvheadend."; - homepage = "https://github.com/jfarseneau/antennas#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; diff --git a/pkgs/servers/antennas/default.nix b/pkgs/servers/antennas/default.nix new file mode 100644 index 000000000000..c381cde64879 --- /dev/null +++ b/pkgs/servers/antennas/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "antennas"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "jfarseneau"; + repo = "antennas"; + rev = "v${version}"; + hash = "sha256-UQ+wvm7+x/evmtGwzCkUkrrDMCIZzUL4iSkLmYKJ3Mc="; + }; + + npmDepsHash = "sha256-D5ss7nCDY3ogZy64iFqLVKbmibAg7C/A+rEHJaE9c2U="; + + dontNpmBuild = true; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + npm run test + + runHook postCheck + ''; + + meta = { + description = "HDHomeRun emulator for Plex DVR to connect to Tvheadend"; + homepage = "https://github.com/jfarseneau/antennas"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bachp ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b2b5ef643f7..0d773fce2796 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3362,7 +3362,7 @@ with pkgs; httpServer = true; }; - antennas = nodePackages.antennas; + antennas = callPackage ../servers/antennas { }; apg = callPackage ../tools/security/apg { };