Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1878a249e9f2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f8fd80bfc680
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 7, 2019

  1. perlPackages.MHonArc: 2.6.18 -> 2.6.19 

    Needs a patch before it'll run, but it didn't run before and might as
well be updated before it's patched.
    @alyssais
    alyssais committed Sep 7, 2019
    Copy the full SHA
    5198699 View commit details

  2. perlPackages.MHonArc: fix build

    @alyssais
    alyssais committed Sep 7, 2019
    Copy the full SHA
    cd714e7 View commit details

  3. perlPackages.MHonArc: update metadata and style

    @alyssais
    alyssais committed Sep 7, 2019
    Copy the full SHA
    fffe5f5 View commit details

  4. mhonarc: add top-level path to perlPackages.MHonArc 

    Since MHonArc is a program, not a library, it makes sense to expose it
on the top level, in lowercase, like other programs.
    @alyssais
    alyssais committed Sep 7, 2019
    Copy the full SHA
    f8fd80b View commit details
Showing with 37 additions and 6 deletions.
  1. +26 −0 pkgs/development/perl-modules/mhonarc.patch
  2. +2 −0 pkgs/top-level/all-packages.nix
  3. +9 −6 pkgs/top-level/perl-packages.nix
26 changes: 26 additions & 0 deletions pkgs/development/perl-modules/mhonarc.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
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;
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4327,6 +4327,8 @@ in

memtester = callPackage ../tools/system/memtester { };

mhonarc = perlPackages.MHonArc;

minergate = callPackage ../applications/misc/minergate { };

minergate-cli = callPackage ../applications/misc/minergate-cli { };
15 changes: 9 additions & 6 deletions pkgs/top-level/perl-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -10661,23 +10661,26 @@ let
};
};

MHonArc = buildPerlPackage {
MHonArc = buildPerlPackage rec {
pname = "MHonArc";
version = "2.6.18";
version = "2.6.19";

src = fetchurl {
url = "http://dcssrv1.oit.uci.edu/indiv/ehood/release/MHonArc/tar/MHonArc-2.6.18.tar.gz";
sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2";
url = "https://www.mhonarc.org/release/MHonArc/tar/MHonArc-${version}.tar.gz";
sha256 = "0ll3v93yji334zqp6xfzfxc0127pmjcznmai1l5q6dzawrs2igzq";
};

patches = [ ../development/perl-modules/mhonarc.patch ];

outputs = [ "out" "dev" ]; # no "devdoc"

installTargets = "install";

meta = with stdenv.lib; {
homepage = http://dcssrv1.oit.uci.edu/indiv/ehood/mhonarch.html;
homepage = "https://www.mhonarc.org/";
description = "A mail-to-HTML converter";
maintainers = with maintainers; [ lovek323 ];
license = licenses.gpl2;
license = licenses.gpl2;
};
};