diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index ee3d8559806f..9d635cd1c9bb 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, cbor2, fetchFromGitHub, - fetchpatch2, exceptiongroup, hatchling, hatch-vcs, @@ -26,34 +25,16 @@ buildPythonPackage rec { pname = "cattrs"; - version = "24.1.3"; + version = "25.1.1"; pyproject = true; src = fetchFromGitHub { owner = "python-attrs"; repo = "cattrs"; tag = "v${version}"; - hash = "sha256-yrrb2Lvq7zMzeOLr8wwxVsKmPYEZxzDKR2mnCMNuHdE="; + hash = "sha256-kaB/UJcd4E4PUkz6mD53lXtmj4Z4P+Tuu7bSljYVOO4="; }; - patches = [ - # https://github.com/python-attrs/cattrs/pull/576 - (fetchpatch2 { - name = "attrs-24_2-compatibility1.patch"; - url = "https://github.com/python-attrs/cattrs/commit/2d37226ff19506e23bbc291125a29ce514575819.patch"; - excludes = [ - "pyproject.toml" - "pdm.lock" - ]; - hash = "sha256-nbk7rmOFk42DXYdOgw4Oe3gl3HbxNEtaJ7ZiVSBb3YA="; - }) - (fetchpatch2 { - name = "attrs-24_2-compatibility2.patch"; - url = "https://github.com/python-attrs/cattrs/commit/4bd6dde556042241c6381e1993cedd6514921f58.patch"; - hash = "sha256-H1xSAYjvVUI8/jON3LWg2F2TlSxejf6TU1jpCeqly6I="; - }) - ]; - build-system = [ hatchling hatch-vcs @@ -61,10 +42,10 @@ buildPythonPackage rec { dependencies = [ attrs + typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup - typing-extensions ]; nativeCheckInputs = [ @@ -79,7 +60,6 @@ buildPythonPackage rec { pytestCheckHook pyyaml tomlkit - typing-extensions ujson ]; @@ -117,7 +97,7 @@ buildPythonPackage rec { meta = { description = "Python custom class converters for attrs"; homepage = "https://github.com/python-attrs/cattrs"; - changelog = "https://github.com/python-attrs/cattrs/blob/${src.rev}/HISTORY.md"; + changelog = "https://github.com/python-attrs/cattrs/blob/${src.tag}/HISTORY.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; };