fetchmail: add v7 and fix fetchmalconf

pkgs/applications/misc/fetchmail/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openssl }:
+{ lib, stdenv, fetchurl, openssl, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "fetchmail";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-gpVOvSbHeQZGPOIK3KRcvPgGiVdEHheUG9MFKlwVQy4=";
   };
 
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl python3 ];
 
   configureFlags = [ "--with-ssl=${openssl.dev}" ];
 

pkgs/applications/misc/fetchmail/v7.nix

@@ -0,0 +1,37 @@
+{ lib, stdenv, pkgs }:
+
+stdenv.mkDerivation {
+  pname = "fetchmail";
+  version = "unstable-2022-05-26";
+
+  src = pkgs.fetchFromGitLab {
+    owner = "fetchmail";
+    repo = "fetchmail";
+    rev = "30b368fb8660d8fec08be1cdf2606c160b4bcb80";
+    sha256 = "sha256-83D2YlFCODK2YD+oLICdim2NtNkkJU67S3YLi8Q6ga8=";
+  };
+
+  buildInputs = with pkgs; [ openssl python3 ];
+  nativeBuildInputs = with pkgs; [ autoreconfHook pkg-config bison flex ];
+
+  configureFlags = [ "--with-ssl=${pkgs.openssl.dev}" ];
+
+  postInstall = ''
+    cp -a contrib/. $out/share/fetchmail-contrib
+  '';
+
+  meta = with lib; {
+    homepage = "https://www.fetchmail.info/";
+    description = "A full-featured remote-mail retrieval and forwarding utility";
+    longDescription = ''
+      A full-featured, robust, well-documented remote-mail retrieval and
+      forwarding utility intended to be used over on-demand TCP/IP links
+      (such as SLIP or PPP connections). It supports every remote-mail
+      protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP,
+      all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and
+      IPSEC.
+    '';
+    platforms = platforms.unix;
+    license = licenses.gpl2Plus;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -27947,6 +27947,7 @@ with pkgs;
   fehlstart = callPackage ../applications/misc/fehlstart { };
 
   fetchmail = callPackage ../applications/misc/fetchmail { };
+  fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };
 
   ff2mpv = callPackage ../applications/misc/ff2mpv { };