From 3b45077527d36b1e50569b576a90f0a61f67cd83 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Jun 2025 09:04:10 +0200 Subject: [PATCH] python3Packages.islpy: 2025.1.5 -> 2025.2 Diff: https://github.com/inducer/islpy/compare/refs/tags/v2025.1.5...refs/tags/v2025.2 Changelog: https://github.com/inducer/islpy/releases/tag/v2025.2 --- .../python-modules/islpy/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index c7f6c53cb1bc..a996731db987 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -8,10 +8,11 @@ nanobind, ninja, pcpp, - scikit-build, - setuptools, + scikit-build-core, + typing-extensions, # buildInputs + imath, isl, # tests @@ -20,14 +21,14 @@ buildPythonPackage rec { pname = "islpy"; - version = "2025.1.5"; + version = "2025.2"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${version}"; - hash = "sha256-hzqxVLNKm63XliX5rDB54f6n1nJPVJJSAMmNTInbOEE="; + hash = "sha256-RMqqnhW8MibGhAhJZF/EjycFJ7E3j4aur0a6UaPyeIs="; }; build-system = [ @@ -35,19 +36,24 @@ buildPythonPackage rec { nanobind ninja pcpp - scikit-build - setuptools + scikit-build-core + typing-extensions ]; - buildInputs = [ isl ]; + buildInputs = [ + imath + isl + ]; dontUseCmakeConfigure = true; - preConfigure = '' - python ./configure.py \ - --no-use-shipped-isl \ - --isl-inc-dir=${lib.getDev isl}/include \ - ''; + pypaBuildFlags = [ + "--config-setting=cmake.define.USE_SHIPPED_ISL=OFF" + "--config-setting=cmake.define.USE_SHIPPED_IMATH=OFF" + "--config-setting=cmake.define.USE_BARVINOK=OFF" + "--config-setting=cmake.define.ISL_INC_DIRS:LIST='${lib.getDev isl}/include'" + "--config-setting=cmake.define.ISL_LIB_DIRS:LIST='${lib.getLib isl}/lib'" + ]; # Force resolving the package from $out to make generated ext files usable by tests preCheck = ''