summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2023-04-04 01:53:29 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2023-04-04 03:17:47 +0200
commit4a269e1afa72e97aeef00b3eae729a61d31a1180 (patch)
tree3067a1dc43bc82643ae2c130241665569debec21
parentba040c9d85cf106a3b9d81fa95314d7abaae18b9 (diff)
downloadnixpkgs-4a269e1afa72e97aeef00b3eae729a61d31a1180.tar
nixpkgs-4a269e1afa72e97aeef00b3eae729a61d31a1180.tar.gz
nixpkgs-4a269e1afa72e97aeef00b3eae729a61d31a1180.tar.bz2
nixpkgs-4a269e1afa72e97aeef00b3eae729a61d31a1180.tar.lz
nixpkgs-4a269e1afa72e97aeef00b3eae729a61d31a1180.tar.xz
nixpkgs-4a269e1afa72e97aeef00b3eae729a61d31a1180.tar.zst
nixpkgs-4a269e1afa72e97aeef00b3eae729a61d31a1180.zip
python310Packages.django_4: 4.1.7 -> 4.2
https://docs.djangoproject.com/en/4.2/releases/4.2/
-rw-r--r--pkgs/development/python-modules/django/4.nix32
1 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index db702d0ed7a..6ec2e8c9067 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -9,20 +9,20 @@
 , setuptools
 
 # patched in
-, fetchpatch
 , geos
 , gdal
 , withGdal ? false
 
-# propagated
+# propagates
 , asgiref
-, backports-zoneinfo
 , sqlparse
 
-# tests
-, aiosmtpd
+# extras
 , argon2-cffi
 , bcrypt
+
+# tests
+, aiosmtpd
 , docutils
 , geoip2
 , jinja2
@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "4.1.7";
+  version = "4.2";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RPcUuBxfGQ2dLdrQGlMv5QL6AcTLj68dCB9CZO0V3Ng=";
+    hash = "sha256-w24qsSgk4qw2r6iyUVpwxTx3QvDW6u+nMR7DeVWNuZc=";
   };
 
   patches = [
@@ -74,19 +74,23 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     asgiref
     sqlparse
-  ] ++ lib.optionals (pythonOlder "3.9") [
-    backports-zoneinfo
   ];
 
+  passthru.optional-dependencies = {
+    argon2 = [
+      argon2-cffi
+    ];
+    bcrypt = [
+      bcrypt
+    ];
+  };
+
   # Fails to import asgiref in ~200 tests
   # ModuleNotFoundError: No module named 'asgiref'
   doCheck = false;
 
   nativeCheckInputs = [
     aiosmtpd
-    argon2-cffi
-    asgiref
-    bcrypt
     docutils
     geoip2
     jinja2
@@ -102,7 +106,7 @@ buildPythonPackage rec {
     selenium
     tblib
     tzdata
-  ];
+  ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
 
   checkPhase = ''
     runHook preCheck