From 2e049b337ed5405d86493d1758f1d46feb640a8e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 21 Jun 2024 16:55:37 +0200 Subject: [PATCH] python311Packages.correctionlib: 2.5.0 -> 2.6.0 Diff: https://github.com/cms-nanoAOD/correctionlib/compare/v2.5.0...v2.6.0 Changelog: https://github.com/cms-nanoAOD/correctionlib/releases/tag/v2.6.0 --- .../python-modules/correctionlib/default.nix | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix index 1485a423202021..a4f745f63caae1 100644 --- a/pkgs/development/python-modules/correctionlib/default.nix +++ b/pkgs/development/python-modules/correctionlib/default.nix @@ -1,34 +1,43 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system cmake, - numpy, scikit-build, setuptools, setuptools-scm, - wheel, - packaging, pybind11, + + zlib, + + # dependencies + numpy, + packaging, pydantic, rich, + + # checks awkward, pytestCheckHook, scipy, - zlib, }: buildPythonPackage rec { pname = "correctionlib"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-H8QCdU6piBdqJEJOGVbsz+6eyMhFVuwTpIHKUoKaf4A="; + src = fetchFromGitHub { + owner = "cms-nanoAOD"; + repo = "correctionlib"; + rev = "refs/tags/v${version}"; + hash = "sha256-RI0wL+/6aNCV9PZMY9ZLNFLVYPm9kAyxcvLzLLM/T3Y="; + fetchSubmodules = true; }; - nativeBuildInputs = [ + build-system = [ cmake scikit-build setuptools @@ -38,7 +47,7 @@ buildPythonPackage rec { buildInputs = [ zlib ]; - propagatedBuildInputs = [ + dependencies = [ numpy packaging pydantic @@ -55,11 +64,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "correctionlib" ]; - meta = with lib; { + meta = { description = "Provides a well-structured JSON data format for a wide variety of ad-hoc correction factors encountered in a typical HEP analysis"; mainProgram = "correction"; homepage = "https://cms-nanoaod.github.io/correctionlib/"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ veprbl ]; + changelog = "https://github.com/cms-nanoAOD/correctionlib/releases/tag/v${version}"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ veprbl ]; }; }