diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index a020a52cf7cd..507fc61f8bb3 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -215,6 +215,12 @@ virtualisation.docker.daemon.settings. + + + opensmtpd-extras is no longer build with python2 scripting + support due to python2 deprecation in nixpkgs + + The autorestic package has been upgraded diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 768766ad249f..490afc0954fd 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -72,6 +72,8 @@ In addition to numerous new and upgraded packages, this release has the followin - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`. +- opensmtpd-extras is no longer build with python2 scripting support due to python2 deprecation in nixpkgs + - The `autorestic` package has been upgraded from 1.3.0 to 1.5.0 which introduces breaking changes in config file, check [their migration guide](https://autorestic.vercel.app/migration/1.4_1.5) for more details. - For `pkgs.python3.pkgs.ipython`, its direct dependency `pkgs.python3.pkgs.matplotlib-inline` diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 65ff08b45396..5759e57d3b49 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,6 +1,5 @@ -{ lib, stdenv, fetchurl, openssl, libevent, libasr, - python2, pkg-config, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, - enablePython ? true, +{ lib, stdenv, fetchurl, openssl, libevent, libasr, ncurses, + pkg-config, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, enableLua ? true, enablePerl ? true, enableMysql ? true, @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libevent - libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ]; + libasr lua5 perl libmysqlclient postgresql sqlite hiredis ]; configureFlags = [ "--sysconfdir=/etc" @@ -48,13 +47,6 @@ stdenv.mkDerivation rec { "--with-scheduler-ram" "--with-scheduler-stub" - ] ++ lib.optionals enablePython [ - "--with-python=${python2}" - "--with-filter-python" - "--with-queue-python" - "--with-table-python" - "--with-scheduler-python" - ] ++ lib.optionals enableLua [ "--with-lua=${pkg-config}" "--with-filter-lua"