From fa814e86a3db82ef392b1a5a5eb9597632d75420 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 May 2023 18:36:16 +0200 Subject: [PATCH 1/2] python310Packages.django-bootstrap4: init at 3.0.1 --- .../django-bootstrap4/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/django-bootstrap4/default.nix diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix new file mode 100644 index 000000000000..2e9530266d17 --- /dev/null +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, beautifulsoup4 + +# tests +, django +, python +}: + +buildPythonPackage rec { + pname = "django-bootstrap4"; + version = "3.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "zostera"; + repo = "django-bootstrap4"; + rev = "v${version}"; + hash = "sha256-5t6b/1921AMDqoYg7XC2peGxOBFE8XlvgGjHnTlQa4c="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + ]; + + pythonImportsCheck = [ + "bootstrap4" + ]; + + nativeCheckInputs = [ + (django.override { withGdal = true; }) + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} manage.py test -v1 --noinput + runHook postCheck + ''; + + meta = with lib; { + description = "Bootstrap 4 integration with Django"; + homepage = "https://github.com/zostera/django-bootstrap4"; + changelog = "https://github.com/zostera/django-bootstrap4/blob/${src.rev}/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 566be5f269c5..e0ee0eca7fe4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2602,6 +2602,8 @@ self: super: with self; { django-bootstrap3 = callPackage ../development/python-modules/django-bootstrap3 { }; + django-bootstrap4 = callPackage ../development/python-modules/django-bootstrap4 { }; + django-cache-url = callPackage ../development/python-modules/django-cache-url { }; django-cacheops = callPackage ../development/python-modules/django-cacheops { }; From de1af66dcdbb8bed7d60f7d7025f7695a659068d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 May 2023 21:40:34 +0200 Subject: [PATCH 2/2] gdal: Fix tests on darwin by allowing local network access. --- pkgs/development/libraries/gdal/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 894bed5f5357..189c6f3a41a6 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -203,6 +203,8 @@ stdenv.mkDerivation rec { popd # ../autotest ''; + __darwinAllowLocalNetworking = true; + meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/";