From bbe77ffdfaedc10a95d0b1bc704d20cefdf7a5fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 21:24:30 +0200 Subject: [PATCH 1/2] python312Packages.lmtpd: disable on Python 3.12 smtpd will be removed in Python 3.12 --- .../python-modules/lmtpd/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index 1924c93a3ea9..9c9d997bdd9d 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -1,20 +1,35 @@ -{ buildPythonPackage, fetchPypi, isPy3k, lib }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonAtLeast +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "lmtpd"; version = "6.2.0"; - format = "setuptools"; + pyproject = true; - disabled = !isPy3k; + # smtpd will be removed in version 3.12 + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; - sha256 = "2c6825d2ffa1de099440411a742f58e1b3e8deeb3345adcfd4c2c38d4baf62b3"; + hash = "sha256-LGgl0v+h3gmUQEEadC9Y4bPo3uszRa3P1MLDjUuvYrM="; }; + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ + "lmtpd" + ]; + meta = with lib; { - homepage = "https://github.com/moggers87/lmtpd"; description = "LMTP counterpart to smtpd in the Python standard library"; + homepage = "https://github.com/moggers87/lmtpd"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; From cfbbf54f8943c074a15cea682e1ac8751b80fe87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 21:25:28 +0200 Subject: [PATCH 2/2] python312Packages.lmtpd: format with nixfmt --- .../python-modules/lmtpd/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index 9c9d997bdd9d..fce22c244937 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonAtLeast -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pythonAtLeast, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -19,13 +20,9 @@ buildPythonPackage rec { hash = "sha256-LGgl0v+h3gmUQEEadC9Y4bPo3uszRa3P1MLDjUuvYrM="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "lmtpd" - ]; + pythonImportsCheck = [ "lmtpd" ]; meta = with lib; { description = "LMTP counterpart to smtpd in the Python standard library";