From 2df88cb6f93d55a72c8f660a4fc063c9f7a56a88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Nov 2018 23:29:55 -0800 Subject: [PATCH 1/3] python36Packages.cvxopt: 1.2.1 -> 1.2.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.6-cvxopt/versions --- pkgs/development/python-modules/cvxopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index f0de39edd0d..067a3971268 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -15,13 +15,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 From 5b8c4b0646db59c0ce798aaccf1fd11bb4be1141 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 13 Nov 2018 00:23:58 +0100 Subject: [PATCH 2/3] suitesparse: fixup darwin libraries The build created libraries with an install_name that points to the build directory instead of the installation prefix. Causing errors like this when other packages try to link against it's libraries. Library not loaded: /private/tmp/nix-build-suitesparse-5.3.0.drv-0/SuiteSparse/lib/libcholmod.3.0.12.dylib --- .../libraries/science/math/suitesparse/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 644b3545916..528fe5ed073 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; From 5e3af1255b032e48cb6f18398bac3434658fa151 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 20 Nov 2018 13:18:03 +0100 Subject: [PATCH 3/3] pythonPackages.cvxopt: mark as broken on darwin See https://github.com/NixOS/nixpkgs/pull/49994#issuecomment-437589336. --- pkgs/development/python-modules/cvxopt/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 067a3971268..2411e8251a0 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 @@ -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; }; }