From 4a6ffe4f8c300bb044e8b7786b3887054dba2316 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Aug 2024 09:27:13 +0200 Subject: [PATCH 1/3] python312Packages.flufl-lock: 7.1.1 -> 8.1.0 Changelog: https://gitlab.com/warsaw/flufl.lock/-/blob/7.1.1/docs/NEWS.rst --- .../development/python-modules/flufl/lock.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 8926badb3e63..3c1b2ce83efd 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,34 +1,36 @@ { lib, + atpublic, buildPythonPackage, fetchPypi, - pytestCheckHook, - pythonOlder, - atpublic, + hatchling, psutil, pytest-cov, + pytestCheckHook, + pythonOlder, sybil, - pdm-pep517, }: buildPythonPackage rec { pname = "flufl-lock"; - version = "7.1.1"; + version = "8.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "flufl.lock"; + pname = "flufl_lock"; inherit version; - hash = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0="; + hash = "sha256-2IMCAFaSpj2YtgCAFY+vCJvl7K5pafcGQJ2oJ2/c58s="; }; - nativeBuildInputs = [ pdm-pep517 ]; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ atpublic psutil ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov @@ -45,10 +47,10 @@ buildPythonPackage rec { pythonNamespaces = [ "flufl" ]; meta = with lib; { - homepage = "https://flufllock.readthedocs.io/"; description = "NFS-safe file locking with timeouts for POSIX and Windows"; + homepage = "https://flufllock.readthedocs.io/"; changelog = "https://gitlab.com/warsaw/flufl.lock/-/blob/${version}/docs/NEWS.rst"; - maintainers = with maintainers; [ qyliss ]; license = licenses.asl20; + maintainers = with maintainers; [ qyliss ]; }; } From 977020ff6e6157e1ad423628e2256c8bc59c13b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Aug 2024 09:32:00 +0200 Subject: [PATCH 2/3] dvc: 3.51.2 -> 3.53.1 Changelog: https://github.com/iterative/dvc/releases/tag/3.53.1 --- pkgs/development/python-modules/dvc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 85c817f2f4fc..26ae7ec03de6 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.51.2"; + version = "3.53.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -66,7 +66,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-MjzunpPWzGfa62Jr+krEdm+i+N10QNmW7qRWaU/58OM="; + hash = "sha256-YX65jAkM0LFFtKf+MX0w1BfhyR2Dzr5Vpwxl2jJ/GGw="; }; pythonRelaxDeps = [ From 6a7037fc9f5e360601fa4ac3d05a454721e7b438 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Aug 2024 11:55:17 +0200 Subject: [PATCH 3/3] mailman: refactor --- pkgs/servers/mail/mailman/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 9a082040c96c..cbdbea48d09c 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -12,6 +12,8 @@ with python3.pkgs; buildPythonPackage rec { pname = "mailman"; version = "3.3.9"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -19,7 +21,11 @@ buildPythonPackage rec { hash = "sha256-GblXI6IwkLl+V1gEbMAe1baVyZOHMaYaYITXcTkp2Mo="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ aiosmtpd alembic authheaders