From 123c9259dba849ac5e62174edc39f95934b546dc Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 17 Oct 2023 00:51:42 +0200 Subject: [PATCH] perlPackages.MHonArc: remove merged patch --- pkgs/development/perl-modules/mhonarc.patch | 26 --------------------- pkgs/top-level/perl-packages.nix | 2 -- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/development/perl-modules/mhonarc.patch diff --git a/pkgs/development/perl-modules/mhonarc.patch b/pkgs/development/perl-modules/mhonarc.patch deleted file mode 100644 index 12b8cc2931b6..000000000000 --- a/pkgs/development/perl-modules/mhonarc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lib/mhamain.pl b/lib/mhamain.pl -index 80980a2..c1259ce 100644 ---- a/lib/mhamain.pl -+++ b/lib/mhamain.pl -@@ -1562,7 +1562,7 @@ sub signal_catch { - ## - sub defineIndex2MsgId { - no warnings qw(deprecated); -- if (!defined(%Index2MsgId)) { -+ unless (%Index2MsgId) { - foreach (keys %MsgId) { - $Index2MsgId{$MsgId{$_}} = $_; - } -diff --git a/lib/mhopt.pl b/lib/mhopt.pl -index 02fb05e..939109b 100644 ---- a/lib/mhopt.pl -+++ b/lib/mhopt.pl -@@ -865,7 +865,7 @@ sub update_data_1_to_2 { - sub update_data_2_1_to_later { - no warnings qw(deprecated); - # we can preserve filter arguments -- if (defined(%main::MIMEFiltersArgs)) { -+ if (%main::MIMEFiltersArgs) { - warn qq/ preserving MIMEARGS...\n/; - %readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs; - $IsDefault{'MIMEARGS'} = 0; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a49b271ff2bf..aa38cc902c52 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15422,8 +15422,6 @@ with self; { hash = "sha256-RX3HN07lnLdaBynlHO8vLFK0gYD3Odj9lW6hmIKBXzM="; }; - patches = [ ../development/perl-modules/mhonarc.patch ]; - outputs = [ "out" "dev" ]; # no "devdoc" installTargets = [ "install" ];