Merge branch 'master' into core-updates

This commit is contained in:
Mark H Weaver 2017-03-19 18:52:01 -04:00
commit f67337e23e
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
80 changed files with 2826 additions and 962 deletions

View file

@ -222,7 +222,7 @@ required structures.")
(substitute-keyword-arguments (package-arguments gnutls)
((#:configure-flags flags)
`(cdr ,flags))))
(inputs `(("guile" ,guile-next)
(inputs `(("guile" ,guile-2.2)
,@(alist-delete "guile" (package-inputs gnutls))))))
(define-public openssl