From c2a01567db13e1f197dad8f55a873f3ffca634a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Oct 2023 08:55:12 +0100 Subject: [PATCH 1/5] python311Packages.parsedmarc: use new style for format --- pkgs/development/python-modules/parsedmarc/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 912768621d10..8b4892d14b59 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -42,11 +42,10 @@ in buildPythonPackage rec { pname = "parsedmarc"; version = "8.6.1"; + pyproject = true; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchPypi { inherit pname version; hash = "sha256-lnIhXkBodvLWVeqiwFcnU4M53zwWDmtFz+9TThQY63I="; From 64e4091073650931c39e7ef202a0a4dd62bb83ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Oct 2023 08:56:18 +0100 Subject: [PATCH 2/5] python311Packages.parsedmarc: use with lib for meta --- pkgs/development/python-modules/parsedmarc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 8b4892d14b59..41c7c710b73f 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -96,11 +96,11 @@ buildPythonPackage rec { tests = nixosTests.parsedmarc; }; - meta = { + meta = with lib; { changelog = "https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#${lib.replaceStrings [ "." ] [ "" ] version}"; description = "Python module and CLI utility for parsing DMARC reports"; homepage = "https://domainaware.github.io/parsedmarc/"; - maintainers = with lib.maintainers; [ talyz ]; - license = lib.licenses.asl20; + maintainers = with maintainers; [ talyz ]; + license = licenses.asl20; }; } From 35225779651093227ee811de5cbe9f3031279af9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Oct 2023 08:57:51 +0100 Subject: [PATCH 3/5] python311Packages.parsedmarc: add link to issue --- pkgs/development/python-modules/parsedmarc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 41c7c710b73f..2cffa6cc67e3 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -87,6 +87,7 @@ buildPythonPackage rec { ]; # no tests on PyPI, no tags on GitHub + # https://github.com/domainaware/parsedmarc/issues/426 doCheck = false; pythonImportsCheck = [ "parsedmarc" ]; From 5b2c1beaf52fe7a9c955c4bcc62037ffc0d9165f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Oct 2023 09:06:10 +0100 Subject: [PATCH 4/5] python311Packages.parsedmarc: order inputs alphabetically --- .../python-modules/parsedmarc/default.nix | 77 +++++++++---------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 2cffa6cc67e3..a7df20791397 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -1,36 +1,33 @@ -{ buildPythonPackage -, fetchPypi -, fetchurl -, lib -, nixosTests -, python -, pythonOlder - -# pythonPackages -, hatchling -, dnspython -, expiringdict -, publicsuffix2 -, xmltodict -, geoip2 -, urllib3 -, requests -, imapclient +{ lib +, azure-identity +, boto3 +, buildPythonPackage , dateparser -, mailsuite +, dnspython , elasticsearch , elasticsearch-dsl -, kafka-python -, tqdm -, lxml -, boto3 -, msgraph-core -, azure-identity +, expiringdict +, fetchPypi +, fetchurl +, geoip2 , google-api-core , google-api-python-client , google-auth , google-auth-httplib2 , google-auth-oauthlib +, hatchling +, imapclient +, kafka-python +, lxml +, mailsuite +, msgraph-core +, nixosTests +, publicsuffix2 +, pythonOlder +, requests +, tqdm +, urllib3 +, xmltodict }: let @@ -61,29 +58,29 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - dnspython - expiringdict - publicsuffix2 - xmltodict - geoip2 - urllib3 - requests - imapclient + azure-identity + boto3 dateparser - mailsuite + dnspython elasticsearch elasticsearch-dsl - kafka-python - tqdm - lxml - boto3 - msgraph-core - azure-identity + expiringdict + geoip2 google-api-core google-api-python-client google-auth google-auth-httplib2 google-auth-oauthlib + imapclient + kafka-python + lxml + mailsuite + msgraph-core + publicsuffix2 + requests + tqdm + urllib3 + xmltodict ]; # no tests on PyPI, no tags on GitHub From 037aa356fcd18f808cdd794925a82028f62ce3b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Oct 2023 09:08:11 +0100 Subject: [PATCH 5/5] python311Packages.parsedmarc: replace publicsuffix2 with publicsuffixlist --- pkgs/development/python-modules/parsedmarc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index a7df20791397..5f1686902798 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -22,7 +22,7 @@ , mailsuite , msgraph-core , nixosTests -, publicsuffix2 +, publicsuffixlist , pythonOlder , requests , tqdm @@ -76,7 +76,7 @@ buildPythonPackage rec { lxml mailsuite msgraph-core - publicsuffix2 + publicsuffixlist requests tqdm urllib3