From d01163e51d693a548f13a8d3a6e5657fd77c8f0c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 14 Sep 2025 01:00:07 +0300 Subject: [PATCH] python313Packages.freud: 3.3.1 -> 3.4.0 Diff: https://github.com/glotzerlab/freud/compare/v3.3.1...v3.4.0 Changelog: https://github.com/glotzerlab/freud/blob/v3.4.0/ChangeLog.md --- .../python-modules/freud/default.nix | 46 ++++++++----------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix index 31d68996bfbf..3735dab43ff8 100644 --- a/pkgs/development/python-modules/freud/default.nix +++ b/pkgs/development/python-modules/freud/default.nix @@ -2,22 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system - cmake, + scikit-build-core, cython, oldest-supported-numpy, - scikit-build, - setuptools, + + # nativeBuildInputs + cmake, + ninja, # buildInputs - tbb, + tbb_2022, + nanobind, # dependencies numpy, rowan, scipy, + parsnip, # tests pytestCheckHook, @@ -29,25 +32,17 @@ buildPythonPackage rec { pname = "freud"; - version = "3.3.1"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "glotzerlab"; repo = "freud"; tag = "v${version}"; - hash = "sha256-3THoGPjfaDy2s96+Oaf1f2SDzxTaqRDQlNa3gZ/ytUU="; + hash = "sha256-JX3pbzNTj85UTAtWYnDRvtJSjS27qgY/vitaAjmXbjA="; fetchSubmodules = true; }; - patches = [ - # https://github.com/glotzerlab/freud/issues/1269 - (fetchpatch { - url = "https://github.com/glotzerlab/freud/commit/8f636e3815737945e45da5b9996b5f69df07c9a5.patch"; - hash = "sha256-PLorRrYj16oBWHYzXDq62kECzVTtyr+1Z20DJqTkXxg="; - }) - ]; - # Because we prefer to not `leaveDotGit`, we need to fool upstream into # thinking we left the .git files in the submodules, so cmake won't think we # didn't initialize them. Upstream doesn't support using the system wide @@ -59,21 +54,26 @@ buildPythonPackage rec { ''; build-system = [ - cmake + scikit-build-core cython oldest-supported-numpy - scikit-build - setuptools + ]; + + nativeBuildInputs = [ + cmake + ninja ]; dontUseCmakeConfigure = true; buildInputs = [ - tbb + tbb_2022 + nanobind ]; dependencies = [ numpy rowan scipy + parsnip ]; nativeCheckInputs = [ @@ -82,14 +82,6 @@ buildPythonPackage rec { matplotlib sympy ]; - disabledTests = [ - # https://github.com/glotzerlab/freud/issues/961 - # - # For x86_64-linux, see: - # - # https://github.com/glotzerlab/freud/issues/961#issuecomment-2553344968 - "test_docstring" - ]; # On top of cd $out due to https://github.com/NixOS/nixpkgs/issues/255262 , # we need to also copy the tests because otherwise pytest won't find them. preCheck = ''