Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pretix: 2024.10.0 -> 2024.11.0 #359636

Open
wants to merge 5 commits into
base: staging
Choose a base branch
from
+20 −39
Open

pretix: 2024.10.0 -> 2024.11.0 #359636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71a170e
python312Packages.bleach: 6.1.0 -> 6.2.0
mweinelt Nov 27, 2024
4348c4b
python312Packages.tinycss2: 1.3.0 -> 1.4.0
mweinelt Nov 27, 2024
cbc5446
pretix: 2024.10.0 -> 2024.11.0
mweinelt Nov 27, 2024
91372ed
pretix.plugins.pages: 1.6.2 -> 1.6.3
mweinelt Nov 27, 2024
c4d74a5
pretix.plugins.zugferd: 2.2.1 -> 2.2.2
mweinelt Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions pkgs/by-name/pr/pretix/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -51,21 +41,21 @@ 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 {
pname = "pretix-node-modules";
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;

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/pr/pretix/plugins/pages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/pr/pretix/plugins/zugferd.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down
9 changes: 2 additions & 7 deletions pkgs/development/python-modules/bleach/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand All @@ -30,7 +26,6 @@ buildPythonPackage rec {
html5lib
packaging
setuptools
six
webencodings
];

Expand Down
26 changes: 11 additions & 15 deletions pkgs/development/python-modules/tinycss2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,36 @@
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
flit-core,
webencodings,
pytest-cov-stub,
pytestCheckHook,
flit-core,
}:

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" ""
'';

nativeBuildInputs = [ flit-core ];
build-system = [ flit-core ];

propagatedBuildInputs = [ webencodings ];
dependencies = [ webencodings ];

nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytest-cov-stub
pytestCheckHook
];

meta = with lib; {
description = "Low-level CSS parser for Python";
Expand Down