From 84f0e42d595274b6630fa9a7a35b5cb8c92c58b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 26 Feb 2023 21:02:19 +0000 Subject: [PATCH 1/7] python310Packages.django-bootstrap3: init at 23.1 Bootstrap 3 integration with Django. --- .../django-bootstrap3/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/django-bootstrap3/default.nix diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix new file mode 100644 index 000000000000..950cf9ef812c --- /dev/null +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, django +, pytest-django +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "django-bootstrap3"; + version = "23.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-cJW3xmqJ87rreOoCh5nr15XSlzn8hgJGBCLnwqGUrTA="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + django + ]; + + pythonImportsCheck = [ + "bootstrap3" + ]; + + nativeCheckInputs = [ + pytest-django + pytestCheckHook + ]; + + env.DJANGO_SETTINGS_MODULE = "tests.app.settings"; + + meta = with lib; { + description = "Bootstrap 3 integration for Django"; + homepage = "https://github.com/zostera/django-bootstrap3"; + changelog = "https://github.com/zostera/django-bootstrap3/blob/${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} + + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 329a14efaa8b..44a194df4603 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2576,6 +2576,8 @@ self: super: with self; { django-autocomplete-light = callPackage ../development/python-modules/django-autocomplete-light { }; + django-bootstrap3 = callPackage ../development/python-modules/django-bootstrap3 { }; + django-cache-url = callPackage ../development/python-modules/django-cache-url { }; django-cacheops = callPackage ../development/python-modules/django-cacheops { }; From a2819ed80d8d08f6c7da125d4fb67c39837e10c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 26 Feb 2023 21:20:58 +0000 Subject: [PATCH 2/7] python310Packages.django-jquery-js: init at 3.1.1 jQuery, bundled up so apps can depend on it. --- .../django-jquery-js/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/django-jquery-js/default.nix diff --git a/pkgs/development/python-modules/django-jquery-js/default.nix b/pkgs/development/python-modules/django-jquery-js/default.nix new file mode 100644 index 000000000000..2487dc61e0fc --- /dev/null +++ b/pkgs/development/python-modules/django-jquery-js/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromBitbucket +, django +}: + +buildPythonPackage rec { + pname = "django-jquery-js"; + version = "3.1.1"; + format = "setuptools"; + + src = fetchFromBitbucket { + owner = "tim_heap"; + repo = "django-jquery"; + rev = "refs/tags/v${version}"; + hash = "sha256-TzMo31jFhcvlrmq2TJgQyds9n8eATaChnyhnQ7bwdzs="; + }; + + buildInputs = [ + django + ]; + + pythonImportsCheck = [ + "jquery" + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "jQuery, bundled up so apps can depend upon it"; + homepage = "https://bitbucket.org/tim_heap/django-jquery"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44a194df4603..7e50aca3c718 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2651,6 +2651,8 @@ self: super: with self; { django-jinja = callPackage ../development/python-modules/django-jinja2 { }; + django-jquery-js = callPackage ../development/python-modules/django-jquery-js { }; + django-js-asset = callPackage ../development/python-modules/django-js-asset { }; django-js-reverse = callPackage ../development/python-modules/django-js-reverse { }; From 8cc14b775d182e7e05ed4990307f223f2716726a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 26 Feb 2023 21:25:48 +0000 Subject: [PATCH 3/7] python310Packages.django-formset-js-improved: init at 0.5.0.3 This is a fork of django-formset-js that adds support for reordering and nested formsets. --- .../django-formset-js-improved/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/django-formset-js-improved/default.nix diff --git a/pkgs/development/python-modules/django-formset-js-improved/default.nix b/pkgs/development/python-modules/django-formset-js-improved/default.nix new file mode 100644 index 000000000000..b14306f06f78 --- /dev/null +++ b/pkgs/development/python-modules/django-formset-js-improved/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, django-jquery-js +}: + +buildPythonPackage rec { + pname = "django-formset-js-improved"; + version = "0.5.0.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pretix"; + repo = "django-formset-js"; + rev = "refs/tags/${version}"; + hash = "sha256-bOM24ldXk9WeV0jl6LIJB3BJ5hVWLA1PJTBBnJBoprU="; + }; + + buildInputs = [ + django + ]; + + propagatedBuildInputs = [ + django-jquery-js + ]; + + pythonImportsCheck = [ + "djangoformsetjs" + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "A wrapper for a JavaScript formset helper"; + homepage = "https://github.com/pretix/django-formset-js"; + license = licenses.bsd2; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e50aca3c718..0383f3363262 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2628,6 +2628,8 @@ self: super: with self; { django-formtools = callPackage ../development/python-modules/django-formtools { }; + django-formset-js-improved = callPackage ../development/python-modules/django-formset-js-improved { }; + django-graphiql-debug-toolbar = callPackage ../development/python-modules/django-graphiql-debug-toolbar { }; django-gravatar2 = callPackage ../development/python-modules/django-gravatar2 { }; From 9628dfdca89be7999e09ab762c766af4f757648a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 26 Feb 2023 22:12:17 +0000 Subject: [PATCH 4/7] python310Packages.python-creole: init at 1.4.10 Creole markup tools written in Python. --- .../python-modules/python-creole/default.nix | 89 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 91 insertions(+) create mode 100644 pkgs/development/python-modules/python-creole/default.nix diff --git a/pkgs/development/python-modules/python-creole/default.nix b/pkgs/development/python-modules/python-creole/default.nix new file mode 100644 index 000000000000..a02a08e2b44b --- /dev/null +++ b/pkgs/development/python-modules/python-creole/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, runtimeShell + +# build +, poetry-core + +# propagates +, docutils + +# tests +, pytestCheckHook +, readme_renderer +, textile +}: + +buildPythonPackage rec { + pname = "python-creole"; + version = "1.4.10"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jedie"; + repo = "python-creole"; + rev = "refs/tags/v${version}"; + hash = "sha256-8pXOnLNjhIv0d+BqjW8wlb6BT6CmFHSsxn5wLOv3LBQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + + substituteInPlace Makefile \ + --replace "/bin/bash" "${runtimeShell}" + + sed -i "/-cov/d" pytest.ini + ''; + + propagatedBuildInputs = [ + docutils + ]; + + pythonImportsCheck = [ + "creole" + ]; + + nativeCheckInputs = [ + pytestCheckHook + readme_renderer + textile + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + disabledTests = [ + # macro didn't expect argument + "test_macro_wrong_arguments_quite" + "test_macro_wrong_arguments_with_error_report" + # rendering mismatches, likely docutils version mismatch + "test_headlines1" + "test_simple_table" + ]; + + disabledTestPaths = [ + # requires poetry + "creole/tests/test_Makefile.py" + # requires poetry_publish + "creole/publish.py" + "creole/tests/test_project_setup.py" + # rendering differencenes, likely docutils version mismatch + "creole/tests/test_cross_compare_rest.py" + "creole/tests/test_rest2html.py" + ]; + + meta = with lib; { + description = "Creole markup tools written in Python"; + homepage = "https://github.com/jedie/python-creole"; + changelog = "https://github.com/jedie/python-creole/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0383f3363262..c48c4b96bf83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7498,6 +7498,8 @@ self: super: with self; { python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; + python-creole = callPackage ../development/python-modules/python-creole { }; + python-crfsuite = callPackage ../development/python-modules/python-crfsuite { }; python-csxcad = callPackage ../development/python-modules/python-csxcad { }; From ed28d79fd468d1da51d7341395c2846f11fd1bf0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 26 Feb 2023 22:12:53 +0000 Subject: [PATCH 5/7] python310Packages.django-markup: init at 1.6 A generic Django application to convert text with specific markup to html. --- .../python-modules/django-markup/default.nix | 75 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/development/python-modules/django-markup/default.nix diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix new file mode 100644 index 000000000000..d54936c55539 --- /dev/null +++ b/pkgs/development/python-modules/django-markup/default.nix @@ -0,0 +1,75 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django + +# optionals +, bleach +, docutils +, markdown +, pygments +, python-creole +, smartypants +, textile + +# tests +, pytest-django +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "django-markup"; + version = "1.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bartTC"; + repo = "django-markup"; + rev = "refs/tags/v${version}"; + hash = "sha256-Hh+3KxFE6sSIqRowyZ1Pz6NmBaTbltZaEhSjFrw760Q="; + }; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + buildInputs = [ + django + ]; + + passthru.optional-dependencies = { + all_filter_dependencies = [ + bleach + docutils + markdown + pygments + python-creole + smartypants + textile + ]; + }; + + pythonImportsCheck = [ + "django_markup" + ]; + + nativeCheckInputs = [ + pytest-django + pytestCheckHook + ] ++ passthru.optional-dependencies.all_filter_dependencies; + + env.DJANGO_SETTINGS_MODULE = "django_markup.tests"; + + disabledTests = [ + # https://github.com/bartTC/django-markup/issues/40 + "test_rst_with_pygments" + ]; + + meta = with lib; { + description = "Generic Django application to convert text with specific markup to html."; + homepage = "https://github.com/bartTC/django-markup"; + changelog = "https://github.com/bartTC/django-markup/blob/v${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c48c4b96bf83..63e3331202f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2665,6 +2665,8 @@ self: super: with self; { django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; + django-markup = callPackage ../development/python-modules/django-markup { }; + django-model-utils = callPackage ../development/python-modules/django-model-utils { }; django-modelcluster = callPackage ../development/python-modules/django_modelcluster { }; From db5206b982434c26419e21922c65d1563756ab48 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 26 Feb 2023 22:56:11 +0000 Subject: [PATCH 6/7] python310Packages.django-countries: init at 7.5.1 A Django application that provides country choices for use with forms, flag icons static files, and a country field for models. --- .../django-countries/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/django-countries/default.nix diff --git a/pkgs/development/python-modules/django-countries/default.nix b/pkgs/development/python-modules/django-countries/default.nix new file mode 100644 index 000000000000..95da90866e65 --- /dev/null +++ b/pkgs/development/python-modules/django-countries/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, setuptools + +# propagates +, asgiref +, typing-extensions + +# tests +, django +, djangorestframework +, graphene-django +, pytestCheckHook +, pytest-django +}: + +buildPythonPackage rec { + pname = "django-countries"; + version = "7.5.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "SmileyChris"; + repo = "django-countries"; + rev = "refs/tags/v${version}"; + hash = "sha256-se6s0sgIfMLW0sIMp/3vK4KdDPQ5ahg6OQCDAs4my4M="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + asgiref + typing-extensions + ]; + + nativeCheckInputs = [ + django + djangorestframework + graphene-django + pytestCheckHook + pytest-django + ]; + + meta = with lib; { + description = "Provides a country field for Django models"; + longDescription = '' + A Django application that provides country choices for use with + forms, flag icons static files, and a country field for models. + ''; + homepage = "https://github.com/SmileyChris/django-countries"; + changelog = "https://github.com/SmileyChris/django-countries/blob/v${version}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63e3331202f3..5badc8787045 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2608,6 +2608,8 @@ self: super: with self; { django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; + django-countries = callPackage ../development/python-modules/django-countries { }; + django-crispy-forms = callPackage ../development/python-modules/django-crispy-forms { }; django-cryptography = callPackage ../development/python-modules/django-cryptography { }; From 68bd81231ad40850af59bbd2865f99d2bd8fdeb3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Feb 2023 23:21:01 +0100 Subject: [PATCH 7/7] python310Packages.django-hierarkey: init at 1.1.0 Flexible and powerful hierarchical key-value store for your Django models --- .../django-hierarkey/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/django-hierarkey/default.nix diff --git a/pkgs/development/python-modules/django-hierarkey/default.nix b/pkgs/development/python-modules/django-hierarkey/default.nix new file mode 100644 index 000000000000..77f33f0b526c --- /dev/null +++ b/pkgs/development/python-modules/django-hierarkey/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# propagates +, python-dateutil + +# tests +, django-extensions +, pytest-django +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "django-hierarkey"; + version = "1.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "raphaelm"; + repo = "django-hierarkey"; + # https://github.com/raphaelm/django-hierarkey/commit/c81ace02ca404a8756e2931bb6faf55b6365e140 + rev = "c81ace02ca404a8756e2931bb6faf55b6365e140"; + hash = "sha256-sCARyTjuuAUptlOsFmApnsQpcksP+uYnq0lukXDMcuk="; + }; + + propagatedBuildInputs = [ + python-dateutil + ]; + + pythonImportsCheck = [ + "hierarkey" + ]; + + nativeCheckInputs = [ + django-extensions + pytest-django + pytestCheckHook + ]; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + pytestFlagsArray = [ + "tests" + ]; + + meta = with lib; { + description = "Flexible and powerful hierarchical key-value store for your Django models"; + homepage = "https://github.com/raphaelm/django-hierarkey"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5badc8787045..9d3bbc6d70e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2644,6 +2644,8 @@ self: super: with self; { django-health-check = callPackage ../development/python-modules/django-health-check { }; + django-hierarkey = callPackage ../development/python-modules/django-hierarkey { }; + django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; django_hijack = callPackage ../development/python-modules/django-hijack { };