From 6af23409489da031b59b4c7eb595871579d1acf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jun 2024 17:03:50 +0000 Subject: [PATCH 1/3] python311Packages.vcard: 0.15.4 -> 0.16.1 --- pkgs/development/python-modules/vcard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vcard/default.nix b/pkgs/development/python-modules/vcard/default.nix index 41fecf60da03..c6cf63dfddbb 100644 --- a/pkgs/development/python-modules/vcard/default.nix +++ b/pkgs/development/python-modules/vcard/default.nix @@ -9,7 +9,7 @@ pythonOlder, }: let - version = "0.15.4"; + version = "0.16.1"; in buildPythonPackage { inherit version; @@ -23,7 +23,7 @@ buildPythonPackage { owner = "engmark"; repo = "vcard"; rev = "refs/tags/v${version}"; - hash = "sha256-7GNq6PoWZgwhhpxhWOkUEpqckeSfzocex1ZGN9CTJyo="; + hash = "sha256-cz1WF8LQsyJwcVKMSWmFb6OB/JWyfc2FgcOT3jJ45Cg="; }; propagatedBuildInputs = [ python-dateutil ]; From 9700d2ff290f3aa8188ffc649177e81618b099b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jun 2024 23:40:37 +0200 Subject: [PATCH 2/3] python312Packages.vcard: refactor --- .../python-modules/vcard/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/vcard/default.nix b/pkgs/development/python-modules/vcard/default.nix index c6cf63dfddbb..26bc716c32ee 100644 --- a/pkgs/development/python-modules/vcard/default.nix +++ b/pkgs/development/python-modules/vcard/default.nix @@ -1,21 +1,18 @@ { + lib, buildPythonPackage, fetchFromGitLab, - lib, - nix-update-script, pytestCheckHook, python-dateutil, pythonAtLeast, pythonOlder, + setuptools, }: -let - version = "0.16.1"; -in -buildPythonPackage { - inherit version; +buildPythonPackage rec { pname = "vcard"; - format = "setuptools"; + version = "0.16.1"; + pyproject = true; disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; @@ -26,22 +23,22 @@ buildPythonPackage { hash = "sha256-cz1WF8LQsyJwcVKMSWmFb6OB/JWyfc2FgcOT3jJ45Cg="; }; - propagatedBuildInputs = [ python-dateutil ]; + build-system = [ setuptools ]; + + dependencies = [ python-dateutil ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "vcard" ]; - passthru.updateScript = nix-update-script { }; - meta = { - homepage = "https://gitlab.com/engmark/vcard"; description = "vCard validator, class and utility functions"; longDescription = '' This program can be used for strict validation and parsing of vCards. It currently supports vCard 3.0 (RFC 2426). ''; + homepage = "https://gitlab.com/engmark/vcard"; license = lib.licenses.agpl3Plus; mainProgram = "vcard"; - maintainers = [ lib.maintainers.l0b0 ]; + maintainers = with lib.maintainers; [ l0b0 ]; }; } From 74e183829018075706317c56524d7dd942050b66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jun 2024 23:50:54 +0200 Subject: [PATCH 3/3] python312Packages.vcard: relax python-dateutil --- pkgs/development/python-modules/vcard/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/vcard/default.nix b/pkgs/development/python-modules/vcard/default.nix index 26bc716c32ee..a2fe7abb3b3b 100644 --- a/pkgs/development/python-modules/vcard/default.nix +++ b/pkgs/development/python-modules/vcard/default.nix @@ -6,6 +6,7 @@ python-dateutil, pythonAtLeast, pythonOlder, + pythonRelaxDepsHook, setuptools, }: @@ -23,8 +24,12 @@ buildPythonPackage rec { hash = "sha256-cz1WF8LQsyJwcVKMSWmFb6OB/JWyfc2FgcOT3jJ45Cg="; }; + pythonRelaxDeps = [ "python-dateutil" ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + dependencies = [ python-dateutil ]; nativeCheckInputs = [ pytestCheckHook ];