Merge pull request #330300 from afh/update-modernize-remind

remind: 05.00.01 -> 05.00.02

pkgs/by-name/re/remind/package.nix

@@ -1,32 +1,41 @@
-{ lib
-, stdenv
-, fetchurl
-, tk
-, tcllib
-, tcl
-, tkremind ? true
+{
+  lib,
+  stdenv,
+  fetchurl,
+  tk,
+  tcllib,
+  tcl,
+  tkremind ? null,
+  withGui ?
+    if tkremind != null then
+      lib.warn "tkremind is deprecated and should be removed; use withGui instead." tkremind
+    else
+      true,
 }:
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "05.00.01";
+  version = "05.00.02";
 
   src = fetchurl {
     url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
-    hash = "sha256-tj36/lLn67/hkNMrRVGXRLqQ9Sx6oDKZHeajiSYn97c=";
+    hash = "sha256-XxVjAV3TGDPI8XaFXXSminsMffq8m8ljw68YMIC2lYg=";
   };
 
-  propagatedBuildInputs = lib.optionals tkremind [ tcllib tk ];
+  propagatedBuildInputs = lib.optionals withGui [
+    tcllib
+    tk
+  ];
 
-  postPatch = lib.optionalString tkremind ''
+  postPatch = lib.optionalString withGui ''
     # NOTA BENE: The path to rem2pdf is replaced in tkremind for future use
     # as rem2pdf is currently not build since it requires the JSON::MaybeXS,
     # Pango and Cairo Perl modules.
     substituteInPlace scripts/tkremind \
-      --replace-fail "exec wish" "exec ${lib.getBin tk}/bin/wish" \
-      --replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \
-      --replace-fail 'set Rem2PS "rem2ps"' "set Rem2PS \"$out/bin/rem2ps\"" \
-      --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\""
+      --replace-fail "exec wish" "exec ${lib.getExe' tk "wish"}" \
+      --replace-fail 'set Remind "remind"' 'set Remind "$out/bin/remind"' \
+      --replace-fail 'set Rem2PS "rem2ps"' 'set Rem2PS "$out/bin/rem2ps"' \
+      --replace-fail 'set Rem2PDF "rem2pdf"' 'set Rem2PDF "$out/bin/rem2pdf"'
   '';
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [
@@ -42,7 +51,10 @@ tcl.mkTclDerivation rec {
     homepage = "https://dianne.skoll.ca/projects/remind/";
     description = "Sophisticated calendar and alarm program for the console";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ raskin kovirobi ];
+    maintainers = with maintainers; [
+      raskin
+      kovirobi
+    ];
     mainProgram = "remind";
     platforms = platforms.unix;
   };

pkgs/top-level/all-packages.nix

@@ -12209,8 +12209,6 @@ with pkgs;
 
   relic = callPackage ../development/tools/relic { };
 
-  remind = callPackage ../tools/misc/remind { };
-
   remmina = darwin.apple_sdk_11_0.callPackage ../applications/networking/remote/remmina { };
 
   rename = callPackage ../tools/misc/rename { };