From 86b469a7d0a44dc87e6870ffb40784ab3999c796 Mon Sep 17 00:00:00 2001
From: Guillaume Desforges <guillaume.desforges.pro@gmail.com>
Date: Fri, 1 Nov 2024 19:29:30 +0100
Subject: [PATCH 1/2] marp-cli: 3.4.0 -> 4.0.0

---
 pkgs/by-name/ma/marp-cli/package.nix | 73 ++++++----------------------
 1 file changed, 15 insertions(+), 58 deletions(-)

diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix
index 2412935a0f9d..f323f207530a 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.0";
 
   src = fetchFromGitHub {
     owner = "marp-team";
-    repo = "marp-cli";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-azscuPkQ9/xcQtBg+5pJigXSQQVtBGvbd7ZwiLwU7Qo=";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-K638HwDOfHn5WiWqZKQ2r7conPpJi+UM7YpshmItWNU=";
   };
 
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-b/JyhsfXEbmM6+ajrjL65WhX9u9MEH+m1NHE6cTyf2g=";
-  };
+  npmDepsHash = "sha256-sspS4rVRrfOZ6hqRKD4s5DGGjlI9RZcjwn+W0ZPaO8E=";
+  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";
   };
-})
+}

From 98402f0f344d8c544cba129396f58034b9d3927e Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Tue, 10 Dec 2024 21:26:04 +0900
Subject: [PATCH 2/2] marp-cli: 4.0.0 -> 4.0.3

---
 pkgs/by-name/ma/marp-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix
index f323f207530a..38698638b155 100644
--- a/pkgs/by-name/ma/marp-cli/package.nix
+++ b/pkgs/by-name/ma/marp-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "marp-cli";
-  version = "4.0.0";
+  version = "4.0.3";
 
   src = fetchFromGitHub {
     owner = "marp-team";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-K638HwDOfHn5WiWqZKQ2r7conPpJi+UM7YpshmItWNU=";
+    hash = "sha256-HiLhFRQBCrDqMDX04gI7KolphA1ogTxdj1ehpL1D9e4=";
   };
 
-  npmDepsHash = "sha256-sspS4rVRrfOZ6hqRKD4s5DGGjlI9RZcjwn+W0ZPaO8E=";
+  npmDepsHash = "sha256-8IN3MJBtq3Nu4T/WMcvg9QnckyigYhItBoGoSYOImTY=";
   npmPackFlags = [ "--ignore-scripts" ];
   makeCacheWritable = true;