summary refs log tree commit diff
path: root/pkgs/development/python-modules/correctionlib/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/python-modules/correctionlib/default.nix')
-rw-r--r--pkgs/development/python-modules/correctionlib/default.nix25
1 files changed, 6 insertions, 19 deletions
diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix
index 2156bd97822..7a79c385547 100644
--- a/pkgs/development/python-modules/correctionlib/default.nix
+++ b/pkgs/development/python-modules/correctionlib/default.nix
@@ -1,6 +1,5 @@
 { lib
 , buildPythonPackage
-, fetchpatch
 , fetchPypi
 , cmake
 , numpy
@@ -10,36 +9,23 @@
 , wheel
 , pybind11
 , pydantic
-, pytestCheckHook
 , rich
+, awkward
+, pytestCheckHook
 , scipy
 , zlib
 }:
 
 buildPythonPackage rec {
   pname = "correctionlib";
-  version = "2.2.2";
-  format = "pyproject";
+  version = "2.4.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-h3eggtPLSF/8ShQ5xzowZW1KSlcI/YBsPu3lsSyzHkw=";
+    hash = "sha256-bQKcS8vktvD62zvSeaBtoJw36TSpo0gEpKm0HI3AuXg=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "ci-maintenance.patch";
-      url = "https://github.com/cms-nanoAOD/correctionlib/commit/924031637b040f6e8e4930c46a9f7560c59db23d.patch";
-      hash = "sha256-jq3ojMsO2Ex9om8tVpEY9uwwelXPzgQ+KCPN0bgda8w=";
-      includes = [ "pyproject.toml" ];
-    })
-    (fetchpatch {
-      name = "clean-up-build-dependencies.patch";
-      url = "https://github.com/cms-nanoAOD/correctionlib/commit/c4fd64ca0e5ce806890e8f0ae8e792dcc4537d38.patch";
-      hash = "sha256-8ID2jEnmfYmPxWMtRviBc3t1W4p3Y+lAzijFtYBEtyk=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     numpy
@@ -64,6 +50,7 @@ buildPythonPackage rec {
   env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeCheckInputs = [
+    awkward
     pytestCheckHook
     scipy
   ];