diff options
| author | Daniel Wheeler <daniel.wheeler2@gmail.com> | 2021-04-06 05:59:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 11:59:40 +0200 |
| commit | b3a18f4daf2ac9267a7b5df09b39ded5f57e1e49 (patch) | |
| tree | 3cd270a5cb4ecc15b727361a4b11060c4e78f97a /pkgs/development/python-modules/fipy | |
| parent | Merge pull request #114293 from tmountain/nano (diff) | |
| download | nixpkgs-b3a18f4daf2ac9267a7b5df09b39ded5f57e1e49.tar.gz | |
pythonPackages.fipy: 3.4.1 -> 3.4.2.1 (#116567)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/development/python-modules/fipy')
| -rw-r--r-- | pkgs/development/python-modules/fipy/default.nix | 65 |
1 files changed, 30 insertions, 35 deletions
diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index d54379d0683e..ab670e557da4 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchPypi , numpy , scipy , pyamg @@ -18,41 +17,37 @@ , fetchurl }: -let - not_darwin_inputs = lib.optionals (! stdenv.isDarwin) [ gmsh ]; -in - buildPythonPackage rec { - pname = "fipy"; - version = "3.4.1"; +buildPythonPackage rec { + pname = "fipy"; + version = "3.4.2.1"; - src = fetchurl { - url = "https://github.com/usnistgov/fipy/releases/download/${version}/FiPy-${version}.tar.gz"; - sha256 = "0078yg96fknqhywn1v26ryc5z47c0j0c1qwz6p8wsjn0wmzggaqk"; - }; + src = fetchurl { + url = "https://github.com/usnistgov/fipy/releases/download/${version}/FiPy-${version}.tar.gz"; + sha256 = "0v5yk9b4hksy3176w4vm4gagb9kxqgv75zcyswlqvl371qwy1grk"; + }; - propagatedBuildInputs = [ - numpy - scipy - pyamg - matplotlib - tkinter - mpi4py - future - scikit-fmm - openssh - ] ++ lib.optionals isPy27 [ pysparse ] ++ not_darwin_inputs; + propagatedBuildInputs = [ + numpy + scipy + pyamg + matplotlib + tkinter + mpi4py + future + scikit-fmm + openssh + ] ++ lib.optionals isPy27 [ pysparse ] + ++ lib.optionals (!stdenv.isDarwin) [ gmsh ]; - checkInputs = not_darwin_inputs; + checkPhase = '' + export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh + ${python.interpreter} setup.py test --modules + ''; - checkPhase = '' - export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh - ${python.interpreter} setup.py test --modules - ''; - - meta = with lib; { - homepage = "https://www.ctcms.nist.gov/fipy/"; - description = "A Finite Volume PDE Solver Using Python"; - license = licenses.free; - maintainers = with maintainers; [ costrouc wd15 ]; - }; - } + meta = with lib; { + homepage = "https://www.ctcms.nist.gov/fipy/"; + description = "A Finite Volume PDE Solver Using Python"; + license = licenses.free; + maintainers = with maintainers; [ costrouc wd15 ]; + }; +} |