From 20a15c7985768e0b0f7c1a2643e40b4516629569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 22 Aug 2023 18:38:49 -0700 Subject: [PATCH] npm-check-updates: use buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 432 ------------------ .../npm-check-updates/default.nix | 27 ++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 30 insertions(+), 433 deletions(-) create mode 100644 pkgs/tools/package-management/npm-check-updates/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index e3ff0d15396a..e9540a7a1bbc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -80,6 +80,7 @@ mapAliases { inherit (pkgs) markdownlint-cli2; # added 2023-08-22 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) npm-check-updates; # added 2023-08-22 readability-cli = pkgs.readability-cli; # Added 2023-06-12 reveal-md = pkgs.reveal-md; # added 2023-07-31 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c715380e4f2a..899b270aa014 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -204,7 +204,6 @@ , "nodemon" , "np" , "npm" -, "npm-check-updates" , "npm-merge-driver" , "nrm" , "ocaml-language-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 845812fdad5e..1406e47cca73 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -101470,438 +101470,6 @@ in bypassCache = true; reconstructLock = true; }; - npm-check-updates = nodeEnv.buildNodePackage { - name = "npm-check-updates"; - packageName = "npm-check-updates"; - version = "16.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.13.0.tgz"; - sha512 = "zTJCqov2+KpCLM7lOOxXLFiqKg8RLt10dempIbE9EfKCzoN1yqSrDcBCpU6uOmlSRy3IIGm1rK+piCrn+uulJw=="; - }; - dependencies = [ - sources."@colors/colors-1.5.0" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-3.1.0" - (sources."@npmcli/git-4.1.0" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - sources."@npmcli/installed-package-contents-2.0.2" - sources."@npmcli/node-gyp-3.0.0" - (sources."@npmcli/promise-spawn-6.0.2" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - (sources."@npmcli/run-script-6.0.2" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@sigstore/bundle-1.1.0" - sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" - sources."@sigstore/tuf-1.0.3" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - sources."@tufjs/models-1.0.4" - sources."@types/http-cache-semantics-4.0.1" - sources."abbrev-1.1.1" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - sources."ansi-align-3.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" - sources."argparse-2.0.1" - sources."array-union-2.1.0" - sources."balanced-match-1.0.2" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-from-1.1.2" - sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" - sources."camelcase-7.0.1" - sources."chalk-5.3.0" - sources."chownr-2.0.0" - sources."ci-info-3.8.0" - sources."clean-stack-2.2.0" - sources."cli-boxes-3.0.0" - sources."cli-table3-0.6.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."commander-10.0.1" - sources."concat-map-0.0.1" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."configstore-6.0.0" - sources."console-control-strings-1.1.0" - sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."defer-to-connect-2.0.1" - sources."delegates-1.0.0" - sources."dir-glob-3.0.1" - sources."dot-prop-6.0.1" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-8.0.0" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."escape-goat-4.0.0" - sources."exponential-backoff-3.1.1" - sources."fast-glob-3.3.1" - sources."fast-memoize-2.5.2" - sources."fastq-1.15.0" - sources."fill-range-7.0.1" - sources."find-up-5.0.0" - sources."foreground-child-3.1.1" - sources."form-data-encoder-2.1.4" - sources."fp-and-or-0.1.3" - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."get-stdin-8.0.0" - sources."get-stream-6.0.1" - sources."glob-10.3.3" - sources."glob-parent-5.1.2" - (sources."global-dirs-3.0.1" // { - dependencies = [ - sources."ini-2.0.0" - ]; - }) - sources."globby-11.1.0" - sources."got-12.6.1" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-unicode-2.0.1" - sources."has-yarn-3.0.0" - sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."http2-wrapper-2.2.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" - sources."ignore-5.2.4" - sources."ignore-walk-6.0.3" - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-4.1.1" - sources."ip-2.0.0" - sources."is-ci-3.0.1" - sources."is-core-module-2.13.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-lambda-1.0.1" - sources."is-npm-6.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-typedarray-1.0.0" - sources."is-yarn-global-0.4.1" - sources."isexe-2.0.0" - sources."jackspeak-2.3.0" - sources."jju-1.4.0" - sources."js-yaml-4.1.0" - sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-3.0.0" - sources."json-parse-helpfulerror-1.0.3" - sources."json5-2.2.3" - sources."jsonlines-0.1.1" - sources."jsonparse-1.3.1" - sources."keyv-4.5.3" - sources."kleur-4.1.5" - sources."latest-version-7.0.0" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" - sources."lowercase-keys-3.0.0" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-response-4.0.0" - sources."minimatch-9.0.3" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.3" - sources."negotiator-0.6.3" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - sources."rimraf-3.0.2" - ]; - }) - sources."nopt-6.0.0" - (sources."normalize-package-data-5.0.0" // { - dependencies = [ - sources."hosted-git-info-6.1.1" - ]; - }) - sources."normalize-url-8.0.0" - sources."npm-bundled-3.0.0" - sources."npm-install-checks-6.2.0" - sources."npm-normalize-package-bin-3.0.1" - (sources."npm-package-arg-10.1.0" // { - dependencies = [ - sources."hosted-git-info-6.1.1" - ]; - }) - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.2" - sources."npm-registry-fetch-14.0.5" - sources."npmlog-6.0.2" - sources."once-1.4.0" - sources."p-cancelable-3.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-map-4.0.0" - sources."package-json-8.1.1" - sources."pacote-15.2.0" - sources."parse-github-url-1.0.2" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."proc-log-3.0.0" - sources."progress-2.0.3" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."prompts-ncu-3.0.0" - sources."proto-list-1.2.4" - sources."pupa-3.1.0" - sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."rc-config-loader-4.1.3" - sources."read-package-json-6.0.4" - sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.2" - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - sources."remote-git-tags-3.0.0" - sources."require-from-string-2.0.2" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - sources."retry-0.12.0" - sources."reusify-1.0.4" - sources."rimraf-5.0.1" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.2.1" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."semver-diff-4.0.0" - sources."semver-utils-1.1.4" - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."sigstore-1.9.0" - sources."sisteransi-1.0.5" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."spawn-please-2.0.2" - 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."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - sources."strip-json-comments-5.0.1" - (sources."tar-6.1.15" // { - dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - ]; - }) - sources."to-regex-range-5.0.1" - sources."tuf-js-1.1.7" - sources."type-fest-2.19.0" - sources."typedarray-to-buffer-3.1.5" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."unique-string-3.0.0" - sources."untildify-4.0.0" - sources."update-notifier-6.0.2" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.0" - sources."which-2.0.2" - sources."wide-align-1.1.5" - (sources."widest-line-4.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) - sources."wrappy-1.0.2" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."xdg-basedir-5.1.0" - sources."yallist-4.0.0" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Find newer versions of dependencies than what your package.json allows"; - homepage = "https://github.com/raineorshine/npm-check-updates"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; npm-merge-driver = nodeEnv.buildNodePackage { name = "npm-merge-driver"; packageName = "npm-merge-driver"; diff --git a/pkgs/tools/package-management/npm-check-updates/default.nix b/pkgs/tools/package-management/npm-check-updates/default.nix new file mode 100644 index 000000000000..93585593a494 --- /dev/null +++ b/pkgs/tools/package-management/npm-check-updates/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "npm-check-updates"; + version = "16.13.0"; + + src = fetchFromGitHub { + owner = "raineorshine"; + repo = "npm-check-updates"; + rev = "v${version}"; + hash = "sha256-RrNO1TAPNFB/6JWY8xZjNCZ+FDgM0MCn7vaDXoCSIfI="; + }; + + npmDepsHash = "sha256-aghW4d3/8cJmwpmI5PcHioCnc91Yu4N5EfwuoaB5Xqw="; + + meta = { + changelog = "https://github.com/raineorshine/npm-check-updates/blob/${src.rev}/CHANGELOG.md"; + description = "Find newer versions of package dependencies than what your package.json allows"; + homepage = "https://github.com/raineorshine/npm-check-updates"; + license = lib.licenses.asl20; + mainProgram = "ncu"; + maintainers = with lib.maintainers; [ flosse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 292624c41fd3..56100dccf4de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1892,6 +1892,8 @@ with pkgs; nominatim = callPackage ../servers/nominatim { }; + npm-check-updates = callPackage ../tools/package-management/npm-check-updates { }; + ntpd-rs = callPackage ../tools/networking/ntpd-rs { }; ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };