diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-04-14 17:49:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-14 17:49:27 +0200 |
commit | 5a3495f5fbfe522fedcc3365172b7dddb627aa82 (patch) | |
tree | 1fac1ba102ddc4ed0b2cc3e8f371d3a9b1aae274 /pkgs/top-level/python-packages.nix | |
parent | 089eefe7244a8cdd79f7caa0bf3792ec0feab840 (diff) | |
parent | 156e910b6d2dc09923187574e1a33b08c7a69940 (diff) | |
download | nixlib-5a3495f5fbfe522fedcc3365172b7dddb627aa82.tar nixlib-5a3495f5fbfe522fedcc3365172b7dddb627aa82.tar.gz nixlib-5a3495f5fbfe522fedcc3365172b7dddb627aa82.tar.bz2 nixlib-5a3495f5fbfe522fedcc3365172b7dddb627aa82.tar.lz nixlib-5a3495f5fbfe522fedcc3365172b7dddb627aa82.tar.xz nixlib-5a3495f5fbfe522fedcc3365172b7dddb627aa82.tar.zst nixlib-5a3495f5fbfe522fedcc3365172b7dddb627aa82.zip |
Merge pull request #38780 from timokau/cvxopt-1.1.9
cvxopt: 1.1.7 -> 1.1.9, add optional extensions
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f1da648012c1..afdba0c016b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1179,29 +1179,7 @@ in { cx_oracle = callPackage ../development/python-modules/cx_oracle {}; - cvxopt = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "cvxopt"; - version = "1.1.7"; - disabled = isPyPy; - src = pkgs.fetchurl { - url = "mirror://pypi/c/${pname}/${name}.tar.gz"; - sha256 = "f856ea2e9e2947abc1a6557625cc6b0e45228984f397a90c420b2f468dc4cb97"; - }; - doCheck = false; - buildInputs = with pkgs; [ openblasCompat ]; - preConfigure = '' - export CVXOPT_BLAS_LIB_DIR=${pkgs.openblasCompat}/lib - export CVXOPT_BLAS_LIB=openblas - export CVXOPT_LAPACK_LIB=openblas - ''; - meta = { - homepage = "http://cvxopt.org/"; - description = "Python Software for Convex Optimization"; - maintainers = with maintainers; [ edwtjo ]; - license = licenses.gpl3Plus; - }; - }; + cvxopt = callPackage ../development/python-modules/cvxopt { }; cycler = callPackage ../development/python-modules/cycler { }; |