mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge pull request #117719 from rmcgibbo/envisage
This commit is contained in:
commit
1f3be311df
2 changed files with 16 additions and 19 deletions
|
@ -1,5 +1,5 @@
|
|||
{ lib, fetchPypi, buildPythonPackage
|
||||
, configobj, six, traitsui
|
||||
, fetchpatch, configobj, six, traitsui
|
||||
, pytestCheckHook, tables, pandas
|
||||
, pythonOlder, importlib-resources
|
||||
}:
|
||||
|
@ -13,6 +13,15 @@ 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
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue