Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2017-11-19 15:01:00 +01:00
commit 2dd12924cf
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
202 changed files with 24545 additions and 10664 deletions

View file

@ -9,6 +9,7 @@
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -37,6 +38,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages docbook)
@ -451,7 +453,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
(define-public weston
(package
(name "weston")
(version "2.0.0")
(version "3.0.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -459,7 +461,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
"weston-" version ".tar.xz"))
(sha256
(base32
"1n35acsknwqfhsni854q5mjq2gnbnfdvinh92rpij67i4yn4dr5l"))))
"19936zlkb75xcaidd8fag4ah8000wrh2ziqy7nxkq36pimgdbqfd"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)