From a1ca4295d228d4d3fcd1095c2d021030ca4468c7 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 16 Dec 2025 07:45:22 +0100 Subject: [PATCH 1/4] imapsync: 2.290 -> 2.314 --- pkgs/by-name/im/imapsync/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/im/imapsync/package.nix b/pkgs/by-name/im/imapsync/package.nix index 580650d4856f..6c0a5c452f3d 100644 --- a/pkgs/by-name/im/imapsync/package.nix +++ b/pkgs/by-name/im/imapsync/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "imapsync"; - version = "2.290"; + version = "2.314"; src = fetchurl { url = "https://imapsync.lamiral.info/dist/old_releases/${finalAttrs.version}/imapsync-${finalAttrs.version}.tgz"; - hash = "sha256-uFhTxnaUDP793isfpF/7T8d4AnXDL4uN6zU8igY+EFE="; + hash = "sha256-NOFxXGWEiJ/zvZwKzC+rJURGKCvtqQyOWnGoOzpZ28o="; }; postPatch = '' @@ -33,9 +33,12 @@ stdenv.mkDerivation (finalAttrs: { CryptOpenSSLRSA DataUniqid DistCheckConflicts + EmailAddress EncodeIMAPUTF7 FileCopyRecursive FileTail + HTTPDaemon + HTTPDaemonSSL IOSocketINET6 IOTee JSONWebToken @@ -43,8 +46,9 @@ stdenv.mkDerivation (finalAttrs: { MailIMAPClient ModuleImplementation ModuleScanDeps - NetServer NTLM + NetDNS + NetServer PackageStash PackageStashXS ProcProcessTable From 595b1ca3557430487ea694cb5efbbe2ded2e34c6 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 16 Dec 2025 07:46:08 +0100 Subject: [PATCH 2/4] imapsync: cleanup --- pkgs/by-name/im/imapsync/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/im/imapsync/package.nix b/pkgs/by-name/im/imapsync/package.nix index 6c0a5c452f3d..43ccee9bac56 100644 --- a/pkgs/by-name/im/imapsync/package.nix +++ b/pkgs/by-name/im/imapsync/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i -e s@/usr@$out@ Makefile - substituteInPlace INSTALL.d/prerequisites_imapsync --replace "PAR::Packer" "" + substituteInPlace INSTALL.d/prerequisites_imapsync --replace-fail "PAR::Packer" "" ''; postInstall = '' @@ -68,13 +68,13 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Mail folder synchronizer between IMAP servers"; - mainProgram = "imapsync"; - homepage = "https://imapsync.lamiral.info/"; + homepage = "https://imapsync.lamiral.info"; license = lib.licenses.nlpl; maintainers = with lib.maintainers; [ pSub motiejus ]; platforms = lib.platforms.unix; + mainProgram = "imapsync"; }; }) From 1073df0a44c31d38873b22e7cc07b46b4a1461d4 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 16 Dec 2025 08:10:24 +0100 Subject: [PATCH 3/4] perlPackages.HTTPDaemonSSL: init at 1.05-01-5 --- pkgs/top-level/perl-packages.nix | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c463614fe75d..928ca6933439 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16601,6 +16601,52 @@ with self; }; }; + HTTPDaemonSSL = buildPerlPackage { + pname = "HTTP-Daemon-SSL"; + version = "1.05-01-5"; + src = fetchurl { + url = "https://salsa.debian.org/perl-team/modules/packages/libhttp-daemon-ssl-perl/-/archive/debian/1.05-01-5/libhttp-daemon-ssl-perl-debian-1.05-01-5.tar.gz"; + hash = "sha256-2J4W3SAPgktQ8N+CTSm9fddaUlfzq074sj14fe5zHVc="; + }; + patches = [ + # Several Debian patches to fix test suite + # https://sources.debian.org/patches/libhttp-daemon-ssl-perl/1.05-01-5/ + (fetchpatch2 { + name = "testmodule.diff"; + url = "https://sources.debian.org/data/main/libh/libhttp-daemon-ssl-perl/1.05-01-5/debian/patches/testmodule.diff"; + hash = "sha256-pVPtQLlMYr7Bm8QprJbCyfY+6SyZ/v7uuqvX3k/GnGs="; + }) + (fetchpatch2 { + name = "testpost.diff"; + url = "https://sources.debian.org/data/main/libh/libhttp-daemon-ssl-perl/1.05-01-5/debian/patches/testpost.diff"; + hash = "sha256-clI4u2uYGPow8k3YjnjQFam5IK/xlW8SsJvJ/pwMm4o="; + }) + (fetchpatch2 { + name = "IO-Socket-SSL_2.078.patch"; + url = "https://sources.debian.org/data/main/libh/libhttp-daemon-ssl-perl/1.05-01-5/debian/patches/IO-Socket-SSL_2.078.patch"; + hash = "sha256-EoZPj7mlDm+KKAuXTdIhlyWAFjG9H8tqeZj42ZwV4no="; + }) + (fetchpatch2 { + name = "IO-Socket-SSL_2.079.patch"; + url = "https://sources.debian.org/data/main/libh/libhttp-daemon-ssl-perl/1.05-01-5/debian/patches/IO-Socket-SSL_2.079.patch"; + hash = "sha256-xT533707i+ZCn1/qDZJU/oW8j+Sk8WWbIPulddJPb1w="; + }) + ]; + propagatedBuildInputs = [ + HTTPDaemon + IOSocketSSL + ]; + __darwinAllowLocalNetworking = true; + meta = { + description = "Simple http server class with SSL support"; + homepage = "https://github.com/aufflick/p5-http-daemon-ssl"; + license = with lib.licenses; [ + artistic1 + gpl1Plus + ]; + }; + }; + HTTPDate = buildPerlPackage { pname = "HTTP-Date"; version = "6.06"; From 017b7574fcc010b7ee7deccc5f1d6a5179639153 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 5 Feb 2026 14:06:12 +0100 Subject: [PATCH 4/4] imapsync: add missing procps dependency --- pkgs/by-name/im/imapsync/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/im/imapsync/package.nix b/pkgs/by-name/im/imapsync/package.nix index 43ccee9bac56..fb90b09245f1 100644 --- a/pkgs/by-name/im/imapsync/package.nix +++ b/pkgs/by-name/im/imapsync/package.nix @@ -5,6 +5,7 @@ perl, perlPackages, stdenv, + procps, }: stdenv.mkDerivation (finalAttrs: { @@ -22,7 +23,9 @@ stdenv.mkDerivation (finalAttrs: { ''; postInstall = '' - wrapProgram $out/bin/imapsync --set PERL5LIB $PERL5LIB + wrapProgram $out/bin/imapsync \ + --set PERL5LIB $PERL5LIB \ + --prefix PATH : ${lib.makeBinPath [ procps ]} ''; nativeBuildInputs = [ makeWrapper ];