Unverified Commit 4090c5da authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #208223 from wegank/mayavi-darwin 

python3Packages.mayavi: 4.8.0 -> 4.8.1, add darwin support
parents a0b6fec7 50b5506b

pkgs/development/python-modules/envisage/default.nix

+10 −0
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/python-modules/mayavi/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/top-level/python-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

  });