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

pretalx: 2024.2.1 -> 2024.3.0 (#350361)

parents b4c90d34 a12121e0

nixos/modules/services/web-apps/pretalx.nix

+11 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ let 
    ]

    ++ finalPackage.optional-dependencies.redis

    ++ lib.optionals cfg.celery.enable [ celery ]

    ++ lib.optionals (cfg.settings.database.backend == "mysql") finalPackage.optional-dependencies.mysql

    ++ lib.optionals (cfg.settings.database.backend == "postgresql") finalPackage.optional-dependencies.postgres;

  };

in
@@ -184,6 +183,17 @@ in 
            };

          };



          files = {

            upload_limit = lib.mkOption {

              type = lib.types.ints.positive;

              default = 10;

              example = 50;

              description = ''

                Maximum file upload size in MiB.

              '';

            };

          };



          filesystem = {

            data = lib.mkOption {

              type = lib.types.path;

pkgs/applications/networking/powerdns-admin/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ let 
  python = python3;



  pythonDeps = with python.pkgs; [

    distutils

    flask flask-assets flask-login flask-sqlalchemy flask-migrate flask-seasurf flask-mail flask-session flask-session-captcha flask-sslify

    mysqlclient psycopg2 sqlalchemy

    certifi cffi configobj cryptography bcrypt requests python-ldap pyotp qrcode dnspython

pkgs/by-name/fd/fdroidserver/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -48,7 +48,10 @@ python3Packages.buildPythonApplication { 


  nativeBuildInputs = [ installShellFiles ];



  build-system = with python3Packages; [ babel ];

  build-system = with python3Packages; [

    setuptools

    babel

  ];



  dependencies = with python3Packages; [

    androguard

pkgs/by-name/pa/pacu/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ python.pkgs.buildPythonApplication rec { 
    "sqlalchemy-utils"

    "sqlalchemy"

    "pycognito"

    "qrcode"

    "urllib3"

  ];

pkgs/by-name/pr/pretalx/package.nix

+11 −6
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ let 
  python = python3.override {

    self = python;

    packageOverrides = final: prev: {

      django = prev.django_5;



      django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec {

        version = "3.0.0";

        src = oldAttrs.src.override {
@@ -26,16 +28,22 @@ let 
        # fails with some assertions

        doCheck = false;

      });



      django-extensions = prev.django-extensions.overridePythonAttrs {

        # Compat issues with Django 5.1

        # https://github.com/django-extensions/django-extensions/issues/1885

        doCheck = false;

      };

    };

  };



  version = "2024.2.1";

  version = "2024.3.0";



  src = fetchFromGitHub {

    owner = "pretalx";

    repo = "pretalx";

    rev = "v${version}";

    hash = "sha256-D0ju9aOVy/new9GWqyFalZYCisdmM7irWSbn2TVCJYQ=";

    hash = "sha256-Xv3VwYrwCGgOUf1ilD58ATj+bkehF9+im4124ivCaEU=";

  };



  meta = with lib; {
@@ -54,7 +62,7 @@ let 


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



    npmDepsHash = "sha256-EAdeXdcC3gHun6BOHzvqpzv9+oDl1b/VTeNkYLiD+hA=";

    npmDepsHash = "sha256-i7awRuR7NxhpxN2IZuI01PsN6FjXht7BxTbB1k039HA=";



    npmBuildScript = "build";
@@ -146,9 +154,6 @@ python.pkgs.buildPythonApplication rec { 
  ++ plugins;



  optional-dependencies = {

    mysql = with python.pkgs; [

      mysqlclient

    ];

    postgres = with python.pkgs; [

      psycopg2

    ];