diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-11 20:33:44 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-11 20:33:44 +0200 |
| commit | 878a6baa4c705f4d551b60c5aa254246e0abc922 (patch) | |
| tree | 828394061b011f0500753f85db5e2625b569cf0a /gnu/packages/xorg.scm | |
| parent | 1c65b0e9d5731c5bcda77482ed06576f2fbfeac4 (diff) | |
| parent | 7a05fdd0e1d5e5e26e94014d87bf85575bbec780 (diff) | |
| download | guix-878a6baa4c705f4d551b60c5aa254246e0abc922.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7099745ab3..29b9010a99 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3829,7 +3829,7 @@ extension to the X11 protocol. It includes: (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.26") + (version "2.27") (source (origin (method url-fetch) @@ -3839,7 +3839,7 @@ extension to the X11 protocol. It includes: ".tar.bz2")) (sha256 (base32 - "13h3381pfp4pv32189zkfsj2x0alr91xj6dqii76rl0c8v3ihdrr")))) + "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) @@ -5195,16 +5195,7 @@ draggable titlebars and borders.") (define-public xorg-server-for-tests (hidden-package (package - (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"))))))) + (inherit xorg-server)))) (define-public xorg-server-xwayland (package |