amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source 
Conflicts:
	gnu/local.mk
	gnu/packages/algebra.scm
	gnu/packages/bioinformatics.scm
	gnu/packages/curl.scm
	gnu/packages/docbook.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/maths.scm
	gnu/packages/plotutils.scm
	gnu/packages/python-web.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/readline.scm
	gnu/packages/tls.scm
	gnu/packages/xml.scm
	gnu/packages/xorg.scm
This commit is contained in:
Marius Bakke 2021-06-06 21:16:32 +02:00
commit 8d59c262ad
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
176 changed files with 16041 additions and 6439 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/django.scm
View file

@ -48,13 +48,13 @@
(define-public python-django
(package
(name "python-django")
(version "3.2.2")
(version "3.2.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "Django" version))
(sha256
(base32
"0gffaabnnpzj0sl3jl7mllvi3gc0jvab6xw2bckvyljwsrd1j78a"))))
"15pjwyvrx4n8gi8n51b14wp54bg4jqapr25p52597zn6ikdxijb6"))))
(build-system python-build-system)
(arguments
'(#:phases
@ -130,13 +130,13 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
(define-public python-django-2.2
(package
(inherit python-django)
(version "2.2.22")
(version "2.2.24")
(source (origin
(method url-fetch)
(uri (pypi-uri "Django" version))
(sha256
(base32
"0q30zjcmnvwp1v1syn739wapahs2dx784n0yjyypq0cr3kdi88nv"))))
"1dvx3x85lggm91x7mpvaf9nmpxyz7r97pbpnmr2k1qfy0c7gyf9k"))))
(native-inputs
`(;; XXX: In 2.2 and 3.0, selenium is required for the test suite.
("python-selenium" ,python-selenium)
@ -932,7 +932,7 @@ name is purely coincidental.")
(define-public python-django-statici18n
(package
(name "python-django-statici18n")
(version "1.9.0")
(version "2.1.0")
(home-page "https://github.com/zyegfryed/django-statici18n")
(source (origin
(method git-fetch)
@ -942,7 +942,7 @@ name is purely coincidental.")
(file-name (git-file-name name version))
(sha256
(base32
"1p3myp2im6c87yc05alh91jyahqws5lcw3zzdsj4dh8lx9s9cgpf"))))
"0x0xvfqd40is2ks43d65awgqkx3wk10lvdim15scvbjhkh301b6v"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@ -1089,14 +1089,13 @@ forms using your favorite CSS framework, without writing template code.")
(define-public python-django-compressor
(package
(name "python-django-compressor")
(version "2.4")
(version "2.4.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "django_compressor" version))
(sha256
(base32
"0kx7bclfa0sxlsz6ka70zr9ra00lks0hmv1kc99wbanx6xhirvfj"))))
(base32 "1q0m0hfg7sqmj5km924g4dgy3nx51aszzsprlp6gsin10mv0fn1k"))))
(build-system python-build-system)
(arguments
'(#:phases