ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 13:48:21 +03:00
Code Issues Projects Releases Wiki Activity

pythonPackages.osqp: remove mkl

Browse Source 
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.
This commit is contained in:
Drew Risinger 2020-04-02 11:46:54 -04:00
parent 49859351ea
commit beedfa5f27
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/python-modules/osqp/default.nix
View File

@ -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 ];
};
}