Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2020-03-10 20:50:02 +01:00
commit 50b99c90c8
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
137 changed files with 3801 additions and 1464 deletions

View file

@ -211,10 +211,10 @@ and provides a \"top-like\" mode (monitoring).")
`(("pkg-config" ,pkg-config)
;; This is the Guile we use as a cross-compiler...
("guile" ,guile-2.2)))
("guile" ,guile-2.2.7)))
(inputs
;; ... and this is the one that appears in shebangs when cross-compiling.
`(("guile" ,guile-2.2) ;for <https://bugs.gnu.org/37757>
`(("guile" ,guile-2.2.7) ;for <https://bugs.gnu.org/37757>
;; The 'shepherd' command uses Readline when used interactively. It's
;; an unusual use case though, so we don't propagate it.