Unverified Commit 7fb1b609 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #254851 from dotlambda/redoc-cli-buildNpmPackage 

redoc-cli: use buildNpmPackage
parents d968d29a 4d4d3bdf

pkgs/development/node-packages/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ mapAliases { 
  inherit (pkgs) quicktype; # added 2023-09-09

  inherit (pkgs) react-static; # added 2023-08-21

  readability-cli = pkgs.readability-cli; # Added 2023-06-12

  inherit (pkgs) redoc-cli; # added 2023-09-12

  reveal-md = pkgs.reveal-md; # added 2023-07-31

  inherit (pkgs) rtlcss; # added 2023-08-29

  s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18

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

+0 −1
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ 
, "pyright"

, "react-native-cli"

, "react-tools"

, "redoc-cli"

, "remod-cli"

, "reveal.js"

, "rimraf"

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

+0 −432
Original line number Diff line number Diff line
@@ -102428,438 +102428,6 @@ in 
    bypassCache = true;

    reconstructLock = true;

  };

  redoc-cli = nodeEnv.buildNodePackage {

    name = "redoc-cli";

    packageName = "redoc-cli";

    version = "0.13.21";

    src = fetchurl {

      url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.21.tgz";

      sha512 = "pjuPf0HkKqo9qtoHxMK4x5dhC/lJ08O0hO0rJISbSRCf19bPBjQ5lb2mHRu9j6vypTMltyaLtFIfVNveuyF5fQ==";

    };

    dependencies = [

      sources."@ampproject/remapping-2.2.1"

      (sources."@babel/code-frame-7.22.10" // {

        dependencies = [

          sources."ansi-styles-3.2.1"

          sources."chalk-2.4.2"

          sources."color-convert-1.9.3"

          sources."color-name-1.1.3"

          sources."has-flag-3.0.0"

          sources."supports-color-5.5.0"

        ];

      })

      sources."@babel/compat-data-7.22.9"

      sources."@babel/core-7.22.10"

      sources."@babel/generator-7.22.10"

      sources."@babel/helper-annotate-as-pure-7.22.5"

      sources."@babel/helper-compilation-targets-7.22.10"

      sources."@babel/helper-environment-visitor-7.22.5"

      sources."@babel/helper-function-name-7.22.5"

      sources."@babel/helper-hoist-variables-7.22.5"

      sources."@babel/helper-module-imports-7.22.5"

      sources."@babel/helper-module-transforms-7.22.9"

      sources."@babel/helper-plugin-utils-7.22.5"

      sources."@babel/helper-simple-access-7.22.5"

      sources."@babel/helper-split-export-declaration-7.22.6"

      sources."@babel/helper-string-parser-7.22.5"

      sources."@babel/helper-validator-identifier-7.22.5"

      sources."@babel/helper-validator-option-7.22.5"

      sources."@babel/helpers-7.22.10"

      (sources."@babel/highlight-7.22.10" // {

        dependencies = [

          sources."ansi-styles-3.2.1"

          sources."chalk-2.4.2"

          sources."color-convert-1.9.3"

          sources."color-name-1.1.3"

          sources."has-flag-3.0.0"

          sources."supports-color-5.5.0"

        ];

      })

      sources."@babel/parser-7.22.10"

      sources."@babel/plugin-syntax-jsx-7.22.5"

      sources."@babel/runtime-7.22.10"

      sources."@babel/template-7.22.5"

      sources."@babel/traverse-7.22.10"

      sources."@babel/types-7.22.10"

      sources."@emotion/is-prop-valid-1.2.1"

      sources."@emotion/memoize-0.8.1"

      sources."@emotion/stylis-0.8.5"

      sources."@emotion/unitless-0.7.5"

      sources."@exodus/schemasafe-1.2.4"

      sources."@jridgewell/gen-mapping-0.3.3"

      sources."@jridgewell/resolve-uri-3.1.1"

      sources."@jridgewell/set-array-1.1.2"

      sources."@jridgewell/source-map-0.3.5"

      sources."@jridgewell/sourcemap-codec-1.4.15"

      sources."@jridgewell/trace-mapping-0.3.19"

      sources."@redocly/ajv-8.11.0"

      sources."@redocly/openapi-core-1.0.2"

      sources."@types/eslint-8.44.2"

      sources."@types/eslint-scope-3.7.4"

      sources."@types/estree-1.0.1"

      sources."@types/json-schema-7.0.12"

      sources."@types/node-14.18.55"

      sources."@webassemblyjs/ast-1.11.6"

      sources."@webassemblyjs/floating-point-hex-parser-1.11.6"

      sources."@webassemblyjs/helper-api-error-1.11.6"

      sources."@webassemblyjs/helper-buffer-1.11.6"

      sources."@webassemblyjs/helper-numbers-1.11.6"

      sources."@webassemblyjs/helper-wasm-bytecode-1.11.6"

      sources."@webassemblyjs/helper-wasm-section-1.11.6"

      sources."@webassemblyjs/ieee754-1.11.6"

      sources."@webassemblyjs/leb128-1.11.6"

      sources."@webassemblyjs/utf8-1.11.6"

      sources."@webassemblyjs/wasm-edit-1.11.6"

      sources."@webassemblyjs/wasm-gen-1.11.6"

      sources."@webassemblyjs/wasm-opt-1.11.6"

      sources."@webassemblyjs/wasm-parser-1.11.6"

      sources."@webassemblyjs/wast-printer-1.11.6"

      sources."@xtuc/ieee754-1.2.0"

      sources."@xtuc/long-4.2.2"

      sources."acorn-8.10.0"

      sources."acorn-import-assertions-1.9.0"

      (sources."ajv-6.12.6" // {

        dependencies = [

          sources."json-schema-traverse-0.4.1"

        ];

      })

      sources."ajv-keywords-3.5.2"

      sources."ansi-align-3.0.1"

      sources."ansi-regex-5.0.1"

      sources."ansi-styles-4.3.0"

      sources."anymatch-3.1.3"

      sources."argparse-2.0.1"

      (sources."asn1.js-5.4.1" // {

        dependencies = [

          sources."bn.js-4.12.0"

        ];

      })

      (sources."assert-1.5.0" // {

        dependencies = [

          sources."util-0.10.3"

        ];

      })

      sources."babel-plugin-styled-components-2.1.4"

      sources."balanced-match-1.0.2"

      sources."base64-js-1.5.1"

      sources."binary-extensions-2.2.0"

      sources."bn.js-5.2.1"

      sources."boxen-5.1.2"

      sources."brace-expansion-2.0.1"

      sources."braces-3.0.2"

      sources."brorand-1.1.0"

      sources."browserify-aes-1.2.0"

      sources."browserify-cipher-1.0.1"

      sources."browserify-des-1.0.2"

      sources."browserify-rsa-4.1.0"

      (sources."browserify-sign-4.2.1" // {

        dependencies = [

          sources."inherits-2.0.4"

          sources."readable-stream-3.6.2"

        ];

      })

      sources."browserify-zlib-0.2.0"

      sources."browserslist-4.21.10"

      sources."buffer-4.9.2"

      sources."buffer-from-1.1.2"

      sources."buffer-xor-1.0.3"

      sources."builtin-status-codes-3.0.0"

      sources."call-bind-1.0.2"

      sources."call-me-maybe-1.0.2"

      sources."camelcase-6.3.0"

      sources."camelize-1.0.1"

      sources."caniuse-lite-1.0.30001522"

      sources."chalk-4.1.2"

      sources."chokidar-3.5.3"

      sources."chrome-trace-event-1.0.3"

      sources."cipher-base-1.0.4"

      sources."classnames-2.3.2"

      sources."cli-boxes-2.2.1"

      sources."cliui-8.0.1"

      sources."clsx-1.2.1"

      sources."color-convert-2.0.1"

      sources."color-name-1.1.4"

      sources."colorette-1.4.0"

      sources."commander-2.20.3"

      sources."console-browserify-1.2.0"

      sources."constants-browserify-1.0.0"

      sources."convert-source-map-1.9.0"

      sources."core-js-3.32.1"

      sources."core-util-is-1.0.3"

      (sources."create-ecdh-4.0.4" // {

        dependencies = [

          sources."bn.js-4.12.0"

        ];

      })

      sources."create-hash-1.2.0"

      sources."create-hmac-1.1.7"

      sources."crypto-browserify-3.12.0"

      sources."css-color-keywords-1.0.0"

      sources."css-to-react-native-3.2.0"

      sources."debug-4.3.4"

      sources."decko-1.2.0"

      sources."des.js-1.1.0"

      (sources."diffie-hellman-5.0.3" // {

        dependencies = [

          sources."bn.js-4.12.0"

        ];

      })

      sources."domain-browser-1.2.0"

      sources."dompurify-2.4.7"

      sources."electron-to-chromium-1.4.499"

      (sources."elliptic-6.5.4" // {

        dependencies = [

          sources."bn.js-4.12.0"

          sources."inherits-2.0.4"

        ];

      })

      sources."emoji-regex-8.0.0"

      sources."encoding-0.1.13"

      sources."enhanced-resolve-5.15.0"

      sources."es-module-lexer-1.3.0"

      sources."es6-promise-3.3.1"

      sources."escalade-3.1.1"

      sources."escape-string-regexp-1.0.5"

      sources."eslint-scope-5.1.1"

      (sources."esrecurse-4.3.0" // {

        dependencies = [

          sources."estraverse-5.3.0"

        ];

      })

      sources."estraverse-4.3.0"

      sources."eventemitter3-4.0.7"

      sources."events-3.3.0"

      sources."evp_bytestokey-1.0.3"

      sources."fast-deep-equal-3.1.3"

      sources."fast-json-stable-stringify-2.1.0"

      sources."fast-safe-stringify-2.1.1"

      sources."fill-range-7.0.1"

      sources."foreach-2.0.6"

      sources."fsevents-2.3.3"

      sources."function-bind-1.1.1"

      sources."gensync-1.0.0-beta.2"

      sources."get-caller-file-2.0.5"

      sources."get-intrinsic-1.2.1"

      sources."glob-parent-5.1.2"

      sources."glob-to-regexp-0.4.1"

      sources."globals-11.12.0"

      sources."graceful-fs-4.2.11"

      sources."handlebars-4.7.8"

      sources."has-1.0.3"

      sources."has-flag-4.0.0"

      sources."has-proto-1.0.1"

      sources."has-symbols-1.0.3"

      (sources."hash-base-3.1.0" // {

        dependencies = [

          sources."inherits-2.0.4"

          sources."readable-stream-3.6.2"

        ];

      })

      (sources."hash.js-1.1.7" // {

        dependencies = [

          sources."inherits-2.0.4"

        ];

      })

      sources."hmac-drbg-1.0.1"

      sources."hoist-non-react-statics-3.3.2"

      sources."http2-client-1.3.5"

      sources."https-browserify-1.0.0"

      sources."iconv-lite-0.6.3"

      sources."ieee754-1.2.1"

      sources."inherits-2.0.1"

      sources."is-binary-path-2.1.0"

      sources."is-extglob-2.1.1"

      sources."is-fullwidth-code-point-3.0.0"

      sources."is-glob-4.0.3"

      sources."is-number-7.0.0"

      sources."isarray-1.0.0"

      (sources."jest-worker-27.5.1" // {

        dependencies = [

          sources."supports-color-8.1.1"

        ];

      })

      sources."js-levenshtein-1.1.6"

      sources."js-tokens-4.0.0"

      sources."js-yaml-4.1.0"

      sources."jsesc-2.5.2"

      sources."json-parse-even-better-errors-2.3.1"

      sources."json-pointer-0.6.2"

      sources."json-schema-traverse-1.0.0"

      sources."json5-2.2.3"

      sources."loader-runner-4.3.0"

      sources."lodash-4.17.21"

      sources."lodash.isequal-4.5.0"

      sources."loose-envify-1.4.0"

      sources."lru-cache-5.1.1"

      sources."lunr-2.3.9"

      sources."mark.js-8.11.1"

      sources."marked-4.3.0"

      sources."md5.js-1.3.5"

      sources."merge-stream-2.0.0"

      (sources."miller-rabin-4.0.1" // {

        dependencies = [

          sources."bn.js-4.12.0"

        ];

      })

      sources."mime-db-1.52.0"

      sources."mime-types-2.1.35"

      sources."minimalistic-assert-1.0.1"

      sources."minimalistic-crypto-utils-1.0.1"

      sources."minimatch-5.1.6"

      sources."minimist-1.2.8"

      sources."mkdirp-1.0.4"

      sources."mobx-6.10.0"

      sources."mobx-react-7.6.0"

      sources."mobx-react-lite-3.4.3"

      sources."ms-2.1.2"

      sources."neo-async-2.6.2"

      sources."node-fetch-2.6.13"

      sources."node-fetch-h2-2.3.0"

      sources."node-libs-browser-2.2.1"

      sources."node-readfiles-0.2.0"

      sources."node-releases-2.0.13"

      sources."normalize-path-3.0.0"

      sources."oas-kit-common-1.0.8"

      sources."oas-linter-3.2.2"

      sources."oas-resolver-2.5.6"

      sources."oas-schema-walker-1.1.5"

      sources."oas-validator-5.0.8"

      sources."object-assign-4.1.1"

      sources."object-inspect-1.12.3"

      sources."openapi-sampler-1.3.1"

      sources."os-browserify-0.3.0"

      sources."pako-1.0.11"

      sources."parse-asn1-5.1.6"

      sources."path-browserify-0.0.1"

      sources."pbkdf2-3.1.2"

      sources."perfect-scrollbar-1.5.5"

      sources."picocolors-1.0.0"

      sources."picomatch-2.3.1"

      sources."pluralize-8.0.0"

      sources."polished-4.2.2"

      sources."postcss-value-parser-4.2.0"

      sources."prismjs-1.29.0"

      sources."process-0.11.10"

      sources."process-nextick-args-2.0.1"

      sources."prop-types-15.8.1"

      (sources."public-encrypt-4.0.3" // {

        dependencies = [

          sources."bn.js-4.12.0"

        ];

      })

      sources."punycode-1.4.1"

      sources."qs-6.11.2"

      sources."querystring-es3-0.2.1"

      sources."randombytes-2.1.0"

      sources."randomfill-1.0.4"

      sources."react-17.0.2"

      sources."react-dom-17.0.2"

      sources."react-is-16.13.1"

      sources."react-tabs-3.2.3"

      (sources."readable-stream-2.3.8" // {

        dependencies = [

          sources."inherits-2.0.4"

          sources."safe-buffer-5.1.2"

          sources."string_decoder-1.1.1"

        ];

      })

      sources."readdirp-3.6.0"

      (sources."redoc-2.0.0" // {

        dependencies = [

          sources."path-browserify-1.0.1"

        ];

      })

      sources."reftools-1.1.9"

      sources."regenerator-runtime-0.14.0"

      sources."require-directory-2.1.1"

      sources."require-from-string-2.0.2"

      sources."ripemd160-2.0.2"

      sources."safe-buffer-5.2.1"

      sources."safer-buffer-2.1.2"

      sources."scheduler-0.20.2"

      sources."schema-utils-3.3.0"

      sources."semver-6.3.1"

      sources."serialize-javascript-6.0.1"

      sources."setimmediate-1.0.5"

      sources."sha.js-2.4.11"

      sources."shallowequal-1.1.0"

      sources."should-13.2.3"

      sources."should-equal-2.0.0"

      sources."should-format-3.0.3"

      sources."should-type-1.4.0"

      sources."should-type-adaptors-1.1.0"

      sources."should-util-1.0.1"

      sources."side-channel-1.0.4"

      sources."slugify-1.4.7"

      sources."source-map-0.6.1"

      sources."source-map-support-0.5.21"

      sources."stickyfill-1.1.1"

      sources."stream-browserify-2.0.2"

      sources."stream-http-2.8.3"

      sources."string-width-4.2.3"

      sources."string_decoder-1.3.0"

      sources."strip-ansi-6.0.1"

      sources."style-loader-3.3.3"

      (sources."styled-components-5.3.11" // {

        dependencies = [

          sources."has-flag-3.0.0"

          sources."supports-color-5.5.0"

        ];

      })

      sources."supports-color-7.2.0"

      sources."swagger2openapi-7.0.8"

      sources."tapable-2.2.1"

      sources."terser-5.19.2"

      sources."terser-webpack-plugin-5.3.9"

      sources."timers-browserify-2.0.12"

      sources."to-arraybuffer-1.0.1"

      sources."to-fast-properties-2.0.0"

      sources."to-regex-range-5.0.1"

      sources."tr46-0.0.3"

      sources."tty-browserify-0.0.0"

      sources."type-fest-0.20.2"

      sources."uglify-js-3.17.4"

      sources."update-browserslist-db-1.0.11"

      (sources."uri-js-4.4.1" // {

        dependencies = [

          sources."punycode-2.3.0"

        ];

      })

      sources."url-0.11.1"

      sources."url-template-2.0.8"

      (sources."util-0.11.1" // {

        dependencies = [

          sources."inherits-2.0.3"

        ];

      })

      sources."util-deprecate-1.0.2"

      sources."vm-browserify-1.1.2"

      sources."watchpack-2.4.0"

      sources."webidl-conversions-3.0.1"

      sources."webpack-5.88.2"

      sources."webpack-sources-3.2.3"

      sources."whatwg-url-5.0.0"

      sources."widest-line-3.1.0"

      sources."wordwrap-1.0.0"

      sources."wrap-ansi-7.0.0"

      sources."xtend-4.0.2"

      sources."y18n-5.0.8"

      sources."yallist-3.1.1"

      sources."yaml-1.10.2"

      sources."yaml-ast-parser-0.0.43"

      sources."yargs-17.7.2"

      sources."yargs-parser-21.1.1"

    ];

    buildInputs = globalBuildInputs;

    meta = {

      description = "ReDoc's Command Line Interface";

      homepage = "https://github.com/Redocly/redoc#readme";

      license = "MIT";

    };

    production = true;

    bypassCache = true;

    reconstructLock = true;

  };

  remod-cli = nodeEnv.buildNodePackage {

    name = "remod-cli";

    packageName = "remod-cli";

pkgs/development/tools/redoc-cli/default.nix

0 → 100644
+34 −0
Original line number Diff line number Diff line 
{ lib

, buildNpmPackage

, fetchFromGitHub

}:



buildNpmPackage rec {

  pname = "redoc-cli";

  version = "0.13.21";



  src = fetchFromGitHub {

    owner = "Redocly";

    repo = "redoc";

    rev = "d3ac16f4774ae5b5f698b4e8f4c1d3f5a009d361";

    hash = "sha256-LmNb+m1Ng/53SPUqrr/AmxNMiWsrMGCKow0DW/9t3Do=";

  };



  sourceRoot = "${src.name}/cli";



  npmDepsHash = "sha256-XL4D7+hb0zOxAr/aRo2UOg4UOip3oewbffsnkFddmWw=";



  postPatch = ''

    ln -s npm-shrinkwrap.json package-lock.json

  '';



  dontNpmBuild = true;



  meta = {

    description = "OpenAPI/Swagger-generated API Reference Documentation";

    homepage = "https://github.com/Redocly/redoc/tree/redoc-cli/cli";

    license = lib.licenses.mit;

    mainProgram = "redoc-cli";

    maintainers = with lib.maintainers; [ veehaitch ];

  };

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -12676,7 +12676,7 @@ with pkgs; 














  recoll = libsForQt5.callPackage ../applications/search/recoll { };



























  redoc-cli = nodePackages.redoc-cli;













  redoc-cli = callPackage ../development/tools/redoc-cli { };





























  reflex = callPackage ../development/tools/reflex { };