git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commitbeedfa5f2726b16beec4f8dbfc2173f297e1b615 authorDrew Risinger <drewrisinger@users.noreply.github.com> dateThu 2 Apr 2020, 11:46 (7 years ago) parent4985935
1 file changed+8−10
pkgs/development/python-modules/osqp/default.nix+8−10
pkgs/development/python-modules/osqp/default.nix+8−10
@@ -4,10 +4,9 @@
44, cmake
55, future
66, numpy
7− # check inputs
87, scipy
8+# check inputs
99, pytestCheckHook
10−, mkl
1110}:
1211
1312buildPythonPackage rec {
@@ -23,16 +22,15 @@ buildPythonPackage rec {
2322 dontUseCmakeConfigure = true;
2423
2524 propagatedBuildInputs = [
26− numpy
2725 future
26+ numpy
27+ scipy
2828 ];
2929
30− checkInputs = [ scipy pytestCheckHook mkl ];
3130 pythonImportsCheck = [ "osqp" ];
32− dontUseSetuptoolsCheck = true; # running setup.py fails if false
33− preCheck = ''
34− export LD_LIBRARY_PATH=${lib.strings.makeLibraryPath [ mkl ]}:$LD_LIBRARY_PATH;
35− '';
31+ checkInputs = [ pytestCheckHook ];
32+ dontUseSetuptoolsCheck = true; # don't run checks twice
33+ disabledTests = [ "mkl_" ];
3634
3735 meta = with lib; {
3836 description = "The Operator Splitting QP Solver";
@@ -44,8 +42,8 @@ buildPythonPackage rec {
4442 where x in R^n is the optimization variable
4543 '';
4644 homepage = "https://osqp.org/";
47− downloadPage = "https://github.com/oxfordcontrol/osqp";
45+ downloadPage = "https://github.com/oxfordcontrol/osqp-python/releases";
4846 license = licenses.asl20;
49− maintainers = with lib.maintainers; [ drewrisinger ];
47+ maintainers = with maintainers; [ drewrisinger ];
5048 };
5149}