python312Packages.django-q2: init at 1.7.4; mailmanPackages.hyperkitty: 1.3.9...

diff --git a/pyproject.toml b/pyproject.toml

index 9a83e90..07068ac 100644

--- a/pyproject.toml

+++ b/pyproject.toml

@@ -67,13 +67,15 @@ pytest-cov = "^2.12.0"

 black = { version = "^21.5b1", allow-prereleases = true }

 isort = {extras = ["requirements_deprecated_finder"], version = "^5.8.0"}

-[tool.poetry.extras]

+[build-system]

 requires = ["poetry_core>=1.0.0"]

-build-backend = ["poetry.core.masonry.api"]

+build-backend = "poetry.core.masonry.api"

+

+[tool.poetry.extras]

 testing = ["django-redis", "croniter", "hiredis", "psutil", "iron-mq", "boto3", "pymongo"]

 rollbar = ["django-q-rollbar"]

 sentry = ["django-q-sentry"]

 [tool.isort]

 profile = "black"

-multi_line_output = 3

\ No newline at end of file

+multi_line_output = 3

{

  lib,

  stdenv,

  arrow,

  blessed,

  bson,

  buildPythonPackage,

  croniter,

  django,

  django-picklefield,

  django-redis,

  fetchFromGitHub,

  future,

  hiredis,

  pkgs,

  poetry-core,

  pytest-django,

  pytest-mock,

  pytestCheckHook,

  pythonOlder,

  redis,

  setuptools,

}:

buildPythonPackage rec {

  pname = "django-q";

  version = "1.3.9";

  pname = "django-q2";

  version = "1.7.4";

  pyproject = true;

  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {

    owner = "Koed00";

    repo = "django-q";

    owner = "django-q2";

    repo = "django-q2";

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

    hash = "sha256-gFSrAl3QGoJEJfvTTvLQgViPPjeJ6BfvgEwgLLo+uAA=";

    hash = "sha256-mp/IZkfT64xW42B1TEO6lSHxvLQbeH4td8vqZH7wUxM=";

  };

  patches = [ ./pep-621.patch ];

  postPatch = ''

    substituteInPlace django_q/tests/settings.py \

      --replace-fail "HiredisParser" "_HiredisParser"

  '';

  build-system = [

    poetry-core

  ];

  pythonRelaxDeps = [

    "redis"

  ];

  dependencies = [

    django-picklefield

    arrow

    blessed

    bson # required for mongodb but undocumented

    django

    future

    setuptools # for pkg_resources

    django-picklefield

  ];

  nativeCheckInputs = [

    blessed

    croniter

    django-redis

    # pyredis refuses to load with hiredis<3.0.0

    (hiredis.overrideAttrs (

      new: old: {

        version = "3.1.0";

        src = old.src.override {

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

          hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg=";

        };

      }

    ))

    pytest-django

    pytest-mock

    pytestCheckHook

  ] ++ django-redis.optional-dependencies.hiredis;

  ];

  pythonImportsCheck = [ "django_q" ];

    kill $REDIS_PID

  '';

  # don't bother with two more servers to test

  env = {

    MONGO_HOST = "127.0.0.1";

    REDIS_HOST = "127.0.0.1";

  };

  disabledTests = [

    "test_disque"

    # requires a running mongodb

    "test_mongo"

  ];

  doCheck = !stdenv.hostPlatform.isDarwin;

  disabledTestPaths = [

    "django_q/tests/test_commands.py"

  ];

  pytestFlagsArray = [ "-vv" ];

  meta = with lib; {

    description = "Multiprocessing distributed task queue for Django";

    homepage = "https://django-q.readthedocs.org";

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

    description = "Multiprocessing distributed task queue for Django based on Django-Q";

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

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

    license = licenses.mit;

    maintainers = with maintainers; [ gador ];

    # django-q is unmaintained at the moment

    # https://github.com/Koed00/django-q/issues/733

    broken = lib.versionAtLeast redis.version "5";

    maintainers = with maintainers; [ SuperSandro2000 ];

  };

}

with python3.pkgs;

buildPythonPackage rec {

  pname = "HyperKitty";

  version = "1.3.9";

  pname = "hyperkitty";

  version = "1.3.12";

  pyproject = true;

  disabled = pythonOlder "3.10";

  src = fetchurl {

    url = "https://gitlab.com/mailman/hyperkitty/-/releases/${version}/downloads/hyperkitty-${version}.tar.gz";

    hash = "sha256-BfhCh4zZcfwoIfubW/+MUWXwh1yFOH/jpRdQdsj6lME=";

    hash = "sha256-3rWCk37FvJ6pwdXYa/t2pNpCm2Dh/qb9aWTnxmfPFh0=";

  };

  nativeBuildInputs = [

  build-system = [

    pdm-backend

  ];

  propagatedBuildInputs = [

  dependencies = [

    django

    django-gravatar2

    django-haystack

    django-mailman3

    django-q

    django-q2

    django-compressor

    django-extensions

    djangorestframework

        [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291

      */

      # django-q tests fail with redis 5.0.0.

      # https://gitlab.com/mailman/hyperkitty/-/issues/493

      redis = super.redis.overridePythonAttrs ({ pname, ... }: rec {

        version = "4.6.0";

        src = fetchPypi {

          inherit pname version;

          hash = "sha256-WF3FFrnrBCphnvCjnD19Vf6BvbTfCaUsnN3g0Hvxqn0=";

      # the redis python library only supports hiredis 3+ from version 5.1.0 onwards

      hiredis = super.hiredis.overrideAttrs (new: { src, ... }: {

        version = "3.1.0";

        src = src.override {

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

          hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg=";

        };

      });

    })

    nodejs = nodejs_18;

  };

  mailmanPackages = callPackage ../servers/mail/mailman {

    # Hyperkitty test fails with 3.12:

    # https://gitlab.com/mailman/hyperkitty/-/issues/514

    python3 = python311;

  };

  mailmanPackages = callPackage ../servers/mail/mailman { };

  inherit (mailmanPackages) mailman mailman-hyperkitty;

  mailman-web = mailmanPackages.web;