From 3c17721be9009111c32cd2bc0a1da0fbe79847f4 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 23 Mar 2025 16:02:31 +0100
Subject: [PATCH 1/2] nmh: 1.7.1 -> 1.8

---
 pkgs/by-name/nm/nmh/package.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix
index 0eebc1cb85e0..67ab19a8d460 100644
--- a/pkgs/by-name/nm/nmh/package.nix
+++ b/pkgs/by-name/nm/nmh/package.nix
@@ -14,25 +14,25 @@
   openssl,
   readline,
   runtimeShell,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nmh";
-  version = "1.7.1";
+  version = "1.8";
   src = fetchFromSavannah {
     repo = "nmh";
     rev = finalAttrs.version;
-    hash = "sha256-sBftXl4hWs4bKw5weHkif1KIJBpheU/RCePx0WXuv9o=";
+    hash = "sha256-ShAdinvBA7guVBhjqTelBRiUzyo5KqHcawlQS9kXtqs=";
   };
 
   postPatch = ''
-    substituteInPlace config/config.c --replace /bin/cat ${coreutils}/bin/cat
     substituteInPlace \
       sbr/arglist.c \
       uip/mhbuildsbr.c \
       uip/whatnowsbr.c \
       uip/slocal.c \
-      --replace '"/bin/sh"' '"${runtimeShell}"'
+      --replace-fail '"/bin/sh"' '"${runtimeShell}"'
     # the "cleanup" pseudo-test makes diagnosing test failures a pain
     ln -s -f ${stdenv}/bin/true test/cleanup
   '';
@@ -57,6 +57,13 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
   enableParallelBuilding = true;
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/install-mh";
+  versionCheckProgramArg = "-version";
+
   meta = {
     description = "New MH Mail Handling System";
     homepage = "https://nmh.nongnu.org/";

From d2a3e5e04bb845692025f71b86883cff68ebdf53 Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 23 Mar 2025 16:02:42 +0100
Subject: [PATCH 2/2] nmh: make reproducible

---
 pkgs/by-name/nm/nmh/package.nix                   |  2 ++
 pkgs/by-name/nm/nmh/reproducible-build-date.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/by-name/nm/nmh/reproducible-build-date.patch

diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix
index 67ab19a8d460..61d0c738c694 100644
--- a/pkgs/by-name/nm/nmh/package.nix
+++ b/pkgs/by-name/nm/nmh/package.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ShAdinvBA7guVBhjqTelBRiUzyo5KqHcawlQS9kXtqs=";
   };
 
+  patches = [ ./reproducible-build-date.patch ];
+
   postPatch = ''
     substituteInPlace \
       sbr/arglist.c \
diff --git a/pkgs/by-name/nm/nmh/reproducible-build-date.patch b/pkgs/by-name/nm/nmh/reproducible-build-date.patch
new file mode 100644
index 000000000000..cb28c0a948cf
--- /dev/null
+++ b/pkgs/by-name/nm/nmh/reproducible-build-date.patch
@@ -0,0 +1,15 @@
+Index: config/version.sh
+===================================================================
+--- a/config/version.sh
++++ b/config/version.sh
+@@ -11,9 +11,9 @@
+     git=" `git -C $srcdir describe --long --dirty`"
+ else
+     git=
+ fi
+-date="`TZ=GMT0 date +'%Y-%m-%d %T'` +0000"
++date="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)"
+ 
+ cat <<E
+ char *version_str = "nmh-$version$git built $date on $host";
+ char *version_num = "nmh-$version";