public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49994 from r-ryantm/auto-update/python3.6-cvxopt

Browse Source 
python36Packages.cvxopt: 1.2.1 -> 1.2.2
This commit is contained in:
Timo Kaufmann 2018-11-20 14:25:43 +01:00 committed by GitHub
commit 6059bf842a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/science/math/suitesparse/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gfortran, openblas, cmake { stdenv, fetchurl, gfortran, openblas, cmake, fixDarwinDylibNames
, enableCuda ? false, cudatoolkit , enableCuda ? false, cudatoolkit
}: }:
@ -96,8 +96,11 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ]
buildInputs = [ openblas gfortran.cc.lib ] ++ stdenv.lib.optionals enableCuda [cudatoolkit]; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ openblas gfortran.cc.lib ]
++ stdenv.lib.optional enableCuda cudatoolkit;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;

14
pkgs/development/python-modules/cvxopt/default.nix
View File

@ -1,4 +1,5 @@
{ lib { stdenv
, lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, isPyPy , isPyPy
@ -15,13 +16,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cvxopt"; pname = "cvxopt";
version = "1.2.1"; version = "1.2.2";
disabled = isPyPy; # hangs at [translation:info] disabled = isPyPy; # hangs at [translation:info]
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "12e3cfda982576b0b9b597d297aaf3172efa765a20fbed6f3c066aa0c48ee817"; sha256 = "19ipi6ljj9qv87lhgcsky1gy9543gcmqdbgzpk6v5ccv90nrcf00";
}; };
# similar to Gsl, glpk, fftw there is also a dsdp interface # similar to Gsl, glpk, fftw there is also a dsdp interface
@ -50,7 +51,7 @@ buildPythonPackage rec {
${python.interpreter} -m unittest discover -s tests ${python.interpreter} -m unittest discover -s tests
''; '';
meta = { meta = with lib; {
homepage = http://cvxopt.org/; homepage = http://cvxopt.org/;
description = "Python Software for Convex Optimization"; description = "Python Software for Convex Optimization";
longDescription = '' longDescription = ''
@ -63,7 +64,8 @@ buildPythonPackage rec {
standard library and on the strengths of Python as a high-level standard library and on the strengths of Python as a high-level
programming language. programming language.
''; '';
maintainers = with lib.maintainers; [ edwtjo ]; maintainers = with maintainers; [ edwtjo ];
license = lib.licenses.gpl3Plus; broken = stdenv.targetPlatform.isDarwin;
license = licenses.gpl3Plus;
}; };
} }