diff options
| author | Leo Famulari <leo@famulari.name> | 2017-06-07 12:11:24 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-06-07 12:11:55 -0400 |
| commit | c67d587f94173fd42d65097165afc5c512935646 (patch) | |
| tree | ee2bac9d683d0dec98d611d5e590b06d9876cad3 /gnu/packages/xorg.scm | |
| parent | 4f493cba06b97de756123b3855ea52dcf1ad3555 (diff) | |
| parent | 4679dd6967c21e21c740cd88e17191b8e2aac5ee (diff) | |
| download | guix-c67d587f94173fd42d65097165afc5c512935646.tar guix-c67d587f94173fd42d65097165afc5c512935646.tar.gz | |
Merge branch 'master' into core-updates
This merge commit includes a fix for CVE-2017-6512 in Perl 5.26.0.
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7d981712da..78717cc203 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3623,7 +3623,7 @@ alternative implementations like XRandR or TwinView.") (define xkbcomp-intermediate ; used as input for xkeyboard-config (package (name "xkbcomp-intermediate") - (version "1.3.1") + (version "1.4.0") (source (origin (method url-fetch) @@ -3633,7 +3633,7 @@ alternative implementations like XRandR or TwinView.") ".tar.bz2")) (sha256 (base32 - "0gcjy70ppmcl610z8gxc7sydsx93f8cm8pggm4qhihaa1ngdq103")))) + "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) |