diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 644b3545916c..528fe5ed0739 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, openblas, cmake +{ stdenv, fetchurl, gfortran, openblas, cmake, fixDarwinDylibNames , enableCuda ? false, cudatoolkit }: @@ -96,8 +96,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ cmake ]; - buildInputs = [ openblas gfortran.cc.lib ] ++ stdenv.lib.optionals enableCuda [cudatoolkit]; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = [ openblas gfortran.cc.lib ] + ++ stdenv.lib.optional enableCuda cudatoolkit; meta = with stdenv.lib; { homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index f0de39edd0d2..2411e8251a0d 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchPypi , isPyPy @@ -15,13 +16,13 @@ buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.1"; + version = "1.2.2"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "12e3cfda982576b0b9b597d297aaf3172efa765a20fbed6f3c066aa0c48ee817"; + sha256 = "19ipi6ljj9qv87lhgcsky1gy9543gcmqdbgzpk6v5ccv90nrcf00"; }; # similar to Gsl, glpk, fftw there is also a dsdp interface @@ -50,7 +51,7 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover -s tests ''; - meta = { + meta = with lib; { homepage = http://cvxopt.org/; description = "Python Software for Convex Optimization"; longDescription = '' @@ -63,7 +64,8 @@ buildPythonPackage rec { standard library and on the strengths of Python as a high-level programming language. ''; - maintainers = with lib.maintainers; [ edwtjo ]; - license = lib.licenses.gpl3Plus; + maintainers = with maintainers; [ edwtjo ]; + broken = stdenv.targetPlatform.isDarwin; + license = licenses.gpl3Plus; }; }