From 8b75ef3a6897f3eed71b9b423cf5f04a63ba9216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 30 Jul 2023 22:36:50 -0700 Subject: [PATCH] castnow: use buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 426 ------------------ pkgs/development/node-packages/overrides.nix | 9 - pkgs/tools/networking/castnow/default.nix | 27 ++ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 29 insertions(+), 437 deletions(-) create mode 100644 pkgs/tools/networking/castnow/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index aef00f677cc3..69df27640b20 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -46,6 +46,7 @@ mapAliases { 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 + castnow = pkgs.castnow; # added 2023-07-30 eslint_d = pkgs.eslint_d; # Added 2023-05-26 flood = pkgs.flood; # Added 2023-07-25 gtop = pkgs.gtop; # added 2023-07-31 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3ba587e27d5c..9f0b07e0ab3a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -43,7 +43,6 @@ , "browserify" , "browser-sync" , "btc-rpc-explorer" -, "castnow" , "carbon-now-cli" , "carto" , "cdk8s-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 680595413c63..9bf6bd86a5bc 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -93683,432 +93683,6 @@ in bypassCache = true; reconstructLock = true; }; - castnow = nodeEnv.buildNodePackage { - name = "castnow"; - packageName = "castnow"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/castnow/-/castnow-0.6.0.tgz"; - sha512 = "VybZ8QYuJyJHt88TIi12nxsIO/89vmcM1Trna0bTq5O2uzz5SDBE2piU+x87B85V4woosyw9T45f39CZzYjxAw=="; - }; - dependencies = [ - sources."@protobufjs/aspromise-1.1.2" - sources."@protobufjs/base64-1.1.2" - sources."@protobufjs/codegen-2.0.4" - sources."@protobufjs/eventemitter-1.1.0" - sources."@protobufjs/fetch-1.1.0" - sources."@protobufjs/float-1.0.2" - sources."@protobufjs/inquire-1.1.0" - sources."@protobufjs/path-1.1.2" - sources."@protobufjs/pool-1.1.0" - sources."@protobufjs/utf8-1.1.0" - sources."@types/long-4.0.2" - sources."@types/node-20.4.5" - sources."@xmldom/xmldom-0.8.10" - sources."addr-to-ip-port-1.5.4" - sources."airplay-js-0.2.16" - sources."ajv-6.12.6" - sources."ansi-regex-1.1.1" - sources."ansi-styles-2.2.1" - sources."append-0.1.1" - sources."array-find-0.1.1" - sources."array-find-index-1.0.2" - sources."array-loop-1.0.0" - sources."array-shuffle-1.0.1" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" - sources."bencode-2.0.3" - sources."bep53-range-1.1.1" - sources."bitfield-0.1.0" - (sources."bittorrent-dht-6.4.2" // { - dependencies = [ - sources."bencode-0.7.0" - ]; - }) - (sources."bittorrent-tracker-7.7.0" // { - dependencies = [ - sources."bencode-0.8.0" - ]; - }) - sources."blob-to-buffer-1.2.9" - sources."bn.js-4.12.0" - sources."bncode-0.5.3" - sources."brace-expansion-1.1.11" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-equal-0.0.1" - sources."buffer-equals-1.0.4" - sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.2" - sources."camelcase-2.1.1" - sources."camelcase-keys-2.1.0" - sources."caseless-0.12.0" - (sources."castv2-0.1.10" // { - dependencies = [ - sources."debug-4.3.4" - ]; - }) - sources."castv2-client-1.2.0" - sources."chalk-1.0.0" - sources."chrome-dgram-3.0.6" - sources."chrome-dns-1.0.1" - sources."chrome-net-3.3.4" - sources."chromecast-player-0.2.3" - sources."chromecast-scanner-0.5.0" - sources."cli-width-1.1.1" - sources."clivas-0.1.4" - sources."co-3.1.0" - sources."codepage-1.4.0" - sources."combined-stream-1.0.8" - sources."commander-11.0.0" - sources."compact2string-1.4.1" - sources."concat-map-0.0.1" - (sources."concat-stream-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - sources."string_decoder-1.3.0" - ]; - }) - sources."core-util-is-1.0.3" - sources."currently-unhandled-0.4.1" - sources."cyclist-0.1.1" - sources."dashdash-1.14.1" - sources."debounced-seeker-1.0.0" - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."decamelize-1.2.0" - sources."decompress-response-3.3.0" - sources."deep-extend-0.2.11" - sources."delayed-stream-1.0.0" - sources."diveSync-0.3.0" - sources."dns-js-0.2.1" - sources."ecc-jsbn-0.1.2" - (sources."end-of-stream-1.0.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) - sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - sources."events-3.3.0" - sources."exit-on-epipe-1.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."fifo-0.1.4" - (sources."figures-1.7.0" // { - dependencies = [ - sources."object-assign-4.1.1" - ]; - }) - sources."find-up-1.1.2" - sources."flatten-0.0.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - (sources."fs-chunk-store-1.7.0" // { - dependencies = [ - sources."mkdirp-0.5.6" - sources."thunky-1.1.0" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-browser-rtc-1.1.0" - sources."get-stdin-4.0.1" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."got-1.2.2" - sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-1.0.3" - sources."has-ansi-1.0.3" - sources."hat-0.0.3" - sources."hosted-git-info-2.8.9" - sources."http-signature-1.2.0" - sources."immediate-chunk-store-1.0.8" - sources."indent-string-2.1.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.1.0" - sources."inquirer-0.8.5" - sources."internal-ip-1.2.0" - sources."ip-1.1.8" - sources."ip-set-1.0.2" - sources."ipaddr.js-2.1.0" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.12.1" - sources."is-finite-1.1.0" - sources."is-typedarray-1.0.0" - sources."is-utf8-0.2.1" - sources."isarray-0.0.1" - sources."isstream-0.1.2" - 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."k-bucket-0.6.0" - (sources."k-rpc-3.7.0" // { - dependencies = [ - sources."k-bucket-2.0.1" - ]; - }) - sources."k-rpc-socket-1.11.1" - sources."keypress-0.2.1" - sources."load-json-file-1.1.0" - sources."lodash-3.10.1" - sources."long-4.0.0" - sources."loud-rejection-1.6.0" - sources."lru-2.0.1" - sources."magnet-uri-5.4.0" - sources."map-obj-1.0.1" - (sources."mdns-js-1.0.3" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - sources."semver-5.4.1" - ]; - }) - (sources."meow-3.7.0" // { - dependencies = [ - sources."object-assign-4.1.1" - ]; - }) - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.3.5" - sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" - sources."multicast-dns-4.0.1" - sources."mutate.js-0.2.0" - sources."mute-stream-0.0.4" - sources."network-address-0.0.5" - sources."normalize-package-data-2.5.0" - sources."numeral-1.5.6" - sources."oauth-sign-0.9.0" - sources."object-assign-1.0.0" - sources."once-1.4.0" - sources."open-0.0.5" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) - sources."options-0.0.6" - sources."pad-0.0.5" - sources."parse-json-2.2.0" - (sources."parse-torrent-5.9.1" // { - dependencies = [ - sources."get-stdin-6.0.0" - ]; - }) - (sources."parse-torrent-file-2.1.4" // { - dependencies = [ - sources."bencode-0.7.0" - ]; - }) - sources."path-exists-2.1.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."path-type-1.1.0" - (sources."peer-wire-protocol-0.7.1" // { - dependencies = [ - sources."bncode-0.2.3" - ]; - }) - sources."peer-wire-swarm-0.12.2" - sources."peerflix-0.34.0" - sources."performance-now-2.1.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - (sources."playerui-1.3.0" // { - dependencies = [ - sources."ansi-regex-0.2.1" - sources."ansi-styles-1.1.0" - sources."chalk-0.5.1" - sources."has-ansi-0.1.0" - sources."strip-ansi-0.3.0" - sources."supports-color-0.2.0" - ]; - }) - sources."plist-3.1.0" - sources."process-nextick-args-2.0.1" - sources."promiscuous-0.6.0" - sources."protobufjs-6.11.3" - sources."psl-1.9.0" - (sources."pump-0.3.5" // { - dependencies = [ - sources."once-1.2.0" - ]; - }) - sources."punycode-2.3.0" - sources."qap-3.3.1" - sources."qs-6.5.3" - sources."query-string-1.0.1" - sources."queue-microtask-1.2.3" - sources."queue-tick-1.0.1" - sources."random-access-file-2.2.1" - sources."random-access-storage-1.4.3" - sources."random-iterate-1.0.1" - sources."randombytes-2.1.0" - sources."range-parser-1.2.1" - (sources."rc-0.4.0" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) - sources."re-emitter-1.1.4" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - (sources."read-torrent-1.3.1" // { - dependencies = [ - sources."magnet-uri-2.0.1" - (sources."parse-torrent-4.1.0" // { - dependencies = [ - sources."magnet-uri-4.2.3" - ]; - }) - sources."thirty-two-0.0.2" - ]; - }) - sources."readable-stream-1.1.14" - sources."readline2-0.1.1" - sources."redent-1.0.0" - sources."repeating-2.0.1" - sources."request-2.88.2" - sources."resolve-1.22.3" - sources."rimraf-2.7.1" - sources."router-0.6.2" - sources."run-parallel-1.2.0" - sources."run-series-1.1.9" - sources."rusha-0.8.14" - sources."rx-2.5.3" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."semver-5.7.2" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-2.8.2" - (sources."simple-peer-6.4.4" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."simple-sha1-2.1.2" - (sources."simple-websocket-4.3.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - (sources."ws-2.3.1" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) - ]; - }) - sources."single-line-log-0.4.1" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - sources."speedometer-0.1.4" - sources."srt2vtt-1.3.1" - sources."sshpk-1.17.0" - sources."stream-transcoder-0.0.5" - sources."string2compact-1.3.2" - sources."string_decoder-0.10.31" - sources."strip-ansi-2.0.1" - sources."strip-bom-2.0.0" - sources."strip-indent-1.0.1" - sources."strip-json-comments-0.1.3" - sources."supports-color-1.3.1" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."thirty-two-1.0.2" - sources."through-2.3.8" - sources."thunky-0.1.0" - sources."time-line-1.0.1" - sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.2" - (sources."torrent-stream-1.2.1" // { - dependencies = [ - sources."end-of-stream-0.1.5" - sources."magnet-uri-4.2.3" - sources."once-1.3.3" - sources."parse-torrent-4.1.0" - sources."thirty-two-0.0.2" - ]; - }) - sources."tough-cookie-2.5.0" - sources."trim-newlines-1.0.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."typedarray-0.0.6" - sources."ultron-1.1.1" - sources."underscore-1.6.0" - sources."uniq-1.0.1" - sources."uri-js-4.4.1" - sources."utfx-1.0.1" - sources."util-deprecate-1.0.2" - sources."utp-0.0.7" - sources."uuid-3.4.0" - sources."validate-npm-package-license-3.0.4" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - sources."voc-1.2.0" - sources."ware-1.3.0" - sources."windows-no-runnable-0.0.6" - sources."wordwrap-0.0.3" - sources."wrap-fn-0.1.5" - sources."wrappy-1.0.2" - (sources."ws-1.1.5" // { - dependencies = [ - sources."ultron-1.0.2" - ]; - }) - (sources."xml2js-0.4.23" // { - dependencies = [ - sources."xmlbuilder-11.0.1" - ]; - }) - sources."xmlbuilder-15.1.1" - sources."xspfr-0.3.1" - sources."xtend-4.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "commandline chromecast player"; - homepage = "https://github.com/xat/castnow#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; carbon-now-cli = nodeEnv.buildNodePackage { name = "carbon-now-cli"; packageName = "carbon-now-cli"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index fd7237406765..c32ce3868047 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -112,15 +112,6 @@ final: prev: { meta = oldAttrs.meta // { broken = since "12"; }; }); - castnow = prev.castnow.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; - - postInstall = '' - wrapProgram "$out/bin/castnow" \ - --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.ffmpeg ]} - ''; - }; - eask = prev."@emacs-eask/cli".override { name = "eask"; }; diff --git a/pkgs/tools/networking/castnow/default.nix b/pkgs/tools/networking/castnow/default.nix new file mode 100644 index 000000000000..43a15a2c1c10 --- /dev/null +++ b/pkgs/tools/networking/castnow/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "castnow"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "xat"; + repo = "castnow"; + rev = "v${version}"; + hash = "sha256-vAjeDPH+Lu/vj3GhwytXqpbSkg5hKpXsMRNV+8TUeio="; + }; + + npmDepsHash = "sha256-1cLuti3JHpMHn1sno8gE8Ko+eoUWCqFUfIDIBAS+M34="; + + dontNpmBuild = true; + + meta = { + description = "Command-line Chromecast player"; + homepage = "commandline chromecast player"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b2b5ef643f7..a278d47e976e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3459,7 +3459,7 @@ with pkgs; calls = callPackage ../applications/networking/calls { }; - inherit (nodePackages) castnow; + castnow = callPackage ../tools/networking/castnow { }; castty = callPackage ../tools/misc/castty { };