Merge branch 'staging'

This commit is contained in:
Marius Bakke 2019-12-04 20:12:41 +01:00
commit 33b59c1a3e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
60 changed files with 1171 additions and 734 deletions

View file

@ -11958,7 +11958,8 @@ object has been freed.")
#t)))))
(inputs
`(("emacs-minimal" ,emacs-minimal)
("mariadb" ,mariadb)
("mariadb" ,mariadb "lib")
("mariadb-dev" ,mariadb "dev")
("postgresql" ,postgresql)))
(propagated-inputs
`(("emacs-finalize" ,emacs-finalize)