diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 21:56:34 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 22:30:04 +0300 |
| commit | de3c03a47160dec355d9b19ad5ca210d90c15fd7 (patch) | |
| tree | 4ca6dc05b5fc9530d812bbb269f1c61ab9efccf3 /gnu/packages/xdisorg.scm | |
| parent | ab6fe9d362046231ad6f46eccfd1ea2c9c80b401 (diff) | |
| parent | b8477cab7bccc4191ed3dfa3f149aec7917834d8 (diff) | |
| download | guix-patches-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar guix-patches-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/xdisorg.scm')
| -rw-r--r-- | gnu/packages/xdisorg.scm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 98d52cc392..3c07ce89eb 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015 Florian Paul Schmidt <mista.tapas@gmx.net> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com> @@ -933,7 +933,7 @@ Guile will work for XBindKeys.") (define-public sxhkd (package (name "sxhkd") - (version "0.6.1") + (version "0.6.2") (source (origin (method git-fetch) @@ -942,7 +942,7 @@ Guile will work for XBindKeys.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h")))) + (base32 "1winwzdy9yxvxnrv8gqpigl9y0c2px27mnms62bdilp4x6llrs9r")))) (build-system gnu-build-system) (inputs `(("asciidoc" ,asciidoc) @@ -1083,7 +1083,7 @@ Escape key when Left Control is pressed and released on its own.") (define-public libwacom (package (name "libwacom") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) (uri (string-append @@ -1091,7 +1091,7 @@ Escape key when Left Control is pressed and released on its own.") "libwacom-" version "/libwacom-" version ".tar.bz2")) (sha256 (base32 - "1rk661cymmahak9rw0wcssnfszbngq74vp7zc2cwyg6yrjbif1lh")))) + "0yyl6vzpfd7dq8a8k9dn8r494542ci4r1i0pillg1p4f7jvryd3b")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-static"))) @@ -2019,7 +2019,7 @@ temperature of the screen.") "--with-xkb" "--with-default-authproto-module=/run/setuid-programs/authproto_pam"))) (native-inputs - `(("pandoc" ,ghc-pandoc) + `(("pandoc" ,pandoc) ("pkg-config" ,pkg-config))) (inputs `(("fontconfig" ,fontconfig) @@ -2469,6 +2469,11 @@ create layout indicator widgets.") `(#:configure-flags '("-DWITH_GIT_CATCH=off") #:phases (modify-phases %standard-phases + (add-after 'unpack 'find-catch + (lambda _ + (substitute* "CMakeLists.txt" + (("PATH_SUFFIXES catch") "PATH_SUFFIXES catch2")) + #t)) (replace 'check (lambda _ (invoke "./j4-dmenu-tests" "exclude:SearchPath/XDG_DATA_HOME")))))) |