diff --git a/pkgs/by-name/be/beets-minimal/package.nix b/pkgs/by-name/be/beets-minimal/package.nix index d9813fb415d4..de0125445743 100644 --- a/pkgs/by-name/be/beets-minimal/package.nix +++ b/pkgs/by-name/be/beets-minimal/package.nix @@ -2,12 +2,4 @@ python3, }: -let - python = python3.override { - self = python3; - packageOverrides = self: super: { - pyrate-limiter = super.pyrate-limiter_2; - }; - }; -in -python.pkgs.toPythonApplication python.pkgs.beets-minimal +python3.pkgs.toPythonApplication python3.pkgs.beets-minimal diff --git a/pkgs/by-name/be/beets/package.nix b/pkgs/by-name/be/beets/package.nix index f6f9997bb50f..0d8837e0c0d8 100644 --- a/pkgs/by-name/be/beets/package.nix +++ b/pkgs/by-name/be/beets/package.nix @@ -2,12 +2,4 @@ python3, }: -let - python = python3.override { - self = python3; - packageOverrides = self: super: { - pyrate-limiter = super.pyrate-limiter_2; - }; - }; -in -python.pkgs.toPythonApplication python.pkgs.beets +python3.pkgs.toPythonApplication python3.pkgs.beets diff --git a/pkgs/by-name/cg/cgt-calc/package.nix b/pkgs/by-name/cg/cgt-calc/package.nix index 9cb0f8732e9a..f2084bb7fc0a 100644 --- a/pkgs/by-name/cg/cgt-calc/package.nix +++ b/pkgs/by-name/cg/cgt-calc/package.nix @@ -1,33 +1,37 @@ { lib, fetchFromGitHub, - fetchpatch, python3Packages, withTeXLive ? true, texliveSmall, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "cgt-calc"; - version = "1.14.0"; + # Includes updates to use pyrate-limiter v4 that are not released yet + # unfortunately. + version = "1.14.0-unstable-2026-02-23"; pyproject = true; src = fetchFromGitHub { owner = "KapJI"; repo = "capital-gains-calculator"; - rev = "v${finalAttrs.version}"; + rev = "3326514c8e99904eeeda676948c4404da6fe1adc"; hash = "sha256-6iOlDNlpfCrbRCxEJsRYw6zqOehv/buVN+iU6J6CtIk="; }; - patches = [ - # https://github.com/KapJI/capital-gains-calculator/pull/715 - (fetchpatch { - url = "https://github.com/KapJI/capital-gains-calculator/commit/ec7155c1256b876d5906a3885656489e9fdd798c.patch"; - hash = "sha256-pfGHSKuDRF0T1hP7kpRC285limd1voqLXcXCP7mAD3s="; - }) - ]; - pythonRelaxDeps = [ + # The built wheel holds an upper bound requirement for the version of these + # dependenceis, while pyproject.toml doesn't. Upstream's `uv.lock` even + # uses yfinance 1.2.0 . See: + # https://github.com/KapJI/capital-gains-calculator/pull/744 "defusedxml" + "yfinance" + ]; + pythonRemoveDeps = [ + # Upstream's uv.lock doesn't reference this dependency, and lists + # pyrate-limiter instead. The built wheel from some reason requests it + # never the less. + "requests-ratelimiter" ]; build-system = with python3Packages; [ diff --git a/pkgs/development/python-modules/beets-audible/default.nix b/pkgs/development/python-modules/beets-audible/default.nix index 5dc42ab5faae..30bc3e2bfe8b 100644 --- a/pkgs/development/python-modules/beets-audible/default.nix +++ b/pkgs/development/python-modules/beets-audible/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, # build-system - hatchling, + uv-build, # native beets-minimal, @@ -20,18 +20,18 @@ buildPythonPackage rec { pname = "beets-audible"; - version = "1.2.1"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "Neurrone"; repo = "beets-audible"; tag = "v${version}"; - hash = "sha256-uQNF04BK87vN5Ak3g05rS8+LQLxsNEncgz4oKhNidWI="; + hash = "sha256-JijKKbceQejpOFIjrpoWRt6qlwBA6Yr8dwVTHyM7Io8="; }; build-system = [ - hatchling + uv-build ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/psnawp/default.nix b/pkgs/development/python-modules/psnawp/default.nix index 253641d2634d..39a262a7b6ee 100644 --- a/pkgs/development/python-modules/psnawp/default.nix +++ b/pkgs/development/python-modules/psnawp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "psnawp"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; src = fetchFromCodeberg { owner = "YoshikageKira"; repo = "psnawp"; tag = "v${version}"; - hash = "sha256-qENKZC5U4jedl2RvmIGk52r0Vd/oMLEcp6DERYLctAs="; + hash = "sha256-RpJYQNG9+N5XUOIySOZvVLCT6kiLYGaq0Lt8CTLRvBA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix index d14866abba03..ebcfc85cdd5d 100644 --- a/pkgs/development/python-modules/pyrate-limiter/default.nix +++ b/pkgs/development/python-modules/pyrate-limiter/default.nix @@ -4,7 +4,8 @@ fetchFromGitHub, # build-system - poetry-core, + hatchling, + uv-dynamic-versioning, # optional dependencies filelock, @@ -21,14 +22,14 @@ buildPythonPackage rec { pname = "pyrate-limiter"; - version = "3.9.0"; + version = "4.0.2"; pyproject = true; src = fetchFromGitHub { owner = "vutran1710"; repo = "PyrateLimiter"; tag = "v${version}"; - hash = "sha256-CAN3OWxXQaAzrh2q6z0OxPs4i02L/g2ISYFdUMHsHpg="; + hash = "sha256-xWxe70J69g9Tq35GjdJeT7MjUdoSEGj8w1cIKvLxJss="; }; postPatch = '' @@ -36,7 +37,10 @@ buildPythonPackage rec { sed -i "/create_postgres_bucket,/d" tests/conftest.py ''; - build-system = [ poetry-core ]; + build-system = [ + hatchling + uv-dynamic-versioning + ]; optional-dependencies = { all = [ @@ -73,8 +77,13 @@ buildPythonPackage rec { "tests/test_bucket_factory.py" "tests/test_limiter.py" "tests/test_multiprocessing.py" + "tests/test_postgres_concurrent.py" + "tests/test_multi_bucket.py" ]; + # For redisTestHook + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "pyrate_limiter" ]; meta = { diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index a3df0fcee1b8..68ad8649ec4e 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -23,14 +23,14 @@ buildPythonPackage (finalAttrs: { pname = "python-roborock"; - version = "4.17.1"; + version = "4.17.2"; pyproject = true; src = fetchFromGitHub { owner = "Python-roborock"; repo = "python-roborock"; tag = "v${finalAttrs.version}"; - hash = "sha256-xNQJ08ENiSXLsFBofILzwzRIgDbGH6yX+CBWPEIz2qQ="; + hash = "sha256-u4By7GmCvFrAnVVkFeoJCRX3Pey3Z3OF6uM+u9RTi7E="; }; pythonRelaxDeps = [ "pycryptodome" ]; diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix index 08da327b0acd..cecee5a35e69 100644 --- a/pkgs/development/python-modules/requests-ratelimiter/default.nix +++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "requests-ratelimiter"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "JWCook"; repo = "requests-ratelimiter"; tag = "v${version}"; - hash = "sha256-/fyZ+fjboAw97FPI6TgcjHRUAJbdNomvh7xJqTrTmuY="; + hash = "sha256-jmHXD3UJwzZSLXS7NXvCM/+lOFreSqb1QIl/jvO8lWc="; }; build-system = [ hatchling ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = { # https://github.com/JWCook/requests-ratelimiter/issues/78 - broken = lib.versionAtLeast pyrate-limiter.version "3"; + broken = lib.versionOlder pyrate-limiter.version "4"; description = "Module for rate-limiting for requests"; homepage = "https://github.com/JWCook/requests-ratelimiter"; changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${src.tag}/HISTORY.md"; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index c229d04f885b..4b31c28f557c 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "yfinance"; - version = "1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "ranaroussi"; repo = "yfinance"; tag = version; - hash = "sha256-84iiRqroaoqcvJqGvgk7baJ/vdgmyWy4V8KRNUtwnoU="; + hash = "sha256-Awblmr0ja5F5Dn00rhMaXy064pwQtETFj8s9Xarvp94="; }; build-system = [ setuptools ];