diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-04 22:31:59 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-04 22:31:59 +0100 |
| commit | 4f8dc1536adf5965597d53a1e7867690429a12b2 (patch) | |
| tree | 1d6456941b23316020c9f0edac8e22187134488d /gnu/packages/xorg.scm | |
| parent | 19464173bafdc42adfc8dd7277c491c40ddef66b (diff) | |
| parent | 5ae458befc803fe357210fef343cf322d9f4bade (diff) | |
| download | patches-4f8dc1536adf5965597d53a1e7867690429a12b2.tar patches-4f8dc1536adf5965597d53a1e7867690429a12b2.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8808c4bd2a..4fe1880c91 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 John Darrington <jmd@gnu.org> -;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> @@ -5087,16 +5087,16 @@ over Xlib, including: (define-public xorg-server (package (name "xorg-server") - (version "1.20.3") + (version "1.20.4") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/xserver/" - name "-" version ".tar.bz2")) + "xorg-server-" version ".tar.bz2")) (sha256 (base32 - "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v")) + "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy")) (patches (list ;; See: @@ -5218,7 +5218,16 @@ draggable titlebars and borders.") (define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server)))) + (inherit xorg-server) + (version "1.20.3") + (source (origin + (inherit (package-source xorg-server)) + (uri (string-append + "mirror://xorg/individual/xserver/" + "xorg-server-" version ".tar.bz2")) + (sha256 + (base32 + "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v"))))))) (define-public xorg-server-xwayland (package |