mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-16 20:10:39 +02:00
Code Releases Activity

Merge branch 'master' into core-updates

Browse source 
Conflicts:
	gnu/local.mk
	gnu/packages/bioinformatics.scm
	gnu/packages/django.scm
	gnu/packages/gtk.scm
	gnu/packages/llvm.scm
	gnu/packages/python-web.scm
	gnu/packages/python.scm
	gnu/packages/tex.scm
	guix/build-system/asdf.scm
	guix/build/emacs-build-system.scm
	guix/profiles.scm
This commit is contained in:
Marius Bakke 2021-05-09 21:29:46 +02:00
commit f034264204
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
305 changed files with 727921 additions and 145425 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/python.scm
View file

@ -149,7 +149,8 @@
"python-2.7-site-prefixes.patch"
"python-2.7-source-date-epoch.patch"
"python-2.7-adjust-tests.patch"
"python-cross-compile.patch"))
"python-cross-compile.patch"
"python-2.7-CVE-2021-3177.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@ -378,14 +379,6 @@ data types.")
(properties '((cpe-name . "python")))
(license license:psfl)))
(define python-2.7/fixed
(package
(inherit python-2.7)
(source (origin
(inherit (package-source python-2.7))
(patches (append (search-patches "python-2.7-CVE-2021-3177.patch")
(origin-patches (package-source python-2.7))))))))
;; Current 2.x version.
(define-public python-2 python-2.7)