From 1939a9af87b614662b778c37feeb4551512f8daa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 26 Aug 2023 10:29:21 +0200
Subject: [PATCH 1/2] python311Packages.apptools: add changelog to meta

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

diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index 0905100a2bae..350365ee638e 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -68,6 +68,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Set of packages that Enthought has found useful in creating a number of applications";
     homepage = "https://github.com/enthought/apptools";
+    changelog = "https://github.com/enthought/apptools/releases/tag/${version}";
     license = licenses.bsdOriginal;
     maintainers = with maintainers; [ knedlsepp ];
   };

From 30153560e10d46bb06b0b7948a44fa0c93423bd5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 26 Aug 2023 10:32:52 +0200
Subject: [PATCH 2/2] python311Packages.apptools: 5.1.0 -> 5.2.1

Changelog: https://github.com/enthought/apptools/releases/tag/5.2.1
---
 .../python-modules/apptools/default.nix       | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index 350365ee638e..faaf6bec0796 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -1,12 +1,10 @@
 { lib
 , buildPythonPackage
 , configobj
-, fetchpatch
 , fetchPypi
 , importlib-resources
 , pandas
 , pytestCheckHook
-, pythonAtLeast
 , pythonOlder
 , tables
 , traits
@@ -15,34 +13,16 @@
 
 buildPythonPackage rec {
   pname = "apptools";
-  version = "5.1.0";
+  version = "5.2.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12x5lcs1cllpybz7f0i1lcwvmqsaa5n818wb2165lj049wqxx4yh";
+    hash = "sha256-xiaPXfzzCIvK92oAA+ULd3TQG1JY1xmbQQtIUv8iRuM=";
   };
 
-  patches = [
-    # python310: Fix tests
-    # https://github.com/enthought/apptools/issues/303
-    (fetchpatch {
-      url = "https://github.com/enthought/apptools/commit/10fb73916124f7ae7edf6c6688a05ad95678488f.patch";
-      hash = "sha256-izAcP5RWobLvnk2PQx31SX/TUGkw+prbYbjamYVmtjY=";
-      name = "fix_python310_tests.patch";
-    })
-
-    # python39: importlib_resources -> importlib.resources. This patch will be included
-    # in the next release after 5.1.0.
-    (fetchpatch {
-      url = "https://github.com/enthought/apptools/commit/0ae4f52f19a8c0ca9d7926e17c7de949097f24b4.patch";
-      sha256 = "165aiwjisr5c3lasg7xblcha7y1y5bq23vi3g9gc80c24bzwcbsw";
-      name = "fix_importlib-resources_naming.patch";
-    })
-  ];
-
   propagatedBuildInputs = [
     configobj
     traits