Merge branch 'master' into core-updates-frozen

Conflicts:
	gnu/packages/algebra.scm
	gnu/packages/games.scm
	gnu/packages/golang.scm
	gnu/packages/kerberos.scm
	gnu/packages/mail.scm
	gnu/packages/python.scm
	gnu/packages/ruby.scm
	gnu/packages/scheme.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
This commit is contained in:
Marius Bakke 2021-08-12 00:30:27 +02:00
commit c4133c43c7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
181 changed files with 256111 additions and 218870 deletions

View file

@ -90,7 +90,7 @@
(define-public mit-scheme
(package
(name "mit-scheme")
(version "10.1.3")
(version "11.2")
(source #f) ; see below
(outputs '("out" "doc"))
(build-system gnu-build-system)
@ -173,11 +173,14 @@
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("texlive" ,(texlive-updmap.cfg (list texlive-tex-texinfo)))
("texlive" ,(texlive-updmap.cfg (list texlive-tex-texinfo
texlive-epsf)))
("texinfo" ,texinfo)
("ghostscript" ,ghostscript)
("m4" ,m4)))
(inputs
`(("libx11" ,libx11)
("ncurses" ,ncurses)
("source"
@ -193,8 +196,8 @@
(match (%current-system)
("x86_64-linux"
(string-append version "-x86-64"))
("i686-linux"
(string-append version "-i386"))
("aarch64-linux"
(string-append version "-aarch64le"))
(_
(string-append "c-" version)))
".tar.gz"))
@ -202,10 +205,10 @@
(match (%current-system)
("x86_64-linux"
(base32
"03m7cc035w3avs91j2pcz9f15ssgvgp3rm045d1vbydqrkzfyw8k"))
("i686-linux"
"17822hs9y07vcviv2af17p3va7qh79dird49nj50bwi9rz64ia3w"))
("aarch64-linux"
(base32
"05sjyz90xxfnmi87qv8x0yx0fcallnzl1dciygdafp317pn489is"))
"11maixldk20wqb5js5p4imq221zz9nf27649v9pqkdf8fv7rnrs9"))
(_
(base32
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"))))))))