diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 08554808eb75..f69c15e52a2b 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -20,21 +20,16 @@ buildPythonPackage rec { pname = "islpy"; - version = "2024.2"; + version = "2025.1"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${version}"; - hash = "sha256-ixw9U4WqcXBW6KGBOsUImjsxmvG5XKCv4jCbTjJ4pjg="; + hash = "sha256-njwNijl7kAbU7v6Bd6p0J9KnYzXZi9gVdqSf8qD0FXE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=42,<64;python_version<'3.12'" "setuptools>=42" - ''; - build-system = [ cmake nanobind @@ -56,7 +51,7 @@ buildPythonPackage rec { # Force resolving the package from $out to make generated ext files usable by tests preCheck = '' - mv islpy islpy.hidden + rm -rf islpy ''; nativeCheckInputs = [ pytestCheckHook ]; @@ -66,6 +61,7 @@ buildPythonPackage rec { meta = { description = "Python wrapper around isl, an integer set library"; homepage = "https://github.com/inducer/islpy"; + changelog = "https://github.com/inducer/islpy/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 3f0e0bfcd54c..a74f61195b14 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -1,17 +1,21 @@ { lib, - astunparse, buildPythonPackage, - fetchpatch, - fetchPypi, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies immutabledict, + pytools, + + # optional-dependencies matchpy, numpy, + + # tests pytestCheckHook, - pythonOlder, - pytools, - setuptools, - typing-extensions, }: buildPythonPackage rec { @@ -19,34 +23,18 @@ buildPythonPackage rec { version = "2024.2.2"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-l2zP8O0bnVrTRxzyuqDQLiMBwevtXld7LgX2M8L1P+w="; + src = fetchFromGitHub { + owner = "inducer"; + repo = "pymbolic"; + tag = "v${version}"; + hash = "sha256-07RWdEPhO+n9/FOvIWe4nm9fGekut9X6Tz4HlIkBSpo="; }; - patches = [ - (fetchpatch { - url = "https://github.com/inducer/pymbolic/commit/cb3d999e4788dad3edf053387b6064adf8b08e19.patch"; - excludes = [ ".github/workflows/ci.yml" ]; - hash = "sha256-P0YjqAo0z0LZMIUTeokwMkfP8vxBXi3TcV4BSFaO1lU="; - }) - ]; - - postPatch = '' - # pytest is a test requirement not a run-time one - substituteInPlace setup.py \ - --replace '"pytest>=2.3",' "" - ''; - - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ - astunparse immutabledict pytools - typing-extensions ]; optional-dependencies = { @@ -58,11 +46,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pymbolic" ]; - meta = with lib; { + meta = { description = "Package for symbolic computation"; homepage = "https://documen.tician.de/pymbolic/"; changelog = "https://github.com/inducer/pymbolic/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; }