1 files changed, 34 insertions, 44 deletions
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 298a2ce83adfb..764d14a58d970 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -1,48 +1,37 @@
-{ lib
-, buildPythonPackage
-, pythonOlder
-, fetchPypi
-, fetchpatch
-, pythonAtLeast
-, stdenv
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchPypi,
+  pythonAtLeast,
+  stdenv,
 
-# build-system
-, setuptools
+  # build-system
+  setuptools,
 
-# propagates (optional, but unspecified)
-# https://github.com/joblib/joblib#dependencies
-, lz4
-, psutil
+  # propagates (optional, but unspecified)
+  # https://github.com/joblib/joblib#dependencies
+  lz4,
+  psutil,
 
-# tests
-, pytestCheckHook
-, threadpoolctl
+  # tests
+  pytestCheckHook,
+  threadpoolctl,
 }:
 
-
 buildPythonPackage rec {
   pname = "joblib";
-  version = "1.3.2";
+  version = "1.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-kvhl5iHhd4TnlVCAttBCSJ47jilJScxExurDBPWXcrE=";
+    hash = "sha256-HrDcCRkZzThEkN6JDLXf1ThBCm1LO1Tu8J+4xQtAmxw=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "suppress-deprecation-warnings-with-python312.patch";
-      url = "https://github.com/joblib/joblib/commit/05caf0772d605799e5d2337018fd32ac829b37aa.patch";
-      hash = "sha256-bfqxCLFkCnuWMIkIbcjh+nCTv38A8jxvyCHeJPxoZwg=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    setuptools
-  ];
+  nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [
     lz4
@@ -54,21 +43,22 @@ buildPythonPackage rec {
     threadpoolctl
   ];
 
-  pytestFlagsArray = [
-    "joblib/test"
-  ];
+  pytestFlagsArray = [ "joblib/test" ];
 
-  disabledTests = [
-    "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57
-    "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests
-    "test_nested_parallel_warnings" # tests is flaky under load
-  ] ++ lib.optionals stdenv.isDarwin [
-    "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin.
-  ] ++ lib.optionals (pythonAtLeast "3.12") [
-    # deprecation warnings with python3.12 https://github.com/joblib/joblib/issues/1478
-    "test_main_thread_renamed_no_warning"
-    "test_background_thread_parallelism"
-  ];
+  disabledTests =
+    [
+      "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57
+      "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests
+      "test_nested_parallel_warnings" # tests is flaky under load
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin.
+    ]
+    ++ lib.optionals (pythonAtLeast "3.12") [
+      # deprecation warnings with python3.12 https://github.com/joblib/joblib/issues/1478
+      "test_main_thread_renamed_no_warning"
+      "test_background_thread_parallelism"
+    ];
 
   meta = with lib; {
     changelog = "https://github.com/joblib/joblib/releases/tag/${version}";