Unverified Commit a6b0b744 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #246377 from dotlambda/reveal-md-buildNpmPackage 

reveal-md: use buildNpmPackage
parents 3d3162f0 d02af47f

pkgs/development/node-packages/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ mapAliases { 
  gtop = pkgs.gtop; # added 2023-07-31

  manta = pkgs.node-manta; # Added 2023-05-06

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

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

  thelounge = pkgs.thelounge; # Added 2023-05-22

  triton = pkgs.triton; # Added 2023-05-06

  typescript = pkgs.typescript; # Added 2023-06-21

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

+0 −1
Original line number Diff line number Diff line
@@ -271,7 +271,6 @@ 
, "redoc-cli"

, "remod-cli"

, "reveal.js"

, "reveal-md"

, "rimraf"

, "rollup"

, {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"}

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

+0 −309
Original line number Diff line number Diff line
@@ -132209,315 +132209,6 @@ in 
    bypassCache = true;

    reconstructLock = true;

  };

  reveal-md = nodeEnv.buildNodePackage {

    name = "reveal-md";

    packageName = "reveal-md";

    version = "5.5.1";

    src = fetchurl {

      url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.5.1.tgz";

      sha512 = "6M2jSP4HHEWKRmaeB7Sc7oyUffUL98NVeg9Z8mquJFBZqjBXdL39Du8RCrKgN31XwI8oiLaFs5jRiUzJnQiaTA==";

    };

    dependencies = [

      sources."@sindresorhus/is-0.14.0"

      sources."@szmarczak/http-timer-1.1.2"

      sources."accepts-1.3.8"

      sources."agent-base-4.3.0"

      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-1.0.10"

      sources."array-flatten-1.1.1"

      sources."async-limiter-1.0.1"

      sources."balanced-match-1.0.2"

      sources."binary-extensions-2.2.0"

      (sources."body-parser-1.20.1" // {

        dependencies = [

          sources."debug-2.6.9"

          sources."ms-2.0.0"

        ];

      })

      sources."boxen-5.1.2"

      sources."brace-expansion-2.0.1"

      sources."braces-3.0.2"

      sources."buffer-crc32-0.2.13"

      sources."buffer-from-1.1.2"

      sources."bufferutil-4.0.7"

      sources."bytes-3.1.2"

      (sources."cacheable-request-6.1.0" // {

        dependencies = [

          sources."get-stream-5.2.0"

          sources."lowercase-keys-2.0.0"

        ];

      })

      sources."call-bind-1.0.2"

      sources."camelcase-6.3.0"

      sources."chalk-4.1.2"

      sources."chokidar-3.5.3"

      sources."ci-info-2.0.0"

      sources."cli-boxes-2.2.1"

      sources."clone-response-1.0.3"

      sources."color-convert-2.0.1"

      sources."color-name-1.1.4"

      sources."commander-6.2.1"

      sources."concat-map-0.0.1"

      sources."concat-stream-1.6.2"

      sources."configstore-5.0.1"

      sources."content-disposition-0.5.4"

      sources."content-type-1.0.5"

      sources."cookie-0.5.0"

      sources."cookie-signature-1.0.6"

      sources."core-util-is-1.0.3"

      sources."crypto-random-string-2.0.0"

      sources."debug-4.3.4"

      sources."decompress-response-3.3.0"

      sources."deep-extend-0.6.0"

      sources."defer-to-connect-1.1.3"

      sources."define-lazy-prop-2.0.0"

      sources."depd-2.0.0"

      sources."destroy-1.2.0"

      sources."dot-prop-5.3.0"

      sources."duplexer3-0.1.5"

      sources."ee-first-1.1.1"

      sources."emoji-regex-8.0.0"

      sources."encodeurl-1.0.2"

      sources."end-of-stream-1.4.4"

      sources."es6-promise-4.2.8"

      sources."es6-promisify-5.0.0"

      sources."escape-goat-2.1.1"

      sources."escape-html-1.0.3"

      sources."esprima-4.0.1"

      sources."etag-1.8.1"

      (sources."express-4.18.2" // {

        dependencies = [

          sources."debug-2.6.9"

          sources."ms-2.0.0"

        ];

      })

      (sources."extract-zip-1.7.0" // {

        dependencies = [

          sources."debug-2.6.9"

          sources."ms-2.0.0"

        ];

      })

      sources."fd-slicer-1.1.0"

      sources."fill-range-7.0.1"

      (sources."finalhandler-1.2.0" // {

        dependencies = [

          sources."debug-2.6.9"

          sources."ms-2.0.0"

        ];

      })

      sources."forwarded-0.2.0"

      sources."fresh-0.5.2"

      sources."fs-extra-11.1.1"

      sources."fs.realpath-1.0.0"

      sources."fsevents-2.3.2"

      sources."function-bind-1.1.1"

      sources."get-intrinsic-1.2.1"

      sources."get-stream-4.1.0"

      sources."glob-8.1.0"

      sources."glob-parent-5.1.2"

      sources."global-dirs-3.0.1"

      sources."got-9.6.0"

      sources."graceful-fs-4.2.11"

      sources."has-1.0.3"

      sources."has-flag-4.0.0"

      sources."has-proto-1.0.1"

      sources."has-symbols-1.0.3"

      sources."has-yarn-2.1.0"

      sources."highlight.js-11.8.0"

      sources."http-cache-semantics-4.1.1"

      sources."http-errors-2.0.0"

      (sources."https-proxy-agent-2.2.4" // {

        dependencies = [

          sources."debug-3.2.7"

        ];

      })

      sources."iconv-lite-0.4.24"

      sources."import-lazy-2.1.0"

      sources."imurmurhash-0.1.4"

      sources."inflight-1.0.6"

      sources."inherits-2.0.4"

      sources."ini-2.0.0"

      sources."ipaddr.js-1.9.1"

      sources."is-binary-path-2.1.0"

      sources."is-ci-2.0.0"

      sources."is-docker-2.2.1"

      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-npm-5.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-wsl-2.2.0"

      sources."is-yarn-global-0.3.0"

      sources."isarray-1.0.0"

      sources."js-yaml-3.14.1"

      sources."json-buffer-3.0.0"

      sources."jsonfile-6.1.0"

      sources."keyv-3.1.0"

      sources."latest-version-5.1.0"

      sources."livereload-0.9.3"

      sources."livereload-js-3.4.1"

      sources."lodash-4.17.21"

      sources."lowercase-keys-1.0.1"

      sources."lru-cache-6.0.0"

      (sources."make-dir-3.1.0" // {

        dependencies = [

          sources."semver-6.3.1"

        ];

      })

      sources."media-typer-0.3.0"

      sources."merge-descriptors-1.0.1"

      sources."methods-1.1.2"

      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-5.1.6"

      sources."minimist-1.2.8"

      sources."mkdirp-0.5.6"

      sources."ms-2.1.2"

      sources."mustache-4.2.0"

      sources."negotiator-0.6.3"

      sources."node-gyp-build-4.6.0"

      sources."normalize-path-3.0.0"

      sources."normalize-url-4.5.1"

      sources."object-inspect-1.12.3"

      sources."on-finished-2.4.1"

      sources."once-1.4.0"

      sources."open-8.4.2"

      sources."opts-2.0.2"

      sources."p-cancelable-1.1.0"

      (sources."package-json-6.5.0" // {

        dependencies = [

          sources."semver-6.3.1"

        ];

      })

      sources."parseurl-1.3.3"

      sources."path-is-absolute-1.0.1"

      sources."path-to-regexp-0.1.7"

      sources."pend-1.2.0"

      sources."picomatch-2.3.1"

      sources."prepend-http-2.0.0"

      sources."process-nextick-args-2.0.1"

      sources."progress-2.0.3"

      sources."proxy-addr-2.0.7"

      sources."proxy-from-env-1.1.0"

      sources."pump-3.0.0"

      sources."pupa-2.1.1"

      (sources."puppeteer-1.20.0" // {

        dependencies = [

          sources."mime-2.6.0"

          sources."ws-6.2.2"

        ];

      })

      sources."qs-6.11.0"

      sources."range-parser-1.2.1"

      sources."raw-body-2.5.1"

      (sources."rc-1.2.8" // {

        dependencies = [

          sources."ini-1.3.8"

        ];

      })

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

        dependencies = [

          sources."safe-buffer-5.1.2"

        ];

      })

      sources."readdirp-3.6.0"

      sources."registry-auth-token-4.2.2"

      sources."registry-url-5.1.0"

      sources."responselike-1.0.2"

      sources."reveal.js-4.5.0"

      (sources."rimraf-2.7.1" // {

        dependencies = [

          sources."brace-expansion-1.1.11"

          sources."glob-7.2.3"

          sources."minimatch-3.1.2"

        ];

      })

      sources."safe-buffer-5.2.1"

      sources."safer-buffer-2.1.2"

      sources."semver-7.5.4"

      (sources."semver-diff-3.1.1" // {

        dependencies = [

          sources."semver-6.3.1"

        ];

      })

      (sources."send-0.18.0" // {

        dependencies = [

          (sources."debug-2.6.9" // {

            dependencies = [

              sources."ms-2.0.0"

            ];

          })

          sources."ms-2.1.3"

        ];

      })

      (sources."serve-favicon-2.5.0" // {

        dependencies = [

          sources."ms-2.1.1"

          sources."safe-buffer-5.1.1"

        ];

      })

      sources."serve-static-1.15.0"

      sources."setprototypeof-1.2.0"

      sources."side-channel-1.0.4"

      sources."signal-exit-3.0.7"

      sources."sprintf-js-1.0.3"

      sources."statuses-2.0.1"

      sources."string-width-4.2.3"

      (sources."string_decoder-1.1.1" // {

        dependencies = [

          sources."safe-buffer-5.1.2"

        ];

      })

      sources."strip-ansi-6.0.1"

      sources."strip-json-comments-2.0.1"

      sources."supports-color-7.2.0"

      sources."to-readable-stream-1.0.0"

      sources."to-regex-range-5.0.1"

      sources."toidentifier-1.0.1"

      sources."try-require-1.2.1"

      sources."type-fest-0.20.2"

      sources."type-is-1.6.18"

      sources."typedarray-0.0.6"

      sources."typedarray-to-buffer-3.1.5"

      sources."unique-string-2.0.0"

      sources."universalify-2.0.0"

      sources."unpipe-1.0.0"

      sources."update-notifier-5.1.0"

      sources."url-parse-lax-3.0.0"

      sources."utf-8-validate-5.0.10"

      sources."util-deprecate-1.0.2"

      sources."utils-merge-1.0.1"

      sources."vary-1.1.2"

      sources."widest-line-3.1.0"

      sources."wrap-ansi-7.0.0"

      sources."wrappy-1.0.2"

      sources."write-file-atomic-3.0.3"

      sources."ws-7.5.9"

      sources."xdg-basedir-4.0.0"

      sources."yallist-4.0.0"

      sources."yaml-front-matter-4.1.1"

      sources."yargs-parser-21.1.1"

      sources."yauzl-2.10.0"

    ];

    buildInputs = globalBuildInputs;

    meta = {

      description = "reveal.js on steroids! Get beautiful reveal.js presentations from your Markdown files.";

      homepage = "https://github.com/webpro/reveal-md#readme";

      license = "MIT";

    };

    production = true;

    bypassCache = true;

    reconstructLock = true;

  };

  rimraf = nodeEnv.buildNodePackage {

    name = "rimraf";

    packageName = "rimraf";

pkgs/development/node-packages/overrides.nix

+0 −13
Original line number Diff line number Diff line
@@ -416,19 +416,6 @@ final: prev: { 
    '';

  };



  reveal-md = prev.reveal-md.override (

    lib.optionalAttrs (!stdenv.isDarwin) {

      nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];

      prePatch = ''

        export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1

      '';

      postInstall = ''

        wrapProgram $out/bin/reveal-md \

        --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium

      '';

    }

  );



  rush = prev."@microsoft/rush".override {

    name = "rush";

  };

pkgs/tools/text/reveal-md/default.nix

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

, buildNpmPackage

, fetchFromGitHub

}:



buildNpmPackage rec {

  pname = "reveal-md";

  version = "5.5.1";



  src = fetchFromGitHub {

    owner = "webpro";

    repo = "reveal-md";

    rev = version;

    hash = "sha256-BlUZsETMdOmnz+OFGQhQ9aLHxIIAZ12X1ipy3u59zxo=";

  };



  npmDepsHash = "sha256-xaDBB16egGi8zThHRrhcN8TVf6Nqkx8fkbxWqvJwJb4=";



  env = {

    PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true;

  };



  dontNpmBuild = true;



  doCheck = true;



  checkPhase = ''

    runHook preCheck



    npm run test



    runHook postCheck

  '';



  meta = {

    description = "Get beautiful reveal.js presentations from your Markdown files";

    homepage = "https://github.com/webpro/reveal-md";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ sagikazarmark ];

  };

}