Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2fd3d51de26c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c5313ebf30cc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 2, 2020

  1. 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.
    @drewrisinger
    drewrisinger committed Apr 2, 2020
    Copy the full SHA
    beedfa5 View commit details

Commits on Apr 3, 2020

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

    pythonPackages.osqp: remove mkl dependency
    @bhipple
    bhipple authored Apr 3, 2020
    Copy the full SHA
    c5313eb View commit details
Showing with 8 additions and 10 deletions.
  1. +8 −10 pkgs/development/python-modules/osqp/default.nix
18 changes: 8 additions & 10 deletions pkgs/development/python-modules/osqp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}