From 495066a47fc259aa4fc5f7548e190fded2c7030e Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Thu, 14 Jan 2021 14:13:20 -0500
Subject: [PATCH] python3Packages.osqp: 0.6.2 -> 0.6.2.post0

---
 pkgs/development/python-modules/osqp/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix
index e2eb0139f12..1db266e116d 100644
--- a/pkgs/development/python-modules/osqp/default.nix
+++ b/pkgs/development/python-modules/osqp/default.nix
@@ -8,15 +8,16 @@
 , scipy
 # check inputs
 , pytestCheckHook
+, cvxopt
 }:
 
 buildPythonPackage rec {
   pname = "osqp";
-  version = "0.6.2";
+  version = "0.6.2.post0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "262162039f6ad6c9ffee658541b18cfae8240b65edbde71d9b9e3af42fbfe4b3";
+    sha256 = "5f0695f26a3bef0fae91254bc283fab790dcca0064bfe0f425167f9c9e8b4cbc";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -30,18 +31,10 @@ buildPythonPackage rec {
   ];
 
   pythonImportsCheck = [ "osqp" ];
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [ pytestCheckHook cvxopt ];
   disabledTests = [
     "mkl_"
   ];
-    pytestFlagsArray = [
-    # These cannot collect b/c of circular dependency on cvxpy: https://github.com/oxfordcontrol/osqp-python/issues/50
-    "--ignore=module/tests/basic_test.py"
-    "--ignore=module/tests/feasibility_test.py"
-    "--ignore=module/tests/polishing_test.py"
-    "--ignore=module/tests/unconstrained_test.py"
-    "--ignore=module/tests/update_matrices_test.py"
-  ];
 
   meta = with lib; {
     description = "The Operator Splitting QP Solver";