Merge pull request #100767 from jfroche/fix/galario
python{2,3}Packages.galario: 1.2.1 -> 1.2.2
This commit is contained in:
commit
9cbbac9d09
|
@ -18,20 +18,20 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "galario";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtazzari";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1akz7md7ly16a89zr880c265habakqdg9sj8iil90klqa0i21w6g";
|
||||
sha256 = "0dw88ga50x3jwyfgcarn4azlhiarggvdg262hilm7rbrvlpyvha0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ fftw fftwFloat ]
|
||||
++ stdenv.lib.optional enablePython pythonPackages.python
|
||||
++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp
|
||||
++ stdenv.lib.optional enablePython pythonPackages.python
|
||||
++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp
|
||||
;
|
||||
|
||||
propagatedBuildInputs = stdenv.lib.optional enablePython [
|
||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
pythonPackages.pytest
|
||||
];
|
||||
|
||||
checkInputs = stdenv.lib.optional enablePython pythonPackages.scipy;
|
||||
checkInputs = stdenv.lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p build/external/src
|
||||
|
|
Loading…
Reference in a new issue