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

Merge pull request #323781 from mweinelt/pretix-2024.6.0 

pretix: 2024.5.0 -> 2024.6.0
parents f4f7f873 0b9530c7

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

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

    "css-inline"

    "cssutils"

    "django-compressor"

    "django-csp"

    "django-filter"

    "django-hierarkey"

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

+14 −4
Original line number Diff line number Diff line
@@ -34,17 +34,19 @@ let 
      };



      pretix-plugin-build = self.callPackage ./plugin-build.nix { };



      sentry-sdk = super.sentry-sdk_2;

    };

  };



  pname = "pretix";

  version = "2024.5.0";

  version = "2024.6.0";



  src = fetchFromGitHub {

    owner = "pretix";

    repo = "pretix";

    rev = "refs/tags/v${version}";

    hash = "sha256-dLzCugbRQSGuOwe99a3WLMffisyvYWNRdSdcdW9knjY=";

    hash = "sha256-erI3Ai6zwNSvMiF3YKfnU9ePb9R92rfi5rsxfAOh6EQ=";

  };



  npmDeps = buildNpmPackage {
@@ -52,7 +54,7 @@ let 
    inherit version src;



    sourceRoot = "${src.name}/src/pretix/static/npm_dir";

    npmDepsHash = "sha256-SEgAC3dmnxG1xM9QZQ/e+6NFOwXU3tXlbfZCzrAMFO0=";

    npmDepsHash = "sha256-//CLPnx5eUxIHIUGc7x2UF8qsfAYRtvHbHXSDNtI/eI=";



    dontBuild = true;
@@ -97,7 +99,8 @@ python.pkgs.buildPythonApplication rec { 
      --replace-fail "protobuf==5.27.*" protobuf \

      --replace-fail "pycryptodome==3.20.*" pycryptodome \

      --replace-fail "python-dateutil==2.9.*" python-dateutil \

      --replace-fail "requests==2.32.*" "requests" \

      --replace-fail "requests==2.31.*" "requests" \

      --replace-fail "sentry-sdk==2.5.*" "sentry-sdk>=2" \

      --replace-fail "stripe==7.9.*" stripe

  '';
@@ -226,6 +229,13 @@ python.pkgs.buildPythonApplication rec { 
  disabledTests = [

    # unreliable around day changes

    "test_order_create_invoice"



    # outdated translation files

    # https://github.com/pretix/pretix/commit/c4db2a48b6ac81763fa67475d8182aee41c31376

    "test_different_dates_spanish"

    "test_same_day_spanish"

    "test_same_month_spanish"

    "test_same_year_spanish"

  ];



  preCheck = ''

pkgs/development/python-modules/django-compressor/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 


buildPythonPackage rec {

  pname = "django-compressor";

  version = "4.4";

  version = "4.5";

  pyproject = true;



  src = fetchPypi {

    pname = "django_compressor";

    inherit version;

    hash = "sha256-GwrMnPup9pvDjnxB2psNcKILyVWHtkP/75YJz0YGT2c=";

    hash = "sha256-nZjJBbdBvmywmtgowdIqn/kkTdCII+KSavjd0YccPGU=";

  };



  build-system = [

pkgs/development/python-modules/django-hijack/default.nix

+18 −24
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 
  nix-update-script,



  # build-system

  gettext,

  flit-gettext,

  flit-scm,

  nodejs,

  npmHooks,

  setuptools-scm,



  # dependencies

  django,
@@ -21,58 +21,52 @@ 


buildPythonPackage rec {

  pname = "django-hijack";

  version = "3.4.5";

  format = "setuptools";

  version = "3.5.4";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "django-hijack";

    repo = "django-hijack";

    rev = "refs/tags/${version}";

    hash = "sha256-FXh5OFMTjsKgjEeIS+CiOwyGOs4AisJA+g49rCILDsQ=";

    hash = "sha256-d8rKn4Hab7y/e/VLhVfr3A3TUhoDtjP7RhCj+o6IbyE=";

  };



  postPatch = ''

    substituteInPlace setup.py \

      --replace 'cmd = ["npm", "ci"]' 'cmd = ["true"]' \

      --replace 'f"{self.build_lib}/{name}.mo"' 'f"{name}.mo"'

    sed -i "/addopts/d" pyproject.toml



    sed -i "/addopts/d" setup.cfg

  # missing integrity hashes for yocto-queue, yargs-parser

    cp ${./package-lock.json} package-lock.json

  '';



  npmDeps = fetchNpmDeps {

    inherit src;

    hash = "sha256-cZEr/7FW4vCR8gpraT+/rPwYK9Xn22b5WH7lnuK5L4U=";

    inherit src postPatch;

    hash = "sha256-npAFpdqGdttE4facBimS/y2SqwnCvOHJhd60SPR/IaA=";

  };



  nativeBuildInputs = [

    gettext

  build-system = [

    flit-gettext

    flit-scm

    nodejs

    npmHooks.npmConfigHook

    setuptools-scm

  ];



  propagatedBuildInputs = [ django ];

  dependencies = [ django ];



  nativeCheckInputs = [

    pytestCheckHook

    pytest-django

  ];



  env.DJANGO_SETTINGS_MODULE = "hijack.tests.test_app.settings";



  pytestFlagsArray = [

    "--pyargs"

    "hijack"

    "-W"

    "ignore::DeprecationWarning"

  ];

  preCheck = ''

    export DJANGO_SETTINGS_MODULE=hijack.tests.test_app.settings

  '';



  # needed for npmDeps update

  passthru.updateScript = nix-update-script { };



  meta = with lib; {

    description = "Allows superusers to hijack (=login as) and work on behalf of another user";

    homepage = "https://github.com/arteria/django-hijack";

    homepage = "https://github.com/django-hijack/django-hijack";

    changelog = "https://github.com/django-hijack/django-hijack/releases/tag/${version}";

    license = licenses.mit;

    maintainers = with maintainers; [ ris ];

pkgs/development/python-modules/django-hijack/package-lock.json

0 → 100644
+7875 −0

File added.

Preview size limit exceeded, changes collapsed.