diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-05 19:46:16 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-05 19:46:16 +0200 |
| commit | d4721ff1017b64e5242b09fd7b430665ec580524 (patch) | |
| tree | 1bd9ce1a339f5b348e780e4bb7f53a4333bfce01 /gnu/packages/xorg.scm | |
| parent | 30e12b9664d774aca3948b1fa2e0aee6af09ca40 (diff) | |
| parent | c0f6eebb6d9f6ca9b62344f32ce5f82dab601d53 (diff) | |
| download | patches-d4721ff1017b64e5242b09fd7b430665ec580524.tar patches-d4721ff1017b64e5242b09fd7b430665ec580524.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ae28e38adb..27966f038a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5067,7 +5067,7 @@ over Xlib, including: (define-public xorg-server (package (name "xorg-server") - (version "1.20.4") + (version "1.20.5") (source (origin (method url-fetch) @@ -5076,7 +5076,7 @@ over Xlib, including: "xorg-server-" version ".tar.bz2")) (sha256 (base32 - "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy")) + "17dc3g8cc55nbkx3np64dsz04n621dnzjmcc9wys0xbyyd1q47d8")) (patches (list ;; See: @@ -5198,7 +5198,16 @@ draggable titlebars and borders.") (define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server)))) + (inherit xorg-server) + (version "1.20.4") + (source (origin + (inherit (package-source xorg-server)) + (uri (string-append + "mirror://xorg/individual/xserver/" + "xorg-server-" version ".tar.bz2")) + (sha256 + (base32 + "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy"))))))) (define-public xorg-server-xwayland (package |