diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix index 2412935a0f9d..38698638b155 100644 --- a/pkgs/by-name/ma/marp-cli/package.nix +++ b/pkgs/by-name/ma/marp-cli/package.nix @@ -1,69 +1,26 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchYarnDeps -, makeWrapper -, nodejs -, fixup-yarn-lock -, yarn +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs, }: -stdenv.mkDerivation (finalAttrs: { +buildNpmPackage rec { pname = "marp-cli"; - version = "3.4.0"; + version = "4.0.3"; src = fetchFromGitHub { owner = "marp-team"; - repo = "marp-cli"; - rev = "v${finalAttrs.version}"; - hash = "sha256-azscuPkQ9/xcQtBg+5pJigXSQQVtBGvbd7ZwiLwU7Qo="; + repo = pname; + rev = "v${version}"; + hash = "sha256-HiLhFRQBCrDqMDX04gI7KolphA1ogTxdj1ehpL1D9e4="; }; - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-b/JyhsfXEbmM6+ajrjL65WhX9u9MEH+m1NHE6cTyf2g="; - }; + npmDepsHash = "sha256-8IN3MJBtq3Nu4T/WMcvg9QnckyigYhItBoGoSYOImTY="; + npmPackFlags = [ "--ignore-scripts" ]; + makeCacheWritable = true; - nativeBuildInputs = [ - makeWrapper - nodejs - fixup-yarn-lock - yarn - ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror $offlineCache - fixup-yarn-lock yarn.lock - yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - yarn --offline --production install - - mkdir -p $out/lib/node_modules/@marp-team/marp-cli - cp -r lib node_modules marp-cli.js $out/lib/node_modules/@marp-team/marp-cli/ - - makeWrapper "${nodejs}/bin/node" "$out/bin/marp" \ - --add-flags "$out/lib/node_modules/@marp-team/marp-cli/marp-cli.js" - - runHook postInstall - ''; + doCheck = false; meta = with lib; { description = "About A CLI interface for Marp and Marpit based converters"; @@ -73,4 +30,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = nodejs.meta.platforms; mainProgram = "marp"; }; -}) +}