From ca5590df32b5cf54fd94711f3c3ddbb10c5aa3ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 03:37:39 +0000 Subject: [PATCH 1/2] python312Packages.nexusformat: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/nexusformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nexusformat/default.nix b/pkgs/development/python-modules/nexusformat/default.nix index 7a9ea2e698be..0c92f822f761 100644 --- a/pkgs/development/python-modules/nexusformat/default.nix +++ b/pkgs/development/python-modules/nexusformat/default.nix @@ -19,10 +19,10 @@ buildPythonPackage rec { pname = "nexusformat"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UxU3PA/2r/uamdysbfC0L2JinHgfkXhssHIo2hf3zlA="; + hash = "sha256-SSS6LTOdqLTHNGpBRO7UELF9qJb/sG8EwrE/azxk7wM="; }; pyproject = true; From 5780b4f957971c29958f69c38b055845c695b54c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 09:01:49 +0100 Subject: [PATCH 2/2] python312Packages.nexusformat: refactor - update ordering - fix changelog URL - remove superfluous comments --- .../python-modules/nexusformat/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/nexusformat/default.nix b/pkgs/development/python-modules/nexusformat/default.nix index 0c92f822f761..ae685948c3a0 100644 --- a/pkgs/development/python-modules/nexusformat/default.nix +++ b/pkgs/development/python-modules/nexusformat/default.nix @@ -2,31 +2,28 @@ lib, buildPythonPackage, fetchPypi, - - # build-system - setuptools, - setuptools-scm, - - # tests - pytestCheckHook, - - # dependencies h5py, hdf5plugin, numpy, + pytestCheckHook, + pythonOlder, scipy, + setuptools-scm, + setuptools, }: buildPythonPackage rec { pname = "nexusformat"; version = "1.0.7"; + pyproject = true; + + disabled = pythonOlder "3.10"; + src = fetchPypi { inherit pname version; hash = "sha256-SSS6LTOdqLTHNGpBRO7UELF9qJb/sG8EwrE/azxk7wM="; }; - pyproject = true; - build-system = [ setuptools setuptools-scm @@ -39,14 +36,14 @@ buildPythonPackage rec { scipy ]; - pythonImportsCheck = [ "nexusformat.nexus" ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "nexusformat.nexus" ]; + meta = with lib; { description = "Python API to open, create, and manipulate NeXus data written in the HDF5 format"; homepage = "https://github.com/nexpy/nexusformat"; - changelog = "https://github.com/nexpy/nexusformat/releases/tag/${version}"; + changelog = "https://github.com/nexpy/nexusformat/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ oberth-effect ]; };