From dbff342f649dadffb5f41f426c13ab5882020970 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 29 Aug 2024 13:14:32 +0200 Subject: [PATCH] python3Packages.django-crispy-bootstrap*: move setuptools into build-system, sort dependencies --- .../django-crispy-bootstrap3/default.nix | 6 ++++-- .../django-crispy-bootstrap4/default.nix | 10 ++++++---- .../django-crispy-bootstrap5/default.nix | 10 ++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix index caf2f6655bad..3fe7e0c74978 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap3/default.nix @@ -21,15 +21,16 @@ buildPythonPackage rec { hash = "sha256-w5CGWf14Wa8hndpk5r4hlz6gGykvRL+1AhA5Pz5Ejtk="; }; + build-system = [ setuptools ]; + dependencies = [ django - setuptools + django-crispy-forms ]; nativeCheckInputs = [ pytest-django pytestCheckHook - django-crispy-forms ]; pythonImportsCheck = [ "crispy_bootstrap3" ]; @@ -37,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bootstrap 3 template pack for django-crispy-forms"; homepage = "https://github.com/django-crispy-forms/crispy-bootstrap3"; + changelog = "https://github.com/django-crispy-forms/crispy-bootstrap3/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ erictapen ]; }; diff --git a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix index 7db68ffc9ccd..eb533ddec43f 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap4"; version = "2024.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "django-crispy-forms"; @@ -21,15 +21,16 @@ buildPythonPackage rec { hash = "sha256-upHrNDhoY+8qD+aeXPcY452xUIyYjW0apf8mVo6pqY4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django - setuptools + django-crispy-forms ]; nativeCheckInputs = [ pytest-django pytestCheckHook - django-crispy-forms ]; pythonImportsCheck = [ "crispy_bootstrap4" ]; @@ -37,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bootstrap 4 template pack for django-crispy-forms"; homepage = "https://github.com/django-crispy-forms/crispy-bootstrap4"; + changelog = "https://github.com/django-crispy-forms/crispy-bootstrap4/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix index 6fc014bcb38a..87ccaa6a9e6a 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap5"; version = "2024.2"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "django-crispy-forms"; @@ -21,15 +21,16 @@ buildPythonPackage rec { hash = "sha256-ehcDwy53pZCqouvUm6qJG2FJzlFZaygTZxNYPOqH1q0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django - setuptools + django-crispy-forms ]; nativeCheckInputs = [ pytest-django pytestCheckHook - django-crispy-forms ]; pythonImportsCheck = [ "crispy_bootstrap5" ]; @@ -37,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bootstrap 5 template pack for django-crispy-forms"; homepage = "https://github.com/django-crispy-forms/crispy-bootstrap5"; + changelog = "https://github.com/django-crispy-forms/crispy-bootstrap5/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; };