From d57af94bdeab4e7ec068945c63d632f8b43eed05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 00:54:45 +0000 Subject: [PATCH 1/2] python310Packages.scikit-hep-testdata: 0.4.24 -> 0.4.25 --- .../python-modules/scikit-hep-testdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index a4fc84d2f66b..1c6c2a1d640e 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.24"; + version = "0.4.25"; format = "pyproject"; # fetch from github as we want the data files @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Q9yyzwFQpqN3Q1SmNKDBxdo51uMqKp8xJ9Ilo9eCTV0="; + sha256 = "sha256-JiQaGyvoECylcJHWR2xm8ob5fA+0FmIEQpTuxxysvlw="; }; nativeBuildInputs = [ From 807d41c77fdc3068eb03f03a86b65ab9f822c63d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Dec 2022 18:46:57 +0100 Subject: [PATCH 2/2] python310Packages.scikit-hep-testdata: add changelog to meta - disable on older Python releases --- .../scikit-hep-testdata/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 1c6c2a1d640e..1e8b6263b8a0 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -6,6 +6,7 @@ , pyyaml , requests , setuptools-scm +, pythonOlder }: buildPythonPackage rec { @@ -13,33 +14,40 @@ buildPythonPackage rec { version = "0.4.25"; format = "pyproject"; - # fetch from github as we want the data files - # https://github.com/scikit-hep/scikit-hep-testdata/issues/60 + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-JiQaGyvoECylcJHWR2xm8ob5fA+0FmIEQpTuxxysvlw="; + hash = "sha256-JiQaGyvoECylcJHWR2xm8ob5fA+0FmIEQpTuxxysvlw="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ pyyaml requests - ] ++ lib.optional (!pythonAtLeast "3.9") importlib-resources; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; + ] ++ lib.optional (!pythonAtLeast "3.9") [ + importlib-resources + ]; SKHEP_DATA = 1; # install the actual root files doCheck = false; # tests require networking - pythonImportsCheck = [ "skhep_testdata" ]; + + pythonImportsCheck = [ + "skhep_testdata" + ]; meta = with lib; { homepage = "https://github.com/scikit-hep/scikit-hep-testdata"; description = "A common package to provide example files (e.g., ROOT) for testing and developing packages against"; + changelog = "https://github.com/scikit-hep/scikit-hep-testdata/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; };