fenics: use normal pytest
This commit is contained in:
parent
550162327f
commit
af7d06ed59
|
@ -1,45 +1,37 @@
|
||||||
{ lib, stdenv
|
{ lib, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
|
, blas
|
||||||
, boost
|
, boost
|
||||||
, cmake
|
, cmake
|
||||||
, doxygen
|
, doxygen
|
||||||
, eigen
|
, eigen
|
||||||
|
, gtest
|
||||||
|
, hdf5
|
||||||
|
, lapack
|
||||||
|
, mpi
|
||||||
, mpi4py
|
, mpi4py
|
||||||
, numpy
|
, numpy
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
, ply
|
||||||
, pybind11
|
, pybind11
|
||||||
, pytest
|
, pytest
|
||||||
, pythonPackages
|
|
||||||
, six
|
|
||||||
, sympy
|
|
||||||
, gtest
|
|
||||||
, hdf5
|
|
||||||
, mpi
|
|
||||||
, ply
|
|
||||||
, python
|
, python
|
||||||
|
, pythonPackages
|
||||||
, scotch
|
, scotch
|
||||||
, setuptools
|
, setuptools
|
||||||
|
, six
|
||||||
, sphinx
|
, sphinx
|
||||||
, suitesparse
|
, suitesparse
|
||||||
, swig
|
, swig
|
||||||
|
, sympy
|
||||||
, zlib
|
, zlib
|
||||||
, blas
|
|
||||||
, lapack
|
|
||||||
, nixosTests
|
, nixosTests
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2019.1.0";
|
version = "2019.1.0";
|
||||||
|
|
||||||
# TODO: test with newer pytest
|
|
||||||
pytest = pythonPackages.callPackage
|
|
||||||
../../../../python2-modules/pytest {
|
|
||||||
# hypothesis tests require pytest that causes dependency cycle
|
|
||||||
hypothesis = pythonPackages.hypothesis.override {
|
|
||||||
doCheck = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
dijitso = pythonPackages.buildPythonPackage {
|
dijitso = pythonPackages.buildPythonPackage {
|
||||||
pname = "dijitso";
|
pname = "dijitso";
|
||||||
inherit version;
|
inherit version;
|
|
@ -2877,7 +2877,7 @@ in {
|
||||||
|
|
||||||
feedparser = callPackage ../development/python-modules/feedparser { };
|
feedparser = callPackage ../development/python-modules/feedparser { };
|
||||||
|
|
||||||
fenics = callPackage ../development/libraries/science/math/fenics {
|
fenics = callPackage ../development/python-modules/fenics {
|
||||||
hdf5 = pkgs.hdf5_1_10;
|
hdf5 = pkgs.hdf5_1_10;
|
||||||
boost = pkgs.boost169;
|
boost = pkgs.boost169;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue