diff options
author | Drew Risinger <drewrisinger@users.noreply.github.com> | 2020-04-02 11:46:54 -0400 |
---|---|---|
committer | Drew Risinger <drewrisinger@users.noreply.github.com> | 2020-04-02 12:43:54 -0400 |
commit | beedfa5f2726b16beec4f8dbfc2173f297e1b615 (patch) | |
tree | f249f2539143966c87efe1bfec5432f85b0a4d67 /pkgs/development/python-modules | |
parent | 49859351eac79b16dce4b21c6ebb824314fa5c2d (diff) |
pythonPackages.osqp: remove mkl
Also add scipy. Cleanup commit slightly for formatting. Removing mkl allows this to be built in Hydra (mkl = unfree), and it seems the mkl dependency is somewhat optional given downstream packages build cleanly when removing mkl.
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/osqp/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 237ad7a7a00a9..16997d6678129 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -4,10 +4,9 @@ , cmake , future , numpy - # check inputs , scipy +# check inputs , pytestCheckHook -, mkl }: buildPythonPackage rec { @@ -23,16 +22,15 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; propagatedBuildInputs = [ - numpy future + numpy + scipy ]; - checkInputs = [ scipy pytestCheckHook mkl ]; pythonImportsCheck = [ "osqp" ]; - dontUseSetuptoolsCheck = true; # running setup.py fails if false - preCheck = '' - export LD_LIBRARY_PATH=${lib.strings.makeLibraryPath [ mkl ]}:$LD_LIBRARY_PATH; - ''; + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; # don't run checks twice + disabledTests = [ "mkl_" ]; meta = with lib; { description = "The Operator Splitting QP Solver"; @@ -44,8 +42,8 @@ buildPythonPackage rec { where x in R^n is the optimization variable ''; homepage = "https://osqp.org/"; - downloadPage = "https://github.com/oxfordcontrol/osqp"; + downloadPage = "https://github.com/oxfordcontrol/osqp-python/releases"; license = licenses.asl20; - maintainers = with lib.maintainers; [ drewrisinger ]; + maintainers = with maintainers; [ drewrisinger ]; }; } |