diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index ddbbe8781a4e..8f77670f467f 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -13,16 +13,6 @@ let python = python3.override { self = python; packageOverrides = self: super: { - bleach = super.bleach.overridePythonAttrs (oldAttrs: rec { - version = "5.0.1"; - - src = fetchPypi { - pname = "bleach"; - inherit version; - hash = "sha256-DQMlXEfrm9Lyaqm7fyEHcy5+j+GVyi9kcJ/POwpKCFw="; - }; - }); - django = super.django_4; django-oauth-toolkit = super.django-oauth-toolkit.overridePythonAttrs (oldAttrs: { @@ -51,13 +41,13 @@ let }; pname = "pretix"; - version = "2024.10.0"; + version = "2024.11.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-MCiCr00N7894DjckAw3vpxdiNtlgzqivlbSY4A/327E="; + hash = "sha256-vmk7oW9foXkZdt3XOLJDbPldX2TruJOgd8mmi5tGqNw="; }; npmDeps = buildNpmPackage { @@ -65,7 +55,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-PPcA6TBsU/gGk4wII+w7VZOm65nS7qGjZ/UoQs31s9M="; + npmDepsHash = "sha256-4PrOrI2cykkuzob+DMeAu/GF5OMCho40G3BjCwVW/tE="; dontBuild = true; diff --git a/pkgs/by-name/pr/pretix/plugins/pages.nix b/pkgs/by-name/pr/pretix/plugins/pages.nix index 97e409679385..020436d8f43c 100644 --- a/pkgs/by-name/pr/pretix/plugins/pages.nix +++ b/pkgs/by-name/pr/pretix/plugins/pages.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretix-pages"; - version = "1.6.2"; + version = "1.6.3"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-pages"; rev = "v${version}"; - hash = "sha256-0pTFGCgtt/JGviTLsZFwgx93TD8ArLwZGfWoSYv5XuY="; + hash = "sha256-ZM38zHlFB5013PvoJwm7YC5/wHg2GZWmrhvreXuqNc8="; }; build-system = [ diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd.nix b/pkgs/by-name/pr/pretix/plugins/zugferd.nix index e7aeb78b346f..bada0bbc9bfd 100644 --- a/pkgs/by-name/pr/pretix/plugins/zugferd.nix +++ b/pkgs/by-name/pr/pretix/plugins/zugferd.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pretix-zugferd"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-zugferd"; rev = "v${version}"; - hash = "sha256-AJbrx1n32YAZnJGYX67qqaEnOeegYfSUEekvQnmjt+0="; + hash = "sha256-urf5HrC3Y64hH+U738t9fchoeR2sawlJAQoLFtwebA4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 5adbde446d95..290aa1913b81 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -3,25 +3,21 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - six, html5lib, setuptools, tinycss2, packaging, - pythonOlder, webencodings, }: buildPythonPackage rec { pname = "bleach"; - version = "6.1.0"; + version = "6.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-CjHxg3ljxB1Gu/EzG4d44TCOoHkdsDzE5zV7l89CqP4="; + hash = "sha256-Ej6JQRi4pZn9gNPsGm1Mx85OWIKxMXp+G6abVulfmR8="; }; nativeBuildInputs = [ setuptools ]; @@ -30,7 +26,6 @@ buildPythonPackage rec { html5lib packaging setuptools - six webencodings ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 730bbfc4f4d7..5702722a4c9c 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -3,40 +3,36 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - webencodings, - pytestCheckHook, flit-core, + webencodings, + pytest-cov-stub, + pytestCheckHook, }: buildPythonPackage rec { pname = "tinycss2"; - version = "1.3.0"; - format = "pyproject"; + version = "1.4.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "kozea"; repo = "tinycss2"; - - # Tag v1.3.0 is missing the actual version number bump. - rev = "bda62b101530588718d931d61bcc343a628b9af9"; + rev = "refs/tags/${version}"; # for tests fetchSubmodules = true; hash = "sha256-Exjxdm0VnnjHUKjquXsC/zDmwA7bELHdX1f55IGBjYk="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "'pytest-cov', 'pytest-flake8', 'pytest-isort', 'coverage[toml]'" "" \ - --replace "--isort --flake8 --cov --no-cov-on-fail" "" - ''; + build-system = [ flit-core ]; - nativeBuildInputs = [ flit-core ]; + dependencies = [ webencodings ]; - propagatedBuildInputs = [ webencodings ]; - - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; meta = with lib; { description = "Low-level CSS parser for Python";