summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Engmark <victor@engmark.name>2023-07-19 16:21:47 +1200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-08-14 09:08:30 +0000
commitfb936d915ce277a7c9412e00b598d22856201ef5 (patch)
tree2e9d4e9d199f4f396d1170b4ea92b03de9f110eb
parentMerge pull request #247905 from yayayayaka/pleroma-2.5.4-23.05 (diff)
downloadnixpkgs-origin/backport-244267-to-release-23.05.tar.gz
Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit 893526b3971b191347884f38550ca172693acde3)
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/development/python-modules/vcard/default.nix34
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
4 files changed, 44 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index eac371141fa2..2f5970319666 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8751,6 +8751,12 @@
fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372";
}];
};
+ l0b0 = {
+ email = "victor@engmark.name";
+ github = "l0b0";
+ githubId = 168301;
+ name = "Victor Engmark";
+ };
l3af = {
email = "L3afMeAlon3@gmail.com";
matrix = "@L3afMe:matrix.org";
diff --git a/pkgs/development/python-modules/vcard/default.nix b/pkgs/development/python-modules/vcard/default.nix
new file mode 100644
index 000000000000..d984e7c106cc
--- /dev/null
+++ b/pkgs/development/python-modules/vcard/default.nix
@@ -0,0 +1,34 @@
+{ buildPythonPackage
+, fetchFromGitLab
+, lib
+, pytestCheckHook
+, python-dateutil
+, pythonAtLeast
+, pythonOlder
+}:
+buildPythonPackage rec {
+ pname = "vcard";
+ version = "0.15.4";
+
+ disabled = pythonOlder "3.8" || pythonAtLeast "3.12";
+
+ src = fetchFromGitLab {
+ owner = "engmark";
+ repo = "vcard";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-7GNq6PoWZgwhhpxhWOkUEpqckeSfzocex1ZGN9CTJyo=";
+ };
+
+ propagatedBuildInputs = [ python-dateutil ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "vcard" ];
+
+ meta = {
+ homepage = "https://gitlab.com/engmark/vcard";
+ description = "vCard validator, class and utility functions";
+ license = lib.licenses.agpl3Plus;
+ maintainers = [ lib.maintainers.l0b0 ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e14d7d827805..013f734429cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16715,6 +16715,8 @@ with pkgs;
vala-lint = callPackage ../development/tools/vala-lint { };
+ vcard = python3Packages.toPythonApplication python3Packages.vcard;
+
inherit (callPackage ../development/compilers/vala { })
vala_0_48
vala_0_54
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 55012aa51c27..7410d6e44dbf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12700,6 +12700,8 @@ self: super: with self; {
vat-moss = callPackage ../development/python-modules/vat-moss { };
+ vcard = callPackage ../development/python-modules/vcard { };
+
vcrpy = callPackage ../development/python-modules/vcrpy { };
vcver = callPackage ../development/python-modules/vcver { };