Unverified Commit 4ea508a1 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

nmh: 1.7.1 -> 1.8 (#392408)

parents eddaa222 d2a3e5e0

pkgs/by-name/nm/nmh/package.nix

+13 −4
Original line number Diff line number Diff line
@@ -14,25 +14,27 @@ 
  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=";

  };



  patches = [ ./reproducible-build-date.patch ];



  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 +59,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/";

pkgs/by-name/nm/nmh/reproducible-build-date.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
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";