From ba901e926340da4cd7a684c4efcb75349fd3e09b Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 23 Jun 2024 12:35:30 +0200 Subject: pymilter: 1.0.5 -> 1.0.6; replace bsddb3 with berkleydb --- .../python-modules/pymilter/default.nix | 29 +++++++++------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix index 32b7cfcc9bbcd..6f0c4291d4d50 100644 --- a/pkgs/development/python-modules/pymilter/default.nix +++ b/pkgs/development/python-modules/pymilter/default.nix @@ -1,42 +1,37 @@ { lib, - python, buildPythonPackage, fetchFromGitHub, - fetchpatch, libmilter, - bsddb3, + berkeleydb, pydns, iana-etc, libredirect, pyasyncore, + setuptools, }: buildPythonPackage rec { pname = "pymilter"; - version = "1.0.5"; - format = "setuptools"; + version = "1.0.6"; + pyproject = true; src = fetchFromGitHub { owner = "sdgathman"; - repo = pname; - rev = "${pname}-${version}"; - hash = "sha256-gZUWEDVZfDRiOOdG3lpiQldHxm/93l8qYVOHOEpHhzQ="; + repo = "pymilter"; + rev = "refs/tags/pymilter-${version}"; + hash = "sha256-plaWXwDAIsVzEtrabZuZj7T4WNfz2ntQHgcMCVf5S70="; }; + build-system = [ + setuptools + ]; buildInputs = [ libmilter ]; nativeCheckInputs = [ pyasyncore ]; - propagatedBuildInputs = [ - bsddb3 + dependencies = [ + berkeleydb pydns ]; - patches = [ - (fetchpatch { # https://github.com/sdgathman/pymilter/pull/57 - name = "Remove-calls-to-the-deprecated-method-assertEquals"; - url = "https://github.com/sdgathman/pymilter/commit/1ead9028fc63ae3ec6ea3b0c438e6ed088a2b20e.patch"; - hash = "sha256-/5LlDR15nMR3l7rkVjT3w4FbDTFAAgNdERWlPNL2TVg="; - }) - ]; preBuild = '' sed -i 's/import thread/import _thread as thread/' Milter/greylist.py -- cgit 1.4.1