Unverified Commit 4c1b08bc authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

pretix: 2024.11.0 -> 2025.1.0 (#378701)

parents 75c8548d 2a6f860d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ in
                expires 7d;
              '';
            };
            "^~ /media/(cachedfiles|invoices)" = {
            "^~ (/media/(cachedfiles|invoices)|/static/(staticfiles.json|CACHE/manifest.json))" = {
              extraConfig = ''
                deny all;
                return 404;
+5 −11
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@
  buildNpmPackage,
  fetchFromGitHub,
  fetchPypi,
  fetchpatch2,
  nodejs,
  python3,
  gettext,
@@ -43,13 +42,13 @@ let
  };

  pname = "pretix";
  version = "2024.11.0";
  version = "2025.1.0";

  src = fetchFromGitHub {
    owner = "pretix";
    repo = "pretix";
    rev = "refs/tags/v${version}";
    hash = "sha256-vmk7oW9foXkZdt3XOLJDbPldX2TruJOgd8mmi5tGqNw=";
    hash = "sha256-azJFXuoV+9qs5MJQTkc1+ZiJb6UKwEa0Ow0p31CkHqI=";
  };

  npmDeps = buildNpmPackage {
@@ -57,7 +56,7 @@ let
    inherit version src;

    sourceRoot = "${src.name}/src/pretix/static/npm_dir";
    npmDepsHash = "sha256-4PrOrI2cykkuzob+DMeAu/GF5OMCho40G3BjCwVW/tE=";
    npmDepsHash = "sha256-oo9fo3MjwKYA8gueJ5otIPawORaVNj/Js3y8ZuCZ4qQ=";

    dontBuild = true;

@@ -79,12 +78,6 @@ python.pkgs.buildPythonApplication rec {
    # Discover pretix.plugin entrypoints during build and add them into
    # INSTALLED_APPS, so that their static files are collected.
    ./plugin-build.patch

    (fetchpatch2 {
      # fix tests after 2025-01-01
      url = "https://github.com/pretix/pretix/commit/5a5a551c21461d9ef36337480c9874d65a9fdba9.patch";
      hash = "sha256-ZtSVI6nVlJtNrnBZ9ktIqFGtNf+oWtvNsgCWwOUwVug=";
    })
  ];

  pythonRelaxDeps = [
@@ -273,8 +266,9 @@ python.pkgs.buildPythonApplication rec {
      python
      ;
    plugins = lib.recurseIntoAttrs (
      python.pkgs.callPackage ./plugins {
      lib.packagesFromDirectoryRecursive {
        inherit (python.pkgs) callPackage;
        directory = ./plugins;
      }
    );
    tests = {
+0 −18
Original line number Diff line number Diff line
{
  callPackage,
  ...
}:

{
  mollie = callPackage ./mollie.nix { };

  pages = callPackage ./pages.nix { };

  passbook = callPackage ./passbook.nix { };

  reluctant-stripe = callPackage ./reluctant-stripe.nix { };

  stretchgoals = callPackage ./stretchgoals.nix { };

  zugferd = callPackage ./zugferd.nix { };
}
+2 −2
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@

buildPythonPackage rec {
  pname = "pretix-mollie";
  version = "2.2.1";
  version = "2.2.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pretix";
    repo = "pretix-mollie";
    tag = "v${version}";
    hash = "sha256-utrdFrE4XHDTi/45gUTFarD+PQoGIHc4gTkDR8dGu40=";
    hash = "sha256-yc4t+XtHk7u3KcfeS+0CSTrBJ6e6SyLRpaQBHAKYVvo=";
  };

  build-system = [
Loading