From cfd96284abf6ea3fabf4c25bda82dd25a4019507 Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Fri, 26 Mar 2021 14:36:23 -0400
Subject: [PATCH 1/2] python39Packages.apptools: add prerequisite

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

diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index a6bb05840183..d44a3c5fd425 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchPypi, buildPythonPackage
 , configobj, six, traitsui
 , pytestCheckHook, tables, pandas
-, pythonOlder, importlib-resources
+, importlib-resources
 }:
 
 buildPythonPackage rec {
@@ -17,7 +17,6 @@ buildPythonPackage rec {
     configobj
     six
     traitsui
-  ] ++ lib.optionals (pythonOlder "3.9") [
     importlib-resources
   ];
 

From 24109ffdb6372d5d3547cc2048532189ff178de1 Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Fri, 26 Mar 2021 14:37:13 -0400
Subject: [PATCH 2/2] python3Packages.envisage: 4.9.2 -> 5.0.0

---
 .../python-modules/apptools/default.nix       | 14 +++++++++--
 .../python-modules/envisage/default.nix       | 24 +++++--------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
index d44a3c5fd425..4ee3add12b13 100644
--- a/pkgs/development/python-modules/apptools/default.nix
+++ b/pkgs/development/python-modules/apptools/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchPypi, buildPythonPackage
-, configobj, six, traitsui
+, fetchpatch, configobj, six, traitsui
 , pytestCheckHook, tables, pandas
-, importlib-resources
+, pythonOlder, importlib-resources
 }:
 
 buildPythonPackage rec {
@@ -13,10 +13,20 @@ buildPythonPackage rec {
     sha256 = "12x5lcs1cllpybz7f0i1lcwvmqsaa5n818wb2165lj049wqxx4yh";
   };
 
+  patches = [
+    # 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";
+    })
+  ];
+
   propagatedBuildInputs = [
     configobj
     six
     traitsui
+  ] ++ lib.optionals (pythonOlder "3.9") [
     importlib-resources
   ];
 
diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix
index 397e573a252f..f53184a8166c 100644
--- a/pkgs/development/python-modules/envisage/default.nix
+++ b/pkgs/development/python-modules/envisage/default.nix
@@ -1,18 +1,18 @@
-{ lib, fetchPypi, fetchpatch, isPy27
+{ lib, fetchPypi, isPy27
 , buildPythonPackage
-, traits, apptools
-, python, ipykernel, ipython
+, traits, apptools, pytestCheckHook
+, ipykernel, ipython
 }:
 
 buildPythonPackage rec {
   pname = "envisage";
-  version = "4.9.2";
+  version = "5.0.0";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1srjmkhnz84nz5jd72vdsnc4fn7dd9jr8nyf3hzk6yx1dsn815gd";
+    sha256 = "0zrxlq4v3091727vf10ngc8418sp26raxa8q83i4h0sydfkh2dic";
   };
 
   propagatedBuildInputs = [ traits apptools ];
@@ -21,22 +21,10 @@ buildPythonPackage rec {
     export HOME=$PWD/HOME
   '';
 
-  # fix a test failure; should be merged in next release
-  patches = [ (fetchpatch {
-    url = "https://github.com/enthought/envisage/pull/248/commits/7b6d2dd615d5cb7455b200eb8f37e030bbf4df9e.patch";
-    sha256 = "0a3dmbpxwsn1bkjcjv9v7b751rcmppj6hc9wcgiayg4l9r2nrvyh";
-  }) ];
-
   checkInputs = [
-    ipykernel ipython
+    ipykernel ipython pytestCheckHook
   ];
 
-  checkPhase = ''
-    runHook preCheck
-    ${python.interpreter} -m unittest
-    runHook postCheck
-  '';
-
   meta = with lib; {
     description = "Framework for building applications whose functionalities can be extended by adding 'plug-ins'";
     homepage = "https://github.com/enthought/envisage";