From 66408991dd3bd99aebcab382af6411eaa9df298c Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 27 Jul 2024 01:30:46 +0200 Subject: [PATCH 1/4] remind: 05.00.01 -> 05.00.02 --- pkgs/tools/misc/remind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 51448931dcfb..27f245538989 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -9,11 +9,11 @@ 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 ]; From 12b1282cf018bf1846b042745a3316cb7cf39526 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 27 Jul 2024 01:31:48 +0200 Subject: [PATCH 2/4] remind: migrate to pkgs/by-name --- .../misc/remind/default.nix => by-name/re/remind/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/remind/default.nix => by-name/re/remind/package.nix} (100%) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/by-name/re/remind/package.nix similarity index 100% rename from pkgs/tools/misc/remind/default.nix rename to pkgs/by-name/re/remind/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 187656fbb959..6fe4a7cd0f49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12215,8 +12215,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 { }; From a6996cbbeb05b66ff231880125ca95f0fbcf24b1 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 27 Jul 2024 01:50:11 +0200 Subject: [PATCH 3/4] remind: format using nixfmt --- pkgs/by-name/re/remind/package.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 27f245538989..4847c32c0cc8 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchurl -, tk -, tcllib -, tcl -, tkremind ? true +{ + lib, + stdenv, + fetchurl, + tk, + tcllib, + tcl, + tkremind ? true, }: tcl.mkTclDerivation rec { @@ -16,7 +17,10 @@ tcl.mkTclDerivation rec { hash = "sha256-XxVjAV3TGDPI8XaFXXSminsMffq8m8ljw68YMIC2lYg="; }; - propagatedBuildInputs = lib.optionals tkremind [ tcllib tk ]; + propagatedBuildInputs = lib.optionals tkremind [ + tcllib + tk + ]; postPatch = lib.optionalString tkremind '' # NOTA BENE: The path to rem2pdf is replaced in tkremind for future use @@ -42,7 +46,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; }; From 9470e164c9c3272a1789868948ab896b278ee161 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 27 Jul 2024 01:51:16 +0200 Subject: [PATCH 4/4] remind: modernize --- pkgs/by-name/re/remind/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 4847c32c0cc8..52d4336e7006 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -5,7 +5,12 @@ tk, tcllib, tcl, - tkremind ? true, + 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 { @@ -17,20 +22,20 @@ tcl.mkTclDerivation rec { hash = "sha256-XxVjAV3TGDPI8XaFXXSminsMffq8m8ljw68YMIC2lYg="; }; - propagatedBuildInputs = lib.optionals tkremind [ + 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 [