diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix
index 865bd45c61b3..311767714a6c 100644
--- a/pkgs/development/python-modules/osqp/default.nix
+++ b/pkgs/development/python-modules/osqp/default.nix
@@ -1,31 +1,38 @@
 { lib
 , buildPythonPackage
-, fetchPypi
 , cmake
+, cvxopt
+, fetchPypi
 , future
 , numpy
-, qdldl
-, setuptools-scm
-, scipy
-# check inputs
 , pytestCheckHook
-, cvxopt
+, pythonOlder
+, qdldl
+, scipy
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "osqp";
   version = "0.6.2.post5";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b2fa17aae42a7ed498ec261b33f262bb4b3605e7e8464062159d9fae817f0d61";
+    hash = "sha256-svoXquQqftSY7CYbM/Jiu0s2BefoRkBiFZ2froF/DWE=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
-  nativeBuildInputs = [ cmake setuptools-scm ];
   dontUseCmakeConfigure = true;
 
+  nativeBuildInputs = [
+    cmake
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [
     future
     numpy
@@ -33,10 +40,39 @@ buildPythonPackage rec {
     scipy
   ];
 
-  pythonImportsCheck = [ "osqp" ];
-  checkInputs = [ pytestCheckHook cvxopt ];
+  checkInputs = [
+    cvxopt
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "osqp"
+  ];
+
   disabledTests = [
-    "mkl_"
+    # Test are failing due to scipy update (removal of scipy.random in 1.9.0)
+    # Is fixed upstream but requires a new release
+    "test_feasibility_problem"
+    "test_issue14"
+    "test_polish_random"
+    "test_polish_unconstrained"
+    "test_primal_and_dual_infeasible_problem"
+    "test_primal_infeasible_problem"
+    "test_solve"
+    "test_unconstrained_problem"
+    "test_update_A_allind"
+    "test_update_A"
+    "test_update_bounds"
+    "test_update_l"
+    "test_update_P_A_allind"
+    "test_update_P_A_indA"
+    "test_update_P_A_indP_indA"
+    "test_update_P_A_indP"
+    "test_update_P_allind"
+    "test_update_P"
+    "test_update_q"
+    "test_update_u"
+    "test_warm_start"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index e7611fc2329e..84f1dfd48bb4 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "stevedore";
-  version = "4.0.0";
+  version = "4.0.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-+CzJmh/1UjENGcN5gnwsZN2fhaOLzVVZ2yRwFhhnt4Y=";
+    sha256 = "sha256-miMRGm5hInDFkf0x/zMhxrXz1fPauxQnMXpatgj8Jho=";
   };
 
   propagatedBuildInputs = [