From bbe73918dc4fbebdd1a4a1fe51b61262cbe7a781 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 14 Aug 2022 00:31:30 +0800
Subject: [PATCH 1/2] python3Packages.defcon: rework packaging

properly handle optional-dependencies
---
 .../python-modules/defcon/default.nix         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix
index 4bb079e9be7a..0cdd6c58c49f 100644
--- a/pkgs/development/python-modules/defcon/default.nix
+++ b/pkgs/development/python-modules/defcon/default.nix
@@ -1,14 +1,11 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, fontpens
-, fonttools
-, fs
-, lxml
-, pytestCheckHook
 , pythonOlder
+, fetchPypi
 , setuptools-scm
-, unicodedata2
+, fonttools
+, fontpens
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -30,20 +27,23 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     fonttools
-  ];
+  ]
+  ++ fonttools.optional-dependencies.ufo
+  ++ fonttools.optional-dependencies.unicode;
 
   nativeCheckInputs = [
-    fontpens
-    fs
-    lxml
     pytestCheckHook
-    unicodedata2
   ];
 
   pythonImportsCheck = [
     "defcon"
   ];
 
+  passthru.optional-dependencies = {
+    pens = [ fontpens ];
+    lxml = [ fonttools ] ++ fonttools.optional-dependencies.lxml;
+  };
+
   meta = with lib; {
     description = "A set of UFO based objects for use in font editing applications";
     homepage = "https://github.com/robotools/defcon";

From 4dddf7d16e898172fe8f46c5f890b3020c915a20 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 09:38:29 +0100
Subject: [PATCH 2/2] python3Packages.defcon: add changelog to meta

---
 pkgs/development/python-modules/defcon/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix
index 0cdd6c58c49f..8d5d9da29a02 100644
--- a/pkgs/development/python-modules/defcon/default.nix
+++ b/pkgs/development/python-modules/defcon/default.nix
@@ -47,6 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A set of UFO based objects for use in font editing applications";
     homepage = "https://github.com/robotools/defcon";
+    changelog = "https://github.com/robotools/defcon/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ sternenseemann ];
   };