diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-02-21 14:31:36 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-02-21 14:31:36 +0100 |
| commit | 8505eb19a4071f563811d4fe33471441c2db58b7 (patch) | |
| tree | 123241c704e7d1a88eb4efe2793a6898e2e72216 /gnu/packages/xorg.scm | |
| parent | 3b88f3767d9f3ad2cc64173525cd53d429bfe7e7 (diff) | |
| parent | b097a3387ea78797104f97eef445f5da6278c922 (diff) | |
| download | guix-8505eb19a4071f563811d4fe33471441c2db58b7.tar.gz | |
Merge branch 'staging' into core-updates
Conflicts: gnu/local.mk: Missing mention of gdk-pixbuf-list-dir.patch in the commit log really confused me here... It's from 8c6b077bfae (staging). gnu/packages/xorg.scm: xkeyboard-config updated both places.
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 53c13aeff7..7348cbb205 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3729,7 +3729,7 @@ extension to the X11 protocol. It includes: (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.19") + (version "2.20") (source (origin (method url-fetch) @@ -3739,7 +3739,7 @@ extension to the X11 protocol. It includes: ".tar.bz2")) (sha256 (base32 - "09sqyi430bbg13pp8j0j60p9p9xn2lpqx38xw1lyv77bp63d3pw3")))) + "0d619g4r0w1f6q5qmaqjnsc0956gi02fqgpisqffzqy4acjwggyi")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) @@ -4800,7 +4800,7 @@ new API's in libXft, or the legacy API's in libX11.") (define-public libxi (package (name "libxi") - (version "1.7.8") + (version "1.7.9") (source (origin (method url-fetch) @@ -4810,7 +4810,7 @@ new API's in libXft, or the legacy API's in libX11.") ".tar.bz2")) (sha256 (base32 - "1fr7mi4nbcxsa88qin9g2ipmzh595ydxy9qnabzl270laf6zmwnq")))) + "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2")))) (build-system gnu-build-system) (propagated-inputs `(("inputproto" ,inputproto) |