Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'

Conflicts:
	nixpkgs/nixos/modules/misc/documentation.nix
	nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/go-modules/generic/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
	nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
	nixpkgs/pkgs/servers/mail/mailman/web.nix
	nixpkgs/pkgs/top-level/aliases.nix
	nixpkgs/pkgs/top-level/all-packages.nix
	nixpkgs/pkgs/top-level/impure.nix

1 files changed, 82 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/django-redis/default.nix b/nixpkgs/pkgs/development/python-modules/django-redis/default.nix
new file mode 100644
index 000000000000..b088876b3e4a
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/django-redis/default.nix
@@ -0,0 +1,82 @@
+{ lib
+, fetchFromGitHub
+, pythonOlder
+, buildPythonPackage
+
+# propagated
+, django
+, hiredis
+, lz4
+, msgpack
+, redis
+
+# testing
+, pkgs
+, pytest-django
+, pytest-mock
+, pytestCheckHook
+}:
+
+let
+  pname = "django-redis";
+  version = "5.1.0";
+in
+buildPythonPackage {
+  inherit pname version;
+  format = "setuptools";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "jazzband";
+    repo = "django-redis";
+    rev = version;
+    sha256 = "sha256-S94qH2W5e65yzGfPxpwBUKhvvVS0Uc/zSyo66bnvzf4=";
+  };
+
+  postPatch = ''
+    sed -i '/-cov/d' setup.cfg
+  '';
+
+  propagatedBuildInputs = [
+    django
+    hiredis
+    lz4
+    msgpack
+    redis
+  ];
+
+  pythonImportsCheck = [
+    "django_redis"
+  ];
+
+  DJANGO_SETTINGS_MODULE = "tests.settings.sqlite";
+
+  preCheck = ''
+    ${pkgs.redis}/bin/redis-server &
+  '';
+
+  checkInputs = [
+    pytest-django
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # ModuleNotFoundError: No module named 'test_cache_options'
+    "test_custom_key_function"
+    # ModuleNotFoundError: No module named 'test_client'
+    "test_delete_pattern_calls_get_client_given_no_client"
+    "test_delete_pattern_calls_make_pattern"
+    "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given"
+    "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given"
+    "test_delete_pattern_calls_scan_iter"
+    "test_delete_pattern_calls_delete_for_given_keys"
+  ];
+
+  meta = with lib; {
+    description = "Full featured redis cache backend for Django";
+    homepage = "https://github.com/jazzband/django-redis";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ hexa ];
+  };
+}