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
base: 2fd3d51de26c
Choose a base ref
...
head repository: NixOS/nixpkgs
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
    Browse the repository at this point in the history

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 committed Apr 3, 2020
    Copy the full SHA
    c5313eb View commit details
    Browse the repository at this point in the history