From f34ee18635b6fc1dd501497724db77e4c9f13074 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 16 Jul 2024 17:36:40 +0200 Subject: [PATCH] mailmanPackages.postorius: use optional-dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have a mechanism for this — we don't need an overlay hack. Fixes: 04952ac5c3b8 ("mailmanPackages.python3: fix markdown support") --- pkgs/servers/mail/mailman/postorius.nix | 4 +++- pkgs/servers/mail/mailman/python.nix | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 1f3171f18a7f..1a0b23941485 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -11,7 +11,9 @@ buildPythonPackage rec { hash = "sha256-GmbIqO+03LgbUxJ1nTStXrYN3t2MfvzbeYRAipfTW1o="; }; - propagatedBuildInputs = [ django-mailman3 readme-renderer ]; + propagatedBuildInputs = [ + django-mailman3 readme-renderer + ] ++ readme-renderer.optional-dependencies.md; nativeCheckInputs = [ beautifulsoup4 vcrpy mock ]; # Tries to connect to database. diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 9eddfea2e51c..258cba0ab8b6 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -29,10 +29,6 @@ lib.fix (self: python3.override { hash = "sha256-WF3FFrnrBCphnvCjnD19Vf6BvbTfCaUsnN3g0Hvxqn0="; }; }); - - readme-renderer = super.readme-renderer.overridePythonAttrs (_: { - propagatedBuildInputs = [ self.cmarkgfm ]; - }); }) overlay;