cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #84124 from drewrisinger/dr-pr-py-osqp-remove-mkl

Browse source 
pythonPackages.osqp: remove mkl dependency
This commit is contained in:
Benjamin Hipple 2020-04-03 17:34:27 -04:00 committed by GitHub
commit c5313ebf30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 , cmake
, future , future
, numpy , numpy
# check inputs
, scipy , scipy
# check inputs
, pytestCheckHook , pytestCheckHook
, mkl
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -23,16 +22,15 @@ buildPythonPackage rec {
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
propagatedBuildInputs = [ propagatedBuildInputs = [
numpy
future future
numpy
scipy
]; ];
checkInputs = [ scipy pytestCheckHook mkl ];
pythonImportsCheck = [ "osqp" ]; pythonImportsCheck = [ "osqp" ];
dontUseSetuptoolsCheck = true; # running setup.py fails if false checkInputs = [ pytestCheckHook ];
preCheck = '' dontUseSetuptoolsCheck = true; # don't run checks twice
export LD_LIBRARY_PATH=${lib.strings.makeLibraryPath [ mkl ]}:$LD_LIBRARY_PATH; disabledTests = [ "mkl_" ];
'';
meta = with lib; { meta = with lib; {
description = "The Operator Splitting QP Solver"; description = "The Operator Splitting QP Solver";
@ -44,8 +42,8 @@ buildPythonPackage rec {
where x in R^n is the optimization variable where x in R^n is the optimization variable
''; '';
homepage = "https://osqp.org/"; homepage = "https://osqp.org/";
downloadPage = "https://github.com/oxfordcontrol/osqp"; downloadPage = "https://github.com/oxfordcontrol/osqp-python/releases";
license = licenses.asl20; license = licenses.asl20;
maintainers = with lib.maintainers; [ drewrisinger ]; maintainers = with maintainers; [ drewrisinger ];
}; };
} }