Unverified Commit 9a3a5b84 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

pretalx: 2025.2.2 -> 2026.1.0 (#511043)

parents 025c852a 7997ddb6
Loading
Loading
Loading
Loading
+11 −35
Original line number Diff line number Diff line
@@ -2,38 +2,27 @@
  lib,
  buildNpmPackage,
  gettext,
  python3,
  python314,
  fetchFromGitHub,
  plugins ? [ ],
  nixosTests,
}:

let
  python = python3.override {
  python = python314.override {
    self = python;
    packageOverrides = final: prev: {
      django = prev.django_5;

      django-countries = prev.django-countries.overridePythonAttrs (oldAttrs: rec {
        version = "8.1.0";
        src = fetchFromGitHub {
          owner = "SmileyChris";
          repo = "django-countries";
          tag = "v${version}";
          hash = "sha256-KtBFSkYNKwivCFlqlWm4idiMybqsqiV0SNZx3egLl6c=";
        };
        build-system = with final; [ uv-build ];
      });
      django = prev.django_6;
    };
  };

  version = "2025.2.2";
  version = "2026.1.0";

  src = fetchFromGitHub {
    owner = "pretalx";
    repo = "pretalx";
    tag = "v${version}";
    hash = "sha256-2qru52/ZALBAdRh0I+3VimVsiRl71YZgbSUD/LdoA/0=";
    hash = "sha256-oSqeqVQ/L6DBI2ZP0h+qz2QBB4evt7V99tLMTkXvAic=";
  };

  meta = {
@@ -55,7 +44,7 @@ let

    sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor";

    npmDepsHash = "sha256-voHiml0nFWZIST39D5ErB0xTiWAOHN9OZinYutuQcdg=";
    npmDepsHash = "sha256-66PA2COL3lqMspYGoF/bOJje5URRu1voQbZspM7DTxs=";

    npmBuildScript = "build";

@@ -131,10 +120,8 @@ python.pkgs.buildPythonApplication rec {
      diff-match-patch
      django
      django-context-decorator
      django-countries
      django-csp
      django-filter
      django-formset-js-improved
      django-formtools
      django-hierarkey
      django-i18nfield
@@ -159,6 +146,7 @@ python.pkgs.buildPythonApplication rec {
    ]
    ++ beautifulsoup4.optional-dependencies.lxml
    ++ django.optional-dependencies.argon2
    ++ whitenoise.optional-dependencies.brotli
    ++ plugins;

  optional-dependencies = {
@@ -194,15 +182,16 @@ python.pkgs.buildPythonApplication rec {

  preCheck = ''
    export PRETALX_CONFIG_FILE="$src/src/tests/ci_sqlite.cfg"
    cd src
  '';

  nativeCheckInputs =
    with python.pkgs;
    [
      faker
      factory-boy
      freezegun
      jsonschema
      polib
      pytest-cov-stub
      pytest-django
      pytest-mock
@@ -213,21 +202,8 @@ python.pkgs.buildPythonApplication rec {
    ++ lib.concatAttrValues optional-dependencies;

  disabledTests = [
    # tries to run npm run i18n:extract
    "test_common_custom_makemessages_does_not_blow_up"
    # Expected to perform X queries or less but Y were done
    "test_can_see_schedule"
    "test_schedule_export_public"
    "test_schedule_frab_json_export"
    "test_schedule_frab_xcal_export"
    "test_schedule_frab_xml_export"
    "test_schedule_frab_xml_export_control_char"
    "test_schedule_page_text_list"
    "test_schedule_page_text_table"
    "test_schedule_page_text_wrong_format"
    "test_versioned_schedule_page"
    # Test is racy
    "test_can_reset_password_by_email"
    #  assert 'tests.dummy_app' in ['pretalx_pages']
    "test_event_wizard_plugin_form_init_creates_field_for_installed_plugins"
  ];

  passthru = {
+2 −2
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@

buildPythonPackage rec {
  pname = "pretalx-downstream";
  version = "1.3.1";
  version = "1.5.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pretalx";
    repo = "pretalx-downstream";
    rev = "v${version}";
    hash = "sha256-Q9519jNKQUeNCHg3ivjYyQm1ePMxp/bhtcJAselQiiM=";
    hash = "sha256-sYdaG1F2jprSnzvVgxRyDrKzeQh9H7IKS/T3lObdvzc=";
  };

  build-system = [ setuptools ];
+2 −2
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@

buildPythonPackage rec {
  pname = "pretalx-media-ccc-de";
  version = "1.6.0";
  version = "1.7.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pretalx";
    repo = "pretalx-media-ccc-de";
    rev = "v${version}";
    hash = "sha256-QyX/hmDom2QHiaTH0EFg2jxzochQaFQ4AOQ2vM6yofU=";
    hash = "sha256-2a8AHP7G30K7Y8skmKnyoy/I9bpwgsUChf7s7G2nBZE=";
  };

  build-system = [ setuptools ];
+2 −2
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@

buildPythonPackage rec {
  pname = "pretalx-pages";
  version = "1.8.0";
  version = "1.9.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pretalx";
    repo = "pretalx-pages";
    tag = "v${version}";
    hash = "sha256-iRmDYjq08UkA/2pyUUK/DUuNbLNn/KSNQGiU1o1gTWw=";
    hash = "sha256-2xrkUxOXLR8ccdpkTpDQOV75vkPzkKqodTGf9aqVU0Q=";
  };

  build-system = [ setuptools ];
+2 −2
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@

buildPythonPackage rec {
  pname = "pretalx-public-voting";
  version = "1.9.0";
  version = "1.10.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pretalx";
    repo = "pretalx-public-voting";
    rev = "v${version}";
    hash = "sha256-VslvZkmRy7f+rBd9re46WlmASyk01//N9+jajaSfKG4=";
    hash = "sha256-nvMDOvxVJ97JBAQFi4BuMkdtWLODnopfFCoPzExbu00=";
  };

  build-system = [ setuptools ];
Loading