b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #208223 from wegank/mayavi-darwin

Browse source 
python3Packages.mayavi: 4.8.0 -> 4.8.1, add darwin support
This commit is contained in:
Thiago Kenji Okada 2023-01-08 14:50:45 +00:00 committed by GitHub
parent a0b6fec771 50b5506b1e
commit 4090c5da04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/python-modules/envisage/default.nix
View file

@ -2,6 +2,7 @@
, apptools
, buildPythonPackage
, fetchPypi
, fetchpatch
, ipython
, pytestCheckHook
, pythonAtLeast
@ -22,6 +23,15 @@ buildPythonPackage rec {
sha256 = "sha256-AATsUNcYLB4vtyvuooAMDZx8p5fayijb6yJoUKTCW40=";
};
patches = [
# TODO: remove on next release
(fetchpatch {
name = "fix-mistake-in-menu-group-specification.patch";
url = "https://github.com/enthought/envisage/commit/f23ea3864a5f6ffca665d47dec755992e062029b.patch";
sha256 = "sha256-l4CWB4jRkSmoTDoV8CtP2w87Io2cLINKfOSaSPy7cXE=";
})
];
# for the optional dependency ipykernel, only versions < 6 are
# supported, so it's not included in the tests, and not propagated
propagatedBuildInputs = [

8
pkgs/development/python-modules/mayavi/default.nix
View file

@ -4,6 +4,7 @@
, envisage
, fetchPypi
, numpy
, packaging
, pyface
, pygments
, pyqt5
@ -15,14 +16,14 @@
buildPythonPackage rec {
pname = "mayavi";
version = "4.8.0";
version = "4.8.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-TGBDYdn1+juBvhjVvxTzBlCw7jju1buhbMikQ5QXj2M=";
sha256 = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4=";
};
postPatch = ''
@ -43,6 +44,7 @@ buildPythonPackage rec {
apptools
envisage
numpy
packaging
pyface
pygments
pyqt5
@ -50,6 +52,8 @@ buildPythonPackage rec {
vtk
];
NIX_CFLAGS_COMPILE = "-Wno-error";
# Needs X server
doCheck = false;

4
pkgs/top-level/python-packages.nix
View file

@ -5664,7 +5664,7 @@ self: super: with self; {
mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi {
inherit buildPythonPackage pythonOlder fetchPypi;
inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5;
inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5;
};
mbddns = callPackage ../development/python-modules/mbddns { };
@ -11904,7 +11904,7 @@ self: super: with self; {
vt-py = callPackage ../development/python-modules/vt-py { };
vtk = toPythonModule (pkgs.vtk.override {
vtk = toPythonModule (pkgs.vtk_9.override {
pythonInterpreter = python;
enablePython = true;
});