From 27a724e7e6e366cb93ea905996d89313a8bb4660 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 7 Jul 2026 12:15:00 +0200
Subject: [PATCH 1/2] remark42: switch to pnpm_9

pnpm_10 and later do not support the old lockfile format used by remark42.

A future version will be compatible with pnpm 10 at least: https://github.com/umputun/remark42/commit/f5ccfaa0e1f6f9107ad1e21bcc3ef56cba192595

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 5f7a35a9b36bfc2a6d41a568bb797e46bd237abd)
---
 pkgs/by-name/re/remark42/package.nix | 42 +++++++++++++++++++---------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/re/remark42/package.nix b/pkgs/by-name/re/remark42/package.nix
index df1192589b50..c461a9aae6d5 100644
--- a/pkgs/by-name/re/remark42/package.nix
+++ b/pkgs/by-name/re/remark42/package.nix
@@ -3,14 +3,15 @@
   stdenv,
   fetchFromGitHub,
   buildGoModule,
-  nodejs_22,
-  pnpm_8,
+  nodejs-slim_22,
+  pnpm_9,
   fetchPnpmDeps,
   pnpmConfigHook,
   testers,
 }:
 
 let
+  pnpm = pnpm_9.override { nodejs-slim = nodejs-slim_22; };
   version = "1.15.0";
 
   src = fetchFromGitHub {
@@ -26,34 +27,49 @@ let
 
     strictDeps = true;
 
-    pnpmRoot = "frontend";
+    sourceRoot = "${src.name}/frontend";
 
     nativeBuildInputs = [
-      nodejs_22
-      pnpm_8
+      nodejs-slim_22
+      pnpm
       pnpmConfigHook
     ];
 
     pnpmDeps = fetchPnpmDeps {
-      inherit (finalAttrs) pname version src;
-      sourceRoot = "${finalAttrs.src.name}/frontend";
-      pnpm = pnpm_8;
-      fetcherVersion = 3;
-      hash = "sha256-E2tUZXhcufuztXS+Z//uZk9omvaPrevNbGqVd41Lwhw=";
+      inherit (finalAttrs)
+        pname
+        version
+        src
+        sourceRoot
+        postPatch
+        ;
+      inherit pnpm;
+      fetcherVersion = 4;
+      hash = "sha256-wFrMoSeD87H1yfMD0jBcw60DKDeh4yjka5aWyHuQssA=";
     };
 
+    postPatch = ''
+      substituteInPlace "package.json" "apps/remark42/package.json" \
+        --replace-fail "pnpm@8.15.9" "pnpm@${pnpm.version}"
+
+      substituteInPlace "apps/remark42/package.json" \
+        --replace-fail '"pnpm": "8.*"' '"pnpm": "9.*"'
+    '';
+
     buildPhase = ''
       runHook preBuild
-      pushd "$pnpmRoot"
+
       pnpm --filter ./apps/remark42 --fail-if-no-match run build
-      popd
+
       runHook postBuild
     '';
 
     installPhase = ''
       runHook preInstall
+
       mkdir -p $out/web
-      cp -r "$pnpmRoot/apps/remark42/public/." $out/web/
+      cp -r "apps/remark42/public/." $out/web/
+
       runHook postInstall
     '';
   });

From 8bcf0630a65bfef2b6f78f4d2448b11acee8b5d3 Mon Sep 17 00:00:00 2001
From: Adam Thompson-Sharpe <adamthompsonsharpe@gmail.com>
Date: Fri, 10 Jul 2026 17:27:39 -0400
Subject: [PATCH 2/2] remark42: 1.15.0 -> 1.16.4

Changelog: https://github.com/umputun/remark42/releases/tag/v1.16.4

pnpm is updated from 8 to 10, and the `fetcherVersion` is also bumped to
4.

(cherry picked from commit 0539f5c7852fc3b94db14306026328095e965acb)
---
 pkgs/by-name/re/remark42/package.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/re/remark42/package.nix b/pkgs/by-name/re/remark42/package.nix
index c461a9aae6d5..56db00447ff8 100644
--- a/pkgs/by-name/re/remark42/package.nix
+++ b/pkgs/by-name/re/remark42/package.nix
@@ -4,21 +4,21 @@
   fetchFromGitHub,
   buildGoModule,
   nodejs-slim_22,
-  pnpm_9,
+  pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
   testers,
 }:
 
 let
-  pnpm = pnpm_9.override { nodejs-slim = nodejs-slim_22; };
-  version = "1.15.0";
+  pnpm = pnpm_10.override { nodejs-slim = nodejs-slim_22; };
+  version = "1.16.4";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "remark42";
     tag = "v${version}";
-    hash = "sha256-yd/qTRSZj0nZpgK77xP+XHyHcVXlNpyMzdfj6EbVcXQ=";
+    hash = "sha256-VCFpN/8GRziD7sKVw7jK33llo0AGqygW4ghHZxrluJc=";
   };
 
   remark42-web = stdenv.mkDerivation (finalAttrs: {
@@ -41,21 +41,12 @@ let
         version
         src
         sourceRoot
-        postPatch
         ;
       inherit pnpm;
       fetcherVersion = 4;
-      hash = "sha256-wFrMoSeD87H1yfMD0jBcw60DKDeh4yjka5aWyHuQssA=";
+      hash = "sha256-PInNiI8hcXzQoYWtHUy6BTQKgII7rHzlbSGFc+ixz7k=";
     };
 
-    postPatch = ''
-      substituteInPlace "package.json" "apps/remark42/package.json" \
-        --replace-fail "pnpm@8.15.9" "pnpm@${pnpm.version}"
-
-      substituteInPlace "apps/remark42/package.json" \
-        --replace-fail '"pnpm": "8.*"' '"pnpm": "9.*"'
-    '';
-
     buildPhase = ''
       runHook preBuild