From 3275868ff69a75a02a04cb2ed36cd53c12105c0b Mon Sep 17 00:00:00 2001 From: Stefan Visser Date: Mon, 10 Mar 2025 12:41:59 +0100 Subject: [PATCH 1/3] maintainers: add DutchGerman --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 59cf754af9dc..8ab626a5617d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6472,6 +6472,13 @@ name = "Duncan Dean"; keys = [ { fingerprint = "9484 44FC E03B 05BA 5AB0 591E C37B 1C1D 44C7 86EE"; } ]; }; + DutchGerman = { + name = "Stefan Visser"; + email = "stefan.visser@apm-ecampus.de"; + github = "DutchGerman"; + githubId = 60694691; + keys = [ { fingerprint = "A7C9 3DC7 E891 046A 980F 2063 F222 A13B 2053 27A5"; } ]; + }; dvaerum = { email = "nixpkgs-maintainer@varum.dk"; github = "dvaerum"; From 0354e5a82ec2611cc6df2727f9f43354ee7d87d7 Mon Sep 17 00:00:00 2001 From: Stefan Visser Date: Mon, 10 Mar 2025 16:18:39 +0100 Subject: [PATCH 2/3] teams: add DutchGerman to apm --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 44aa03a4b1a1..ae22f8eb2862 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -64,6 +64,7 @@ with lib.maintainers; # Edits to this list should only be done by an already existing member. members = [ wolfgangwalther + DutchGerman ]; }; From 48172066346dc9cb3f957472cfb5e64827346b39 Mon Sep 17 00:00:00 2001 From: Stefan Visser Date: Mon, 10 Mar 2025 16:42:31 +0100 Subject: [PATCH 3/3] python3Packages.tiptapy: init at 0.20.0 --- .../python-modules/tiptapy/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/tiptapy/default.nix diff --git a/pkgs/development/python-modules/tiptapy/default.nix b/pkgs/development/python-modules/tiptapy/default.nix new file mode 100644 index 000000000000..be559c3d79e7 --- /dev/null +++ b/pkgs/development/python-modules/tiptapy/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + jinja2, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "tiptapy"; + # github repository does not have version tags + version = "0.20.0-unstable-2024-06-14"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "stckme"; + repo = "tiptapy"; + rev = "f34ed358b1b3448721b791150f4f104347a416bf"; + hash = "sha256-y43/901tznZ9N9A4wH3z8FW0mHzNrA8pC+0d1CxdqJM="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ jinja2 ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "tiptapy" ]; + + meta = { + description = "Library that generates HTML output from JSON export of tiptap editor"; + homepage = "https://github.com/stckme/tiptapy"; + changelog = "https://github.com/stckme/tiptapy/blob/master/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = lib.teams.apm.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a2387ea6454..1e996829da55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16652,6 +16652,8 @@ self: super: with self; { tinytuya = callPackage ../development/python-modules/tinytuya { }; + tiptapy = callPackage ../development/python-modules/tiptapy { }; + titlecase = callPackage ../development/python-modules/titlecase { }; tivars = callPackage ../development/python-modules/tivars { };