diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:46:24 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:46:24 +0200 |
| commit | 8c3e9da13a3c92a7db308db8c0d81cb474ad7799 (patch) | |
| tree | 88d06952aa5cc3a9c4991d9c43eb7950ff174fe1 /gnu/packages/django.scm | |
| parent | 5439c04ebdb7b6405f5ea2446b375f1d155a8d95 (diff) | |
| parent | 0c5299200ffcd16370f047b7ccb187c60f30da34 (diff) | |
| download | guix-8c3e9da13a3c92a7db308db8c0d81cb474ad7799.tar guix-8c3e9da13a3c92a7db308db8c0d81cb474ad7799.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/django.scm')
| -rw-r--r-- | gnu/packages/django.scm | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 238af51430..b7d739bea8 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020, 2021, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com> +;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev> ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,13 +54,13 @@ (define-public python-django-4.0 (package (name "python-django") - (version "4.0.2") + (version "4.0.4") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "0jlmxylag7dah9jl3wm2swnn9kbisx1gqnddfbh5kjifn67va3qi")))) + "1da0vy3nas2m2j50dc5c3s1nv529lagg4c04riipah94hn2pg0af")))) (build-system python-build-system) (arguments '(#:phases @@ -140,29 +141,45 @@ to the @dfn{don't repeat yourself} (DRY) principle.") (define-public python-django-3.2 (package (inherit python-django-4.0) - (version "3.2.12") + (version "3.2.13") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "1qj1kvb6mk2f4b33n4n5l4rh5kqllrk2v0v076crxr83ay9ycwlp")))) + "1dn4irl4m21skcqb2mbj55vgryqfqk6wqa8s1c7bmxlv19x4k4vd")))) (native-search-paths '()) ;no need for TZDIR (propagated-inputs (modify-inputs (package-propagated-inputs python-django-4.0) ;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo. (append python-pytz))))) +;; archivebox requires django>=3.1.3,<3.2 +(define-public python-django-3.1.14 + (package + (inherit python-django-3.2) + (version "3.1.14") + (source (origin + (method url-fetch) + (uri (pypi-uri "Django" version)) + (sha256 + (base32 + "0ix3v2wlnplv78zxjrlw8z3hiap2d5mxvk0ny2fc65526shsb93j")))) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-django-3.2) + ;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo. + (append python-pytz))))) + (define-public python-django-2.2 (package (inherit python-django-3.2) - (version "2.2.27") + (version "2.2.28") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "04y9knxd8v9jn54ws5rbdwxyq5im69kx009s7gl62axzn1371qqy")))) + "04vl7aivsshzsnn547lm4jdinr67afhdspc40f0c06xzmxbvc002")))) (native-inputs (modify-inputs (package-native-inputs python-django-3.2) (prepend ;; 2.2 requires Selenium for the test suite. |