diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-06-13 13:24:35 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-13 13:24:35 +0200 |
| commit | d9bbfe042e06df35c12e4b8f53bfb1889cba90bf (patch) | |
| tree | 9f34077cd824e8955be4ed2b5f1a459aa8076489 /gnu/packages/xorg.scm | |
| parent | f87a7cc60e058d2e07560d0d602747b567d9dce4 (diff) | |
| parent | 47f2168b6fabb105565526b2a1243eeeb13008fe (diff) | |
| download | guix-patches-d9bbfe042e06df35c12e4b8f53bfb1889cba90bf.tar guix-patches-d9bbfe042e06df35c12e4b8f53bfb1889cba90bf.tar.gz | |
Merge branch 'master' into core-updates
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 ed718c5539..68501139e0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5079,7 +5079,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) @@ -5088,7 +5088,7 @@ over Xlib, including: "xorg-server-" version ".tar.bz2")) (sha256 (base32 - "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy")) + "17dc3g8cc55nbkx3np64dsz04n621dnzjmcc9wys0xbyyd1q47d8")) (patches (list ;; See: @@ -5210,7 +5210,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 |