From 948be822d284e76d955f5293f460d355ea282bb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Oct 2024 12:42:24 +0200 Subject: [PATCH 1/2] python312Packages.numpy-stl: refactor --- .../python-modules/numpy-stl/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index fd1911a81875..ef46c1724e03 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,28 +2,31 @@ lib, buildPythonPackage, cython, - enum34, fetchPypi, - nine, numpy, pytestCheckHook, python-utils, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "numpy-stl"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-947qYsgJOL9T6pFPpbbJL0SPDqtWCeDlpzfd4DlAQzQ="; }; - propagatedBuildInputs = [ - cython - enum34 - nine + build-system = [ setuptools ]; + + nativeBuildInputs = [ cython ]; + + dependencies = [ numpy python-utils ]; @@ -35,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to make reading, writing and modifying both binary and ascii STL files easy"; homepage = "https://github.com/WoLpH/numpy-stl/"; + changelog = "https://github.com/wolph/numpy-stl/releases/tag/v${version}"; license = licenses.bsd3; maintainers = [ ]; }; From d1fb047a9c420202d001ac98522d2f246f74c01f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Oct 2024 12:45:30 +0200 Subject: [PATCH 2/2] python312Packages.numpy-stl: 3.1.1 -> 3.1.2 Changelog: https://github.com/wolph/numpy-stl/releases/tag/v3.1.2 --- pkgs/development/python-modules/numpy-stl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index ef46c1724e03..bf7bac7f9950 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -12,14 +12,15 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-947qYsgJOL9T6pFPpbbJL0SPDqtWCeDlpzfd4DlAQzQ="; + pname = "numpy_stl"; + inherit version; + hash = "sha256-crRpUN+jZC3xx7hzz6eKVIUzckuQdHjFZ9tC/fV+49I="; }; build-system = [ setuptools ];