mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #84124 from drewrisinger/dr-pr-py-osqp-remove-mkl
pythonPackages.osqp: remove mkl dependency
This commit is contained in:
commit
c5313ebf30
1 changed files with 8 additions and 10 deletions
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue