From b92477f4ece47e8dab845c5bb996874f1b212947 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 18 Apr 2025 13:38:49 +0200 Subject: [PATCH] python312Packages.wagtail: cleanup, add missing django-tasks dependency --- .../python-modules/wagtail/default.nix | 49 ++++++++++--------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index ed6bfd08ec9d..b653033193f0 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -1,58 +1,61 @@ { lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies anyascii, beautifulsoup4, - buildPythonPackage, - callPackage, django, django-filter, django-modelcluster, django-taggit, + django-tasks, django-treebeard, djangorestframework, draftjs-exporter, - fetchPypi, - html5lib, - l18n, laces, openpyxl, permissionedforms, pillow, - pythonOlder, requests, telepath, willow, + + # tests + callPackage, }: buildPythonPackage rec { pname = "wagtail"; version = "6.4.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-zsPm1JIKbRePoetvSvgLNw/dVXDtkkuXkQThV/EMoJc="; + src = fetchFromGitHub { + owner = "wagtail"; + repo = "wagtail"; + tag = "v${version}"; + hash = "sha256-2qixbJK3f+3SBnsfVEcObFJmuBvE2J9o3LIkILZQRLQ="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "django-filter>=23.3,<24" "django-filter>=23.3,<24.3" - ''; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ anyascii beautifulsoup4 django - django-treebeard django-filter django-modelcluster django-taggit + django-tasks + django-treebeard djangorestframework draftjs-exporter - html5lib - l18n laces openpyxl permissionedforms @@ -70,12 +73,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "wagtail" ]; - meta = with lib; { + meta = { description = "Django content management system focused on flexibility and user experience"; mainProgram = "wagtail"; homepage = "https://github.com/wagtail/wagtail"; changelog = "https://github.com/wagtail/wagtail/blob/v${version}/CHANGELOG.txt"; - license = licenses.bsd3; - maintainers = with maintainers; [ sephi ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sephi ]; }; }