Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions pkgs/development/python-modules/cvxpy/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{ lib
, pythonOlder
, buildPythonPackage
, fetchPypi
, cvxopt
, ecos
, multiprocess
, numpy
, osqp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like osqp doesn't exist yet

python-modules/cvxpy/default.nix:1:1 called without required argument 'osqp'

Copy link
Contributor Author

@drewrisinger drewrisinger Feb 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops. Waiting on #78883

, scipy
, scs
, six
# Check inputs
, nose
}:

buildPythonPackage rec {
pname = "cvxpy";
version = "1.0.25";

disabled = pythonOlder "3.5";

src = fetchPypi {
inherit pname version;
sha256 = "04zalvc8lckjfzm3i2ir32ib5pd6v7hxqqcnsnq6fw40vffm4dc5";
};

propagatedBuildInputs = [
cvxopt
ecos
multiprocess
osqp
scs
six
];

checkInputs = [ nose ];
checkPhase = ''
nosetests
'';

meta = {
description = "A domain-specific language for modeling convex optimization problems in Python.";
homepage = "https://www.cvxpy.org/";
downloadPage = "https://github.com/cvxgrp/cvxpy/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ drewrisinger ];
};
}
8 changes: 5 additions & 3 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1496,7 +1496,7 @@ in {
webapp2 = callPackage ../development/python-modules/webapp2 { };

wordcloud = callPackage ../development/python-modules/wordcloud { };

wrf-python = callPackage ../development/python-modules/wrf-python { };

pyunbound = callPackage ../tools/networking/unbound/python.nix { };
Expand Down Expand Up @@ -1690,7 +1690,7 @@ in {

asn1ate = callPackage ../development/python-modules/asn1ate { };

atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };
atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };

atomiclong = callPackage ../development/python-modules/atomiclong { };

Expand Down Expand Up @@ -1904,6 +1904,8 @@ in {

cvxopt = callPackage ../development/python-modules/cvxopt { };

cvxpy = callPackage ../development/python-modules/cvxpy { };

cycler = callPackage ../development/python-modules/cycler { };

cysignals = callPackage ../development/python-modules/cysignals { };
Expand Down Expand Up @@ -4406,7 +4408,7 @@ in {

nbconvert = callPackage ../development/python-modules/nbconvert { };

nbformat = if isPy3k then
nbformat = if isPy3k then
callPackage ../development/python-modules/nbformat { }
else callPackage ../development/python-modules/nbformat/2.nix { };

Expand Down