From b961b7312af6e4b891f67fad381c1b5cbd457a4a Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Sun, 26 Jan 2025 08:47:45 +0100
Subject: [PATCH 01/11] opensmtpd.table-ldap: init at 1.0

The opensmtpd-extra package has been deprecated in favor of standalone
repositories for each of the filters. Introduce table-ldap, which is one
of these new standalone filters to read login info from an LDAP server.
---
 .../op/opensmtpd-table-ldap/package.nix       | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/op/opensmtpd-table-ldap/package.nix

diff --git a/pkgs/by-name/op/opensmtpd-table-ldap/package.nix b/pkgs/by-name/op/opensmtpd-table-ldap/package.nix
new file mode 100644
index 000000000000..ac81d8d4a7d2
--- /dev/null
+++ b/pkgs/by-name/op/opensmtpd-table-ldap/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+  libevent,
+  libressl,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opensmtpd-table-ldap";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "OpenSMTPD";
+    repo = "table-ldap";
+    tag = finalAttrs.version;
+    hash = "sha256-dfwvgFYBED3GyZ347JSNIyiik133GYLT6p+XkIIm//w=";
+  };
+
+  strictDeps = true;
+
+  buildInputs = [
+    libevent
+    libressl
+  ];
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-path-socket=/run"
+    "--with-path-pidfile=/run"
+  ];
+
+  preConfigure = ''
+    sh bootstrap
+  '';
+
+  meta = {
+    homepage = "https://www.opensmtpd.org/";
+    description = "ldap table for the OpenSMTPD mail server";
+    changelog = "https://github.com/OpenSMTPD/table-ldap/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      pks
+    ];
+  };
+})

From 85ae8c21ae5803657a165ac40419e19f65ba9b79 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Sun, 26 Jan 2025 09:23:31 +0100
Subject: [PATCH 02/11] opensmtpd.table-mysql: init at 1.2.1

The opensmtpd-extra package has been deprecated in favor of standalone
repositories for each of the filters. Introduce table-mysql, which is
one of these new standalone filters to read login info from a MySQL or
MariaDB database.
---
 .../op/opensmtpd-table-mysql/package.nix      | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/op/opensmtpd-table-mysql/package.nix

diff --git a/pkgs/by-name/op/opensmtpd-table-mysql/package.nix b/pkgs/by-name/op/opensmtpd-table-mysql/package.nix
new file mode 100644
index 000000000000..c1bd227783b0
--- /dev/null
+++ b/pkgs/by-name/op/opensmtpd-table-mysql/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+  libmysqlclient,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opensmtpd-table-mysql";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "OpenSMTPD";
+    repo = "table-mysql";
+    tag = finalAttrs.version;
+    hash = "sha256-0N1fuYJvJKAoOJMH2bX0pdvAqb26w/6JSuv6ycnRZHU=";
+  };
+
+  strictDeps = true;
+
+  buildInputs = [
+    libmysqlclient
+  ];
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libmysqlclient
+  ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-path-socket=/run"
+    "--with-path-pidfile=/run"
+  ];
+
+  preConfigure = ''
+    sh bootstrap
+  '';
+
+  meta = {
+    homepage = "https://www.opensmtpd.org/";
+    description = "ldap table for the OpenSMTPD mail server";
+    changelog = "https://github.com/OpenSMTPD/table-mysql/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      pks
+    ];
+  };
+})

From f3b6355afdb60d73d4cd10c9408c6c01ed911202 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Sun, 26 Jan 2025 09:23:54 +0100
Subject: [PATCH 03/11] opensmtpd.table-passwd: init at 1.0.2

The opensmtpd-extra package has been deprecated in favor of standalone
repositories for each of the filters. Introduce table-passwd, which is
one of these new standalone filters to read login info from "passwd"
files.
---
 .../op/opensmtpd-table-passwd/package.nix     | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/op/opensmtpd-table-passwd/package.nix

diff --git a/pkgs/by-name/op/opensmtpd-table-passwd/package.nix b/pkgs/by-name/op/opensmtpd-table-passwd/package.nix
new file mode 100644
index 000000000000..3a068ad41867
--- /dev/null
+++ b/pkgs/by-name/op/opensmtpd-table-passwd/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opensmtpd-table-passwd";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "OpenSMTPD";
+    repo = "table-passwd";
+    tag = finalAttrs.version;
+    hash = "sha256-veE7PADO8KAMEnMrDc9V/xbVMqwF3rUoYPmpQSIJw9o=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-path-socket=/run"
+    "--with-path-pidfile=/run"
+  ];
+
+  preConfigure = ''
+    sh bootstrap
+  '';
+
+  meta = {
+    homepage = "https://www.opensmtpd.org/";
+    description = "passwd table for the OpenSMTPD mail server";
+    changelog = "https://github.com/OpenSMTPD/table-passwd/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      pks
+    ];
+  };
+})

From c7a567cd44d23fb5d3bec1809a68f2e7028ee1fb Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Sun, 26 Jan 2025 09:24:16 +0100
Subject: [PATCH 04/11] opensmtpd.table-postgres: init at 1.1.1

The opensmtpd-extra package has been deprecated in favor of standalone
repositories for each of the filters. Introduce table-postgres, which
is one of these new standalone filters to read login info from a
Postgres database.
---
 .../op/opensmtpd-table-postgres/package.nix   | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/op/opensmtpd-table-postgres/package.nix

diff --git a/pkgs/by-name/op/opensmtpd-table-postgres/package.nix b/pkgs/by-name/op/opensmtpd-table-postgres/package.nix
new file mode 100644
index 000000000000..3e62a3cb7eb7
--- /dev/null
+++ b/pkgs/by-name/op/opensmtpd-table-postgres/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+  libpq,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opensmtpd-table-postgres";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "OpenSMTPD";
+    repo = "table-postgres";
+    tag = finalAttrs.version;
+    hash = "sha256-CGtqCQnsUvgsBIJOVXphkisp3Iij+oW88w7Y1njusx8=";
+  };
+
+  strictDeps = true;
+
+  buildInputs = [
+    libpq
+  ];
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-path-socket=/run"
+    "--with-path-pidfile=/run"
+  ];
+
+  preConfigure = ''
+    sh bootstrap
+  '';
+
+  meta = {
+    homepage = "https://www.opensmtpd.org/";
+    description = "ldap table for the OpenSMTPD mail server";
+    changelog = "https://github.com/OpenSMTPD/table-postgres/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      pks
+    ];
+  };
+})

From c45505b1aa35b513f4235575afb87cb84aadf55a Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Sun, 26 Jan 2025 09:24:44 +0100
Subject: [PATCH 05/11] opensmtpd.table-redis: init at 1.0.1

The opensmtpd-extra package has been deprecated in favor of standalone
repositories for each of the filters. Introduce table-redis, which is
one of these new standalone filters to read login info from a Redis
instance.

Building table-redis does not work out of the box: while the project
correctly includes the hiredis include directory, the header itself is
contained in a "hiredis/" subdirectory. Add a patch to fix this.
---
 .../op/opensmtpd-table-redis/package.nix      | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/op/opensmtpd-table-redis/package.nix

diff --git a/pkgs/by-name/op/opensmtpd-table-redis/package.nix b/pkgs/by-name/op/opensmtpd-table-redis/package.nix
new file mode 100644
index 000000000000..e4f1cb775a9d
--- /dev/null
+++ b/pkgs/by-name/op/opensmtpd-table-redis/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+  hiredis,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opensmtpd-table-redis";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "OpenSMTPD";
+    repo = "table-redis";
+    tag = finalAttrs.version;
+    hash = "sha256-eS/jzran7/j3xrFuEqTLam0pokD/LBl4v2s/1ferCqk=";
+  };
+
+  strictDeps = true;
+
+  buildInputs = [
+    hiredis
+  ];
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-path-socket=/run"
+    "--with-path-pidfile=/run"
+  ];
+
+  env.NIX_CFLAGS_COMPILE = "-I${hiredis}/include/hiredis";
+
+  preConfigure = ''
+    sh bootstrap
+  '';
+
+  meta = {
+    homepage = "https://www.opensmtpd.org/";
+    description = "ldap table for the OpenSMTPD mail server";
+    changelog = "https://github.com/OpenSMTPD/table-redis/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      pks
+    ];
+  };
+})

From bef886ed23f67b93d4dff35e5e164b0e81e9d8b6 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Sun, 26 Jan 2025 09:25:07 +0100
Subject: [PATCH 06/11] opensmtpd.table-socketmap: init at 1.1.1

The opensmtpd-extra package has been deprecated in favor of standalone
repositories for each of the filters. Introduce table-socketmap, which
is one of these new standalone filters to read login info from a Unix
socket.
---
 .../op/opensmtpd-table-socketmap/package.nix  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/op/opensmtpd-table-socketmap/package.nix

diff --git a/pkgs/by-name/op/opensmtpd-table-socketmap/package.nix b/pkgs/by-name/op/opensmtpd-table-socketmap/package.nix
new file mode 100644
index 000000000000..e3346765857c
--- /dev/null
+++ b/pkgs/by-name/op/opensmtpd-table-socketmap/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opensmtpd-table-socketmap";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "OpenSMTPD";
+    repo = "table-socketmap";
+    tag = finalAttrs.version;
+    hash = "sha256-YTV0ijD264C7JAiB5ZfuCZhAmkLN0GSNl1vkZ3i3aRo=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-path-socket=/run"
+    "--with-path-pidfile=/run"
+  ];
+
+  preConfigure = ''
+    sh bootstrap
+  '';
+
+  meta = {
+    homepage = "https://www.opensmtpd.org/";
+    description = "ldap table for the OpenSMTPD mail server";
+    changelog = "https://github.com/OpenSMTPD/table-socketmap/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      pks
+    ];
+  };
+})

From 058a8bce1e01c4a526f8766cda42d0d0f65fc947 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Mon, 16 Dec 2024 08:03:19 +0100
Subject: [PATCH 07/11] opensmtpd.table-sqlite: init at 1.0.1

The opensmtpd-extra package has been deprecated in favor of standalone
repositories for each of the filters. Introduce table-sqlite, which is
one of these new standalone filters to read login info from an sqlite
database.
---
 .../op/opensmtpd-table-sqlite/package.nix     | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/op/opensmtpd-table-sqlite/package.nix

diff --git a/pkgs/by-name/op/opensmtpd-table-sqlite/package.nix b/pkgs/by-name/op/opensmtpd-table-sqlite/package.nix
new file mode 100644
index 000000000000..a85f91f48f17
--- /dev/null
+++ b/pkgs/by-name/op/opensmtpd-table-sqlite/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf,
+  automake,
+  sqlite,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opensmtpd-table-sqlite";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "OpenSMTPD";
+    repo = "table-sqlite";
+    tag = finalAttrs.version;
+    hash = "sha256-Y5AveTo+Ol6cMcxOW3/GMZZD+17HiQdQ4Vg5WHPjKgA=";
+  };
+
+  strictDeps = true;
+
+  buildInputs = [
+    sqlite
+  ];
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-path-socket=/run"
+    "--with-path-pidfile=/run"
+  ];
+
+  preConfigure = ''
+    sh bootstrap
+  '';
+
+  meta = {
+    homepage = "https://www.opensmtpd.org/";
+    description = "ldap table for the OpenSMTPD mail server";
+    changelog = "https://github.com/OpenSMTPD/table-sqlite/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      pks
+    ];
+  };
+})

From 132c73dd296a80fc3e272057ad1e82fd2656609f Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Mon, 16 Dec 2024 08:20:58 +0100
Subject: [PATCH 08/11] nixos/opensmtpd: adapt to changed filter location

The location of filters for OpenSMTPD has been changed to
"libexec/smtpd". Adapt the service accordingly.
---
 nixos/modules/services/mail/opensmtpd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 2fc628a64aeb..54dd5aac4d52 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -132,14 +132,14 @@ in
         procEnv = pkgs.buildEnv {
           name = "opensmtpd-procs";
           paths = [ cfg.package ] ++ cfg.procPackages;
-          pathsToLink = [ "/libexec/opensmtpd" ];
+          pathsToLink = [ "/libexec/smtpd" ];
         };
       in
       {
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
         serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}";
-        environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
+        environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/smtpd";
       };
   };
 }

From feddb6a2bcd9c1dbceb7a4811a1a9362ee766656 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Tue, 25 Mar 2025 19:29:51 +0100
Subject: [PATCH 09/11] opensmtpd-extras: drop in favor of standalone tables

Upstream has archived the OpenSMTPD-extras repository with 82c49af (add
deprecation notice, 2024-10-22). Instead, it has created a set of
repositories, each containing one of the tables. The old tables aren't
compatible anymore with recent OpenSMTPD versions due to changed
protocols. Other extras, like the queues, don't have an alternative to
the best of my knowledge.

Furthermore, opensmtpd-extras doesn't even build anymore, furthermore
indicating that there aren't any users of this package. Remove the
"opensmtpd-extras" package and raise errors pointing to the new
standalone tables.

Add a release note.
---
 doc/release-notes/rl-2505.section.md      |   4 +
 nixos/modules/services/mail/opensmtpd.nix |   4 +-
 pkgs/servers/mail/opensmtpd/extras.nix    | 113 ----------------------
 pkgs/top-level/aliases.nix                |   1 +
 pkgs/top-level/all-packages.nix           |   1 -
 5 files changed, 7 insertions(+), 116 deletions(-)
 delete mode 100644 pkgs/servers/mail/opensmtpd/extras.nix

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 774954bc3bc9..349f4ae86721 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -54,6 +54,10 @@
   The hook can be disabled by providing `dontCheckForBrokenSymlinks = true;` as an argument to `mkDerivation`.
   For more information, [check the docs](https://nixos.org/manual/nixpkgs/unstable/#no-broken-symlinks.sh) or [see this PR](https://github.com/NixOS/nixpkgs/pull/370750).
 
+- `opensmtpd-extras` has been deprecated by upstream and is not compatible with
+  OpenSMTPD 7.6.0 or later. The package has been removed in favor of a set of new
+  `opensmtpd-table-*` packages.
+
 - The hand written `perlPackages.SearchXapian` bindings have been dropped in favor of the (mostly compatible)
   `perlPackages.Xapian`.
 
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 54dd5aac4d52..9db7d78b7cad 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -76,8 +76,8 @@ in
         description = ''
           Packages to search for filters, tables, queues, and schedulers.
 
-          Add OpenSMTPD-extras here if you want to use the filters, etc. from
-          that package.
+          Add packages here if you want to use them as as such, for example
+          from the opensmtpd-table-* packages.
         '';
       };
     };
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
deleted file mode 100644
index 8f09e5803fa8..000000000000
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  openssl,
-  libevent,
-  libasr,
-  ncurses,
-  pkg-config,
-  lua5,
-  perl,
-  libmysqlclient,
-  libpq,
-  sqlite,
-  hiredis,
-  enableLua ? true,
-  enablePerl ? true,
-  enableMysql ? true,
-  enablePostgres ? true,
-  enableSqlite ? true,
-  enableRedis ? true,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "opensmtpd-extras";
-  version = "6.7.1";
-
-  src = fetchurl {
-    url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
-    sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    openssl
-    libevent
-    libasr
-    lua5
-    perl
-    libmysqlclient
-    libpq
-    sqlite
-    hiredis
-  ];
-
-  configureFlags =
-    [
-      "--sysconfdir=/etc"
-      "--localstatedir=/var"
-      "--with-privsep-user=smtpd"
-      "--with-libevent-dir=${libevent.dev}"
-
-      "--with-filter-clamav"
-      "--with-filter-dkim-signer"
-      "--with-filter-dnsbl"
-      "--with-filter-monkey"
-      "--with-filter-pause"
-      "--with-filter-regex"
-      "--with-filter-spamassassin"
-      "--with-filter-stub"
-      "--with-filter-trace"
-      "--with-filter-void"
-      "--with-queue-null"
-      "--with-queue-ram"
-      "--with-queue-stub"
-      "--with-table-ldap"
-      "--with-table-socketmap"
-      "--with-table-passwd"
-      "--with-table-stub"
-      "--with-scheduler-ram"
-      "--with-scheduler-stub"
-
-    ]
-    ++ lib.optionals enableLua [
-      "--with-lua=${pkg-config}"
-      "--with-filter-lua"
-
-    ]
-    ++ lib.optionals enablePerl [
-      "--with-perl=${perl}"
-      "--with-filter-perl"
-
-    ]
-    ++ lib.optionals enableMysql [
-      "--with-table-mysql"
-
-    ]
-    ++ lib.optionals enablePostgres [
-      "--with-table-postgres"
-
-    ]
-    ++ lib.optionals enableSqlite [
-      "--with-table-sqlite"
-
-    ]
-    ++ lib.optionals enableRedis [
-      "--with-table-redis"
-    ];
-
-  env.NIX_CFLAGS_COMPILE =
-    lib.optionalString enableRedis "-I${hiredis}/include/hiredis -lhiredis"
-    + lib.optionalString enableMysql " -L${libmysqlclient}/lib/mysql";
-
-  meta = with lib; {
-    homepage = "https://www.opensmtpd.org/";
-    description = "Extra plugins for the OpenSMTPD mail server";
-    license = licenses.isc;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
-      ekleog
-    ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ebad76789d55..58f6d3a978ec 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1349,6 +1349,7 @@ mapAliases {
   openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04
   openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29
   openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17
+  opensmtpd-extras = throw "opensmtpd-extras has been removed in favor of separate opensmtpd-table-* packages"; # Added 2025-01-26
   openssl_3_0 = openssl_3; # Added 2022-06-27
   opensycl = lib.warnOnInstantiate "'opensycl' has been renamed to 'adaptivecpp'" adaptivecpp; # Added 2024-12-04
   opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87e9c90b0156..7a7caef1a887 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12101,7 +12101,6 @@ with pkgs;
   };
 
   opensmtpd = callPackage ../servers/mail/opensmtpd { };
-  opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { };
   opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };
 
   system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { });

From dc8c84ce28f953140e5b051539e02467bcef5fd2 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Sat, 26 Apr 2025 06:34:28 +0200
Subject: [PATCH 10/11] opensmtpd-filter-rspamd: migrate to by-name

---
 .../op/opensmtpd-filter-rspamd/package.nix}                      | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{servers/mail/opensmtpd/filter-rspamd.nix => by-name/op/opensmtpd-filter-rspamd/package.nix} (100%)

diff --git a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix b/pkgs/by-name/op/opensmtpd-filter-rspamd/package.nix
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/filter-rspamd.nix
rename to pkgs/by-name/op/opensmtpd-filter-rspamd/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a7caef1a887..3b39004e6779 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12101,7 +12101,6 @@ with pkgs;
   };
 
   opensmtpd = callPackage ../servers/mail/opensmtpd { };
-  opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };
 
   system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { });
 

From d27fc8088c797102734180f7f262db765df67617 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Sat, 26 Apr 2025 06:34:47 +0200
Subject: [PATCH 11/11] opensmtpd: migrate to by-name

---
 .../opensmtpd/default.nix => by-name/op/opensmtpd/package.nix}  | 0
 pkgs/{servers/mail => by-name/op}/opensmtpd/proc_path.diff      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{servers/mail/opensmtpd/default.nix => by-name/op/opensmtpd/package.nix} (100%)
 rename pkgs/{servers/mail => by-name/op}/opensmtpd/proc_path.diff (100%)

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/by-name/op/opensmtpd/package.nix
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/default.nix
rename to pkgs/by-name/op/opensmtpd/package.nix
diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/by-name/op/opensmtpd/proc_path.diff
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/proc_path.diff
rename to pkgs/by-name/op/opensmtpd/proc_path.diff
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b39004e6779..d4e8914fa241 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12100,8 +12100,6 @@ with pkgs;
     modules = [ ];
   };
 
-  opensmtpd = callPackage ../servers/mail/opensmtpd { };
-
   system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { });
 
   # PulseAudio daemons