summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Lechner <felix.lechner@lease-up.com>2022-09-16 10:36:36 -0700
committerGuix Patches Tester <>2022-09-18 23:04:41 +0100
commit84a94bd8d07a83ca8dafab421de05822648d3aa2 (patch)
tree54031c0dc562199517d4b7cc14439336538d43b3
parentc54ef97c80f98fba77304efc560945fe78a4bafb (diff)
downloadguix-patches-84a94bd8d07a83ca8dafab421de05822648d3aa2.tar
guix-patches-84a94bd8d07a83ca8dafab421de05822648d3aa2.tar.gz
gnu: xkeyboard-config: Update to 2.36.
* gnu/packages/xorg.scm (xkeyboard-config): Update to 2.36. [source]: Switch to Github repo, which is archived on Software Heritage, plus there is an automatic updater. [build-system]: Use meson-build-system. [inputs]: Indent for common style. [native-inputs]: Drop labels.
-rw-r--r--gnu/packages/xorg.scm32
1 files changed, 13 insertions, 19 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4cde48aa1b..3e021483b9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3880,25 +3880,19 @@ extension to the X11 protocol. It includes:
(define-public xkeyboard-config
(package
(name "xkeyboard-config")
- (version "2.34")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "ftp://ftp.freedesktop.org/pub/xorg//individual/data/xkeyboard-config/xkeyboard-config-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "1kmq2ykwmh10sd6155gml4jhdxmvsll6xdg7zw86czpfhrvd48dk"))))
- (build-system gnu-build-system)
- (inputs
- (list libx11 xkbcomp-intermediate))
- (native-inputs
- `(("gettext" ,gettext-minimal)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python)))
+ (version "2.36")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/freedesktop/xkeyboard-config")
+ (commit (string-append name "-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0qmfcvcg1jmzfk6xpcdg14gwy83hqw0k16z96p7f5np11xn2jyvy"))))
+ (build-system meson-build-system)
+ (inputs (list libx11 xkbcomp-intermediate))
+ (native-inputs (list gettext-minimal perl pkg-config python))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg XKB configuration files")
(description