Update pretix and apply fixes for 23.05

Update pretix to v2023.10.0
This commit is contained in:
Jakob Lechner 2023-11-24 22:59:36 +00:00
parent 1713c804bc
commit 303843e3dc
No known key found for this signature in database
GPG key ID: 996082EFB5906C10
9 changed files with 721 additions and 800 deletions

View file

@ -51,5 +51,5 @@
uefi.enable = true;
};
system.stateVersion = "22.11";
system.stateVersion = "23.11";
}

View file

@ -4,11 +4,6 @@ let
ports = import ../ports.nix args;
in
{
nixpkgs.config.permittedInsecurePackages = [
"python3.10-requests-2.28.2"
"python3.10-cryptography-40.0.1"
];
services.pretix = {
enable = true;
instanceName = "Weinturm Open Air";

View file

@ -17,7 +17,9 @@ in
myintercom-doorbell = callPackage ./myintercom-doorbell {
inherit poetry2nix;
};
pretix = callPackage ./pretix/pretix.nix { };
pretix = callPackage ./pretix/pretix.nix {
inherit poetry2nix;
};
pretix-banktool = callPackage ./pretix/pretix-banktool.nix { };
pretix-static = callPackage ./pretix/pretix-static.nix { };
tabbed-box-maker = callPackage ./tabbed-box-maker { };

1489
pkgs/pretix/poetry.lock generated

File diff suppressed because it is too large Load diff

View file

@ -12,7 +12,7 @@ index 2eba88a..7041acd 100644
+ 'fints>=3,<4.1',
'requests',
- 'mt-940>=4.12*',
+ 'mt-940>=4.12,<4.29',
+ 'mt-940==4.30.0',
],
--
2.38.3

View file

@ -14,6 +14,10 @@ python3Packages.buildPythonApplication rec {
./pretix-banktool-requirements.patch
];
buildInputs = with python3Packages; [
pip
];
propagatedBuildInputs = with python3Packages; [
click
fints

View file

@ -7,8 +7,8 @@
let
nodeEnv = buildNpmPackage rec {
name = "pretix-nodejs";
src = "${pretix.passthru.pythonModule.pkgs.pretix}/lib/python3.10/site-packages/pretix/static/npm_dir";
npmDepsHash = "sha256-TWRYNYku+p9w2tiyDFun2HwI69/+g+lqzvfqJqPCwiE=";
src = "${pretix.passthru.pythonModule.pkgs.pretix}/lib/${pretix.python.libPrefix}/site-packages/pretix/static/npm_dir";
npmDepsHash = "sha256-lf7GTXjvz4df1GeQ6uibwwGm+gKRU/RdNEHiCJ+zF1Y=";
dontNpmBuild = true;
installPhase = ''
mkdir -p $out

View file

@ -50,6 +50,11 @@ poetry2nix.mkPoetryApplication rec {
'';
}
);
reportlab = super.reportlab.overridePythonAttrs (
old: {
postPatch = "";
}
);
}
);
}

View file

@ -7,7 +7,7 @@ license = "MIT"
[tool.poetry.dependencies]
python = "^3.10"
pretix = "^2023.9.0"
pretix = "^2023.10.0"
[tool.poetry.dev-dependencies]
@ -15,5 +15,5 @@ pretix = "^2023.9.0"
pretix = "pretix_wrapper.__main__:main"
[build-system]
requires = ["poetry>=0.12"]
build-backend = "poetry.masonry.api"
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"