diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/qt.scm | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
| download | guix-0d41fe4855588fb659b8adafe215d5573517a79b.tar.gz guix-0d41fe4855588fb659b8adafe215d5573517a79b.zip | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 01bf961bbf..49d514503d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Quiliro <quiliro@fsfla.org> ;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2018, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2018, 2020, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> @@ -70,6 +70,7 @@ #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) #:use-module (gnu packages graphics) @@ -1512,7 +1513,7 @@ message."))) (define-public qtspell (package (name "qtspell") - (version "0.9.0") + (version "1.0.1") (source (origin (method git-fetch) @@ -1521,7 +1522,7 @@ message."))) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1081makirjxixz44ghwz362vgnk5wcks6ni6w01pl667x8wggsd2")))) + (base32 "19ff6jzm699wrxrk57w3d4kl9qxgdipdikpwls9n4aqv4mw7g969")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no test @@ -2402,7 +2403,7 @@ This package provides the Python bindings."))) (define-public qtkeychain (package (name "qtkeychain") - (version "0.9.1") + (version "0.13.2") (source (origin (method git-fetch) @@ -2412,12 +2413,12 @@ This package provides the Python bindings."))) (file-name (git-file-name name version)) (sha256 (base32 - "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc")))) + "1zk6r2vc1q48qs7mw2h47bpgrfbb9r7lf9cwq4sb1a4nls87zznk")))) (build-system cmake-build-system) (native-inputs (list pkg-config qttools)) (inputs - (list qtbase-5)) + (list libsecret qtbase-5)) (arguments `(#:tests? #f ; No tests included #:phases @@ -2426,8 +2427,7 @@ This package provides the Python bindings."))) (lambda _ (substitute* "CMakeLists.txt" (("\\$\\{qt_translations_dir\\}") - "${CMAKE_INSTALL_PREFIX}/share/qt5/translations")) - #t))))) + "${CMAKE_INSTALL_PREFIX}/share/qt5/translations"))))))) (home-page "https://github.com/frankosterfeld/qtkeychain") (synopsis "Qt API to store passwords") (description |