Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2018-03-18 01:09:25 +01:00
commit 7ace97395f
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
147 changed files with 4608 additions and 1315 deletions

View file

@ -367,7 +367,7 @@ of a the system to know what users are logged in, and where.")
("glib:bin" ,glib "bin")))
(inputs
`(("glib" ,glib)
("bash-completion", bash-completion)
("bash-completion" ,bash-completion)
("polkit" ,polkit)))
(propagated-inputs
`(("sqlite" ,sqlite)))
@ -1097,13 +1097,13 @@ update-desktop-database: updates the database containing a cache of MIME types
(define-public xdg-user-dirs
(package
(name "xdg-user-dirs")
(version "0.16")
(version "0.17")
(source (origin
(method url-fetch)
(uri (string-append "http://user-dirs.freedesktop.org/releases/"
name "-" version ".tar.gz"))
(sha256
(base32 "1rp3c94hxjlfsryvwajklynfnrcvxplhwnjqc7395l89i0nb83vp"))))
(base32 "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"))))
(build-system gnu-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)