From 12964df69a99de6190422c752fef65ef813f3b6b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 7 Jun 2021 10:49:43 +0200 Subject: gnu: python-attrs: Conditionally execute tests. * gnu/packages/python-xyz.scm (python-attrs)[arguments]: Wrap "check" phase in conditional expression. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6a6d7f4b26..e3f5295452 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16991,18 +16991,20 @@ and bit flag values.") (ice-9 ftw) (srfi srfi-1) (srfi srfi-26)) - #:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (let ((cwd (getcwd))) - (setenv "PYTHONPATH" - (string-append - cwd "/build/" - (find (cut string-prefix? "lib" <>) - (scandir (string-append cwd "/build"))) - ":" - (getenv "PYTHONPATH"))) - (invoke "python" "-m" "pytest"))))))) + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (let ((cwd (getcwd))) + (setenv "PYTHONPATH" + (string-append + cwd "/build/" + (find (cut string-prefix? "lib" <>) + (scandir (string-append cwd "/build"))) + ":" + (getenv "PYTHONPATH"))) + (invoke "python" "-m" "pytest")))))))) (native-inputs `(("python-coverage" ,python-coverage) ("python-hypothesis" ,python-hypothesis) -- cgit v1.2.3 From f41e56dcf1a42b0bf5dee14afd1494b8f25c2353 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 7 Jun 2021 10:50:22 +0200 Subject: gnu: python-attrs: Update to 21.2.0. * gnu/packages/python-xyz.scm (python-attrs): Update to 21.2.0. (python-attrs-bootstrap): Keep this at 19.3.0 to avoid mass rebuilds. --- gnu/packages/python-xyz.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3f5295452..7e9603afbe 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16977,13 +16977,13 @@ and bit flag values.") (define-public python-attrs (package (name "python-attrs") - (version "19.3.0") + (version "21.2.0") (source (origin (method url-fetch) (uri (pypi-uri "attrs" version)) (sha256 (base32 - "0wky4h28n7xnr6xv69p9z6kv8bzn50d10c3drmd9ds8gawbcxdzp")))) + "1yzmwi5d197p0qhl7rl4xi9q1w8mk9i3zn6hrl22knbcrb1slspg")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) @@ -17027,6 +17027,13 @@ protocols.") (package (inherit python-attrs) (name "python-attrs-bootstrap") + (version "19.3.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "attrs" version)) + (sha256 + (base32 + "0wky4h28n7xnr6xv69p9z6kv8bzn50d10c3drmd9ds8gawbcxdzp")))) (native-inputs `()) (arguments `(#:tests? #f)))) -- cgit v1.2.3 From 17f3194150297f1a29d630865de2cda6a308ba04 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 7 Jun 2021 10:50:50 +0200 Subject: gnu: python-dataclasses: Update to 0.8. * gnu/packages/python-xyz.scm (python-dataclasses): Update to 0.8. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e9603afbe..17caaad556 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25334,14 +25334,14 @@ disk files in asyncio applications.") (define-public python-dataclasses (package (name "python-dataclasses") - (version "0.7") + (version "0.8") (source (origin (method url-fetch) (uri (pypi-uri "dataclasses" version)) (sha256 (base32 - "1rh8111fbws2vxyf2qy2zw3x6p6cq1jfz8pf904gig5qwg56sjj9")))) + "15sc12nrc7gxwb30vfa6frzdnpmbap9ibi1fr1yrbkra6izhcyc4")))) (build-system python-build-system) (home-page "https://github.com/ericvsmith/dataclasses") -- cgit v1.2.3 From 856de4f61cbaaf3d0cdcad83ad34754feac80f76 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 7 Jun 2021 10:51:09 +0200 Subject: gnu: Add python-rich. * gnu/packages/python-xyz.scm (python-rich): New variable. --- gnu/packages/python-xyz.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 17caaad556..bd4cd037c2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13749,6 +13749,56 @@ is made as zipfile like as possible.") (define-public python2-rarfile (package-with-python2 python-rarfile)) +(define-public python-rich + (package + (name "python-rich") + (version "10.2.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "rich" version)) + (sha256 + (base32 + "1z5m5brcdf3vndpavcqj5nl35xby4x5rfj48klhwqycfqf3g9cqp")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (copy-recursively (string-append + (assoc-ref inputs "tests") "/tests") + "tests") + (invoke "python" "-m" "pytest" "-vv"))))))) + (propagated-inputs + `(("python-attrs" ,python-attrs) + ("python-colorama" ,python-colorama) + ("python-commonmark" ,python-commonmark) + ("python-ipywidgets" ,python-ipywidgets) + ("python-pygments" ,python-pygments) + ("python-typing-extensions" ,python-typing-extensions))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("tests" + ;; The release on pypi comes without tests. We can't build from this + ;; checkout, though, because installation requires an invocation of + ;; poetry. + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/willmcgugan/rich") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19f4svb363sn5708qkpa6lakmiwzyb25h8kmh7bqrsbbrvi9hr70")))))) + (home-page "https://github.com/willmcgugan/rich") + (synopsis "Render rich text and more to the terminal") + (description + "This is a Python package for rendering rich text, tables, progress bars, +syntax highlighting, markdown and more to the terminal.") + (license license:expat))) + (define-public python-magic (package (name "python-magic") -- cgit v1.2.3 From 69f56c2767c4b96d4dd9201ab49e090c02c40bfa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 7 Jun 2021 23:29:52 +0200 Subject: gnu: python-pikepdf: Update to 2.12.2. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.12.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bd4cd037c2..7b5594fee5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6285,13 +6285,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.12.1") + (version "2.12.2") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "1si1x4dc4i4ghyirjfws1zkgiwk8kypnpp4gf68haascrdy7znqw")))) + (base32 "1r68zh8whp8wg4brjf5vha8h1ly8pjqyb37pfw91hyxfn6cm9wsz")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit v1.2.3 From 61bce4d143b8e1c077b6a9e10e24138ae2f73600 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 7 Jun 2021 16:06:53 +0300 Subject: gnu: python-mappy: Move to (gnu packages bioinformatics). * gnu/packages/python-xyz.scm (python-mappy): Move to ... * gnu/packages/bioinformatics.scm: ... here. --- gnu/packages/bioinformatics.scm | 22 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a4a66783b6..7a47943d2d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10935,6 +10935,28 @@ cases include: @end enumerate\n") (license license:expat))) +(define-public python-mappy + (package + (name "python-mappy") + (version "2.18") + (source (origin + (method url-fetch) + (uri (pypi-uri "mappy" version)) + (sha256 + (base32 + "1a05p7rkmxa6qhm108na8flzj2v45jab06drk59kzk1ip2sgvzqq")))) + (build-system python-build-system) + (native-inputs + `(("python-cython" ,python-cython))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://github.com/lh3/minimap2") + (synopsis "Python binding for minimap2") + (description "This package provides a convenient interface to minimap2, +a fast and accurate C program to align genomic and transcribe nucleotide +sequences.") + (license license:expat))) + (define-public miniasm (package (name "miniasm") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7b5594fee5..998c5e9fbb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2304,28 +2304,6 @@ information created by most SVG editors. Optimization options are typically lossless but can be tweaked for more aggressive cleaning.") (license license:asl2.0))) -(define-public python-mappy - (package - (name "python-mappy") - (version "2.18") - (source (origin - (method url-fetch) - (uri (pypi-uri "mappy" version)) - (sha256 - (base32 - "1a05p7rkmxa6qhm108na8flzj2v45jab06drk59kzk1ip2sgvzqq")))) - (build-system python-build-system) - (native-inputs - `(("python-cython" ,python-cython))) - (inputs - `(("zlib" ,zlib))) - (home-page "https://github.com/lh3/minimap2") - (synopsis "Python binding for minimap2") - (description "This package provides a convenient interface to minimap2, -a fast and accurate C program to align genomic and transcribe nucleotide -sequences.") - (license license:expat))) - (define-public python-mechanize (package (name "python-mechanize") -- cgit v1.2.3 From e13ab46c2052609c4ad792aeb304a752b50d034e Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 8 Jun 2021 16:37:42 +0200 Subject: gnu: python2-bigfloat: Remove package. * gnu/packages/python-xyz.scm (python2-bigfloat): Remove variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 998c5e9fbb..bda9d8c4e3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8871,9 +8871,6 @@ more advanced mathematics.") multiprecision arithmetic.") (license license:lgpl3+))) -(define-public python2-bigfloat - (package-with-python2 python-bigfloat)) - (define-public python-sympy (package (name "python-sympy") -- cgit v1.2.3 From 8871b698407a45ff993b994d3f0f73a4dbe41eca Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 8 Jun 2021 16:37:43 +0200 Subject: gnu: python2-fastimport: Remove package. * gnu/packages/python-xyz.scm (python2-fastimport): Remove variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bda9d8c4e3..a330ed64cd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14380,9 +14380,6 @@ graphviz.") format.") (license license:gpl2+))) -(define-public python2-fastimport - (package-with-python2 python-fastimport)) - (define-public python-twisted (package (name "python-twisted") -- cgit v1.2.3 From 1e582a0856f93e3121a8aeb399edd0a6e9a5378f Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 8 Jun 2021 16:37:44 +0200 Subject: gnu: python2-gridmap: Remove package. * gnu/packages/python-xyz.scm (python2-gridmap): Remove variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a330ed64cd..0c2b15eebb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7081,9 +7081,6 @@ cluster directly from Python. You can directly map Python functions onto the cluster without needing to write any wrapper code yourself.") (license license:gpl3+))) -(define-public python2-gridmap - (package-with-python2 python-gridmap)) - (define-public python-honcho (package (name "python-honcho") -- cgit v1.2.3 From 16a23337be1b86ca19230c717e53ea5b057df559 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 8 Jun 2021 16:37:45 +0200 Subject: gnu: python2-hdf4: Remove package. * gnu/packages/python-xyz.scm (python2-hdf4): Remove variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0c2b15eebb..4fcaf69b31 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1120,9 +1120,6 @@ NetCDF files can also be read and modified. Python-HDF4 is a fork of @url{http://hdfeos.org/software/pyhdf.php,pyhdf}.") (license license:expat))) -(define-public python2-hdf4 - (package-with-python2 python-hdf4)) - (define-public python-h5py (package (name "python-h5py") -- cgit v1.2.3 From 515360fdc77f6d58272a7ab217c1bc7fa12ac0b7 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 8 Jun 2021 16:37:48 +0200 Subject: gnu: python2-numpy-documentation: Remove package. * gnu/packages/python-xyz.scm (python2-numpy-documentation): Remove variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4fcaf69b31..fc29f14943 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5319,13 +5319,6 @@ color scales, and color space conversion easy. It has support for: (description (package-description python-numpy)) (license (package-license python-numpy)))) -(define-public python2-numpy-documentation - (let ((numpy-documentation (package-with-python2 python-numpy-documentation))) - (package - (inherit numpy-documentation) - (native-inputs `(("python2-functools32" ,python2-functools32) - ,@(package-native-inputs numpy-documentation)))))) - (define-public python-pygit2 (package (name "python-pygit2") -- cgit v1.2.3 From 79925c2271c5b7adad885fab569632491b911e63 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 8 Jun 2021 16:37:50 +0200 Subject: gnu: python2-partd: Remove package. * gnu/packages/python-xyz.scm (python2-partd): Remove variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fc29f14943..378012b446 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21521,9 +21521,6 @@ This Python package wraps the Blosc library.") append on old values. Partd excels at shuffling operations.") (license license:bsd-3))) -(define-public python2-partd - (package-with-python2 python-partd)) - (define-public python-fsspec (package (name "python-fsspec") -- cgit v1.2.3 From 5502bf9a9b29df1afd16fa79fa5297bd5fca01d5 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 8 Jun 2021 13:26:11 +0000 Subject: gnu: python-prompt-toolkit: Update to 3.0.18. * gnu/packages/python-xyz.scm (python-prompt-toolkit): Update to 3.0.18. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 378012b446..444c23d8e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15230,13 +15230,13 @@ collections of data.") (define-public python-prompt-toolkit (package (name "python-prompt-toolkit") - (version "3.0.9") + (version "3.0.18") (source (origin (method url-fetch) (uri (pypi-uri "prompt_toolkit" version)) (sha256 - (base32 "0bvjp62cs6aj9lrh7njzxdjgg8pjfw3qgmr551243d9ivmcapvn5")))) + (base32 "1g1kq1aimhm23k2dmlmnznfzc83l6ly65g0h32hqz8injcdz3d71")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 0654e431720019e4b3834bfd1ebd4960335b0ada Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 8 Jun 2021 13:28:23 +0000 Subject: gnu: ptpython: Update to 3.0.17. * gnu/packages/python-xyz.scm (ptpython): Update to 3.0.17. [propagated-inputs]: Add python-black. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 444c23d8e2..2df04c8a11 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15340,18 +15340,19 @@ well.") (define-public ptpython (package (name "ptpython") - (version "3.0.5") + (version "3.0.17") (source (origin (method url-fetch) (uri (pypi-uri "ptpython" version)) (sha256 (base32 - "0c2ry5gwi2v99slna62j8r2bwq0hpzmvgdryqg9m6x57vbjfg52h")))) + "1phk1grcvn456igjg8gwjjg8bf4kszddq5nd5sdlz3hslg62a7ci")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; FIXME: No tests in pypi tarball. + `(#:tests? #f)) ;there are no tests (propagated-inputs `(("python-appdirs" ,python-appdirs) + ("python-black" ,python-black) ("python-jedi" ,python-jedi) ("python-prompt-toolkit" ,python-prompt-toolkit) ("python-pygments" ,python-pygments))) -- cgit v1.2.3 From 63d2928a3b3cfeef7fdc2f0334d4554ff92fbda6 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 8 Jun 2021 13:33:03 +0000 Subject: gnu: python-toolz: Enable tests. * gnu/packages/python-xyz.scm (python-toolz)[arguments]: Remove #:tests?. Override check phase. [native-inputs]: Add python-pytest. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2df04c8a11..961e668ec4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21296,9 +21296,17 @@ library's @code{threading} module.") (base32 "1j9i7fdjnx9dz35fdj5gvgxx6585ja9sxgaiv65if77nlxz0m7wj")))) (build-system python-build-system) - ;; FIXME: tests cannot be computed: "Can't perform this operation for - ;; unregistered loader type" - (arguments '(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest" "--doctest-modules" + "--pyargs" "toolz"))))))) + (native-inputs + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/pytoolz/toolz/") (synopsis "List processing tools and functional utilities") (description -- cgit v1.2.3 From 74c70553394e32f7b6d5fa56da3bf3b18623c70f Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 8 Jun 2021 13:35:46 +0000 Subject: gnu: python-toolz: Update to 0.11.1. * gnu/packages/python-xyz.scm (python-toolz): Update to 0.11.1. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 961e668ec4..bfc7af8f83 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21287,14 +21287,14 @@ library's @code{threading} module.") (define-public python-toolz (package (name "python-toolz") - (version "0.9.0") + (version "0.11.1") (source (origin (method url-fetch) (uri (pypi-uri "toolz" version)) (sha256 (base32 - "1j9i7fdjnx9dz35fdj5gvgxx6585ja9sxgaiv65if77nlxz0m7wj")))) + "1grz3zvw5ixwqqlbv0n7j11mlcxb66cirh5i9x9zw8kqy0hpk967")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 65e4a610aee167720a1917ea31926b285a93f5b6 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 8 Jun 2021 13:20:29 +0000 Subject: gnu: python-pyzmq: Enable tests. * gnu/packages/python-xyz.scm (python-pyzmq)[arguments]: Remove #:tests?. Add new 'build-extensions' phase to build Cython extensions before tests. [native-inputs]: Remove python-nose. Add python-cython and python-pytest. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bfc7af8f83..543f25848a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9124,14 +9124,18 @@ applications.") (arguments `(#:configure-flags (list (string-append "--zmq=" (assoc-ref %build-inputs "zeromq"))) - ;; FIXME: You must build pyzmq with 'python setup.py build_ext - ;; --inplace' for 'python setup.py test' to work. - #:tests? #f)) + #:phases + (modify-phases %standard-phases + (add-before 'check 'build-extensions + (lambda _ + ;; Cython extensions have to be built before running the tests. + (invoke "python" "setup.py" "build_ext" "--inplace")))))) (inputs `(("zeromq" ,zeromq))) (native-inputs `(("pkg-config" ,pkg-config) - ("python-nose" ,python-nose))) + ("python-cython" ,python-cython) + ("python-pytest" ,python-pytest))) (home-page "https://github.com/zeromq/pyzmq") (synopsis "Python bindings for 0MQ") (description -- cgit v1.2.3 From 172a0794bb9fe3af77ea459145bf7364b82c5cf2 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 8 Jun 2021 13:21:53 +0000 Subject: gnu: python-pyzmq: Update to 22.1.0. * gnu/packages/python-xyz.scm (python-pyzmq): Update to 22.1.0. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 543f25848a..18e756d682 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9113,13 +9113,13 @@ applications.") (define-public python-pyzmq (package (name "python-pyzmq") - (version "22.0.3") + (version "22.1.0") (source (origin (method url-fetch) (uri (pypi-uri "pyzmq" version)) (sha256 - (base32 "0bgrn65cxfz1c1sjrgyq5dy1mkhppxxbizd5wvrl03cq4zhkrxpp")))) + (base32 "0pa1y97z75xqyca9xfp9zrzksydbgzsxf8yh0hwp0rgahpfxch3h")))) (build-system python-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ea0a51071e68c37a4c9c25421cf03bc2f442c67b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 9 Apr 2021 21:53:32 -0400 Subject: gnu: Rename qtbase to qtbase-5. This change was automated via the following command: $ git ls-files | xargs sed -i 's/,qtbase)/,qtbase-5)/g' $ git ls-files | xargs sed -i 's/inherit qtbase)/inherit qtbase-5)/g' $ git ls-files | xargs sed -i 's/package-version qtbase)/package-version qtbase-5)/g' $ git checkout etc # to clear some spurious changes This is done so the qtbase package can be upgraded to version 6 in the following commit. --- gnu/packages/admin.scm | 2 +- gnu/packages/aidc.scm | 2 +- gnu/packages/animation.scm | 4 +- gnu/packages/astronomy.scm | 4 +- gnu/packages/audio.scm | 20 ++--- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/bittorrent.scm | 2 +- gnu/packages/calendar.scm | 2 +- gnu/packages/chemistry.scm | 6 +- gnu/packages/compression.scm | 2 +- gnu/packages/connman.scm | 2 +- gnu/packages/cvassistant.scm | 2 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/djvu.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/ebook.scm | 2 +- gnu/packages/education.scm | 8 +- gnu/packages/electronics.scm | 2 +- gnu/packages/emulators.scm | 10 +-- gnu/packages/engineering.scm | 16 ++-- gnu/packages/fcitx.scm | 2 +- gnu/packages/fcitx5.scm | 6 +- gnu/packages/finance.scm | 12 +-- gnu/packages/flashing-tools.scm | 4 +- gnu/packages/fpga.scm | 2 +- gnu/packages/game-development.scm | 6 +- gnu/packages/games.scm | 96 ++++++++++----------- gnu/packages/geo.scm | 6 +- gnu/packages/gnupg.scm | 4 +- gnu/packages/gpodder.scm | 2 +- gnu/packages/gps.scm | 6 +- gnu/packages/graphics.scm | 4 +- gnu/packages/gstreamer.scm | 2 +- gnu/packages/image-processing.scm | 6 +- gnu/packages/image-viewers.scm | 6 +- gnu/packages/image.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/julia-jll.scm | 2 +- gnu/packages/kde-frameworks.scm | 172 +++++++++++++++++++------------------- gnu/packages/kde-internet.scm | 16 ++-- gnu/packages/kde-multimedia.scm | 26 +++--- gnu/packages/kde-pim.scm | 80 +++++++++--------- gnu/packages/kde-plasma.scm | 12 +-- gnu/packages/kde-systemtools.scm | 14 ++-- gnu/packages/kde-utils.scm | 22 ++--- gnu/packages/kde.scm | 50 +++++------ gnu/packages/language.scm | 4 +- gnu/packages/lego.scm | 2 +- gnu/packages/linphone.scm | 2 +- gnu/packages/logo.scm | 2 +- gnu/packages/lxqt.scm | 56 ++++++------- gnu/packages/maths.scm | 10 +-- gnu/packages/messaging.scm | 14 ++-- gnu/packages/mpd.scm | 2 +- gnu/packages/music.scm | 40 ++++----- gnu/packages/networking.scm | 4 +- gnu/packages/ocr.scm | 2 +- gnu/packages/orange.scm | 2 +- gnu/packages/password-utils.scm | 4 +- gnu/packages/pdf.scm | 10 +-- gnu/packages/photo.scm | 2 +- gnu/packages/polkit.scm | 2 +- gnu/packages/printers.scm | 4 +- gnu/packages/profiling.scm | 2 +- gnu/packages/pumpio.scm | 2 +- gnu/packages/python-xyz.scm | 4 +- gnu/packages/qt.scm | 112 ++++++++++++------------- gnu/packages/radio.scm | 22 ++--- gnu/packages/robotics.scm | 4 +- gnu/packages/scribus.scm | 2 +- gnu/packages/sync.scm | 6 +- gnu/packages/syndication.scm | 2 +- gnu/packages/synergy.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/telephony.scm | 4 +- gnu/packages/terminals.scm | 2 +- gnu/packages/tex.scm | 4 +- gnu/packages/text-editors.scm | 4 +- gnu/packages/video.scm | 20 ++--- gnu/packages/web-browsers.scm | 2 +- gnu/packages/web.scm | 10 +-- gnu/packages/xdisorg.scm | 2 +- gnu/packages/xorg.scm | 2 +- 84 files changed, 515 insertions(+), 515 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3ecbfbc1fd..52851c9d80 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1866,7 +1866,7 @@ command.") (package (inherit wpa-supplicant) (name "wpa-supplicant-gui") - (inputs `(("qtbase" ,qtbase) + (inputs `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ,@(package-inputs wpa-supplicant))) (native-inputs diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index d1b63de736..3db631d92e 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -195,7 +195,7 @@ C/C++ programs to use its capabilities without restrictions or overhead.") ("imagemagick" ,imagemagick) ("libjpeg" ,libjpeg-turbo) ("python" ,python) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("v4l-utils" ,v4l-utils))) (synopsis "Bar code reader") diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 71fc8f20b0..bf44f3b8a9 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -450,7 +450,7 @@ language.") qt))) #t)))))) (inputs - `(("qt" ,qtbase) + `(("qt" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("libsndfile" ,libsndfile))) (native-inputs @@ -480,7 +480,7 @@ waveform until they line up with the proper sounds.") "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh")))) (build-system gnu-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtxmlpatterns" ,qtxmlpatterns) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg))) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c4a686957d..023aa98afc 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -412,7 +412,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") (base32 "04vg2asj9gygwnrs32scqc8192ln2lyqa9v7cjqk8zd4frkwszwp")))) (build-system cmake-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtlocation" ,qtlocation) ("qtmultimedia" ,qtmultimedia) ("qtscript" ,qtscript) @@ -421,7 +421,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") (native-inputs `(("gettext" ,gettext-minimal) ; xgettext is used at compile time ("perl" ,perl) ; for pod2man - ("qtbase" ,qtbase) ; Qt MOC is needed at compile time + ("qtbase" ,qtbase-5) ; Qt MOC is needed at compile time ("qttools" ,qttools))) (arguments `(#:test-target "test" diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 70c06f54a1..3885a22e10 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -497,7 +497,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband ("jack" ,jack-1) ("ladspa" ,ladspa) ("liblo" ,liblo) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) @@ -2149,7 +2149,7 @@ synchronous execution of all clients, and low latency operation.") ("gtk2" ,gtk+-2) ("gtk3" ,gtk+) ("gtkmm" ,gtkmm-2) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("jack" ,jack-1))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -2741,7 +2741,7 @@ different audio devices such as ALSA or PulseAudio.") `(("jack" ,jack-1) ("alsa-lib" ,alsa-lib) ("portaudio" ,portaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) @@ -2775,11 +2775,11 @@ into various outputs and to start, stop and configure jackd") (string-append "PREFIX=" (assoc-ref outputs "out")))))))) (native-inputs - `(("qtbase" ,qtbase))) ; for qmake + `(("qtbase" ,qtbase-5))) ; for qmake (inputs `(("jack" ,jack-1) ("libsndfile" ,libsndfile) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://sourceforge.net/projects/qjackrcd/") (synopsis "Stereo audio recorder for JACK") (description "QJackRcd is a simple graphical stereo recorder for JACK @@ -2888,7 +2888,7 @@ link REQUIRED)")) ("boost" ,boost) ("boost-sync" ,boost-sync) ("yaml-cpp" ,yaml-cpp) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg) ("qtwebchannel" ,qtwebchannel) @@ -3090,7 +3090,7 @@ the Turtle syntax.") `(("lv2" ,lv2) ("gtk+" ,gtk+-2) ("gtk+" ,gtk+) - ("qt" ,qtbase))) + ("qt" ,qtbase-5))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://drobilla.net/software/suil/") @@ -3566,7 +3566,7 @@ interface.") ("pkg-config" ,pkg-config))) (inputs `(("fluidsynth" ,fluidsynth) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (home-page "https://qsynth.sourceforge.io") (synopsis "Graphical user interface for FluidSynth") @@ -4742,7 +4742,7 @@ as is the case with audio plugins.") ;; (ModuleNotFoundError: No module named 'PyQt5') ("python-wrapper" ,python-wrapper) ("libx11" ,libx11) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib) ;; For WRAP-SCRIPT above. @@ -5101,7 +5101,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.") `(("catch" ,catch-framework) ("python" ,python) ;for running tests ("portaudio" ,portaudio) ;for portaudio examples - ("qtbase" ,qtbase) ;for Qt examples + ("qtbase" ,qtbase-5) ;for Qt examples ("qtdeclarative" ,qtdeclarative) ("qttools" ,qttools))) (inputs diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d1c6b8812b..d09f55e5b8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11030,7 +11030,7 @@ Thus the per-base error rate is similar to the raw input reads.") (install-file "Bandage" (string-append out "/bin")) #t)))))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (native-inputs `(("imagemagick" ,imagemagick))) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 29b0d62ad2..5d6a780aab 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -459,7 +459,7 @@ desktops.") ("libtorrent-rasterbar" ,libtorrent-rasterbar) ("openssl" ,openssl) ("python" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) (home-page "https://www.qbittorrent.org/") diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index f62f746357..aaf1e693fb 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -347,7 +347,7 @@ and ruby. It includes two illustrative command-line programs, @code{hcal} and (native-inputs `(("perl" ,perl))) ; pod2man (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://www.toastfreeware.priv.at/confclerk") (synopsis "Offline conference schedule application") (description diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 4b0e719959..a52ecf69f7 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -80,7 +80,7 @@ ("molequeue" ,molequeue) ("python" ,python) ("spglib" ,spglib) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments '(#:configure-flags (list "-DENABLE_TESTING=ON" (string-append "-DSPGLIB_INCLUDE_DIR=" @@ -116,7 +116,7 @@ bioinformatics, materials science, and related areas.") `(("avogadrolibs" ,avogadrolibs) ("hdf5" ,hdf5) ("molequeue" ,molequeue) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) ;; TODO: Enable tests with "-DENABLE_TESTING" configure flag. (arguments '(#:tests? #f)) @@ -301,7 +301,7 @@ biological structures.") "1w1fgxzqrb5yxvpmnc3c9ymnvixy0z1nfafkd9whg9zw8nbgl998")))) (build-system cmake-build-system) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments '(#:configure-flags '("-DENABLE_TESTING=ON") #:phases diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 156219f3f3..60704295c0 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2211,7 +2211,7 @@ download times, and other distribution and storage costs.") (native-inputs `(("doxygen" ,doxygen))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("zlib" ,zlib))) (home-page "https://stachenov.github.io/quazip/index.html") (synopsis "Qt/C++ wrapper for Minizip") diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index 74db5fc919..ac3e7422e8 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -149,7 +149,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.") (sha256 (base32 "0jn12wxwjznady6aniwmvahg1dj25p902sdwj0070biv6vx5c7dq")))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (native-inputs `(("qttools" ,qttools))) (build-system gnu-build-system) diff --git a/gnu/packages/cvassistant.scm b/gnu/packages/cvassistant.scm index f57806d734..3f3a6f7492 100644 --- a/gnu/packages/cvassistant.scm +++ b/gnu/packages/cvassistant.scm @@ -69,7 +69,7 @@ (replace 'configure (lambda _ (invoke "qmake")))))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("quazip" ,quazip) ("zlib" ,zlib))) (home-page "https://cvassistant.sourceforge.io/") diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 6ea6e1a161..8a0342d7c5 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -80,7 +80,7 @@ ("libxcb" ,libxcb) ("libxkbcommon" ,libxkbcommon) ("linux-pam" ,linux-pam) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ;; Some user-defined themes use QtQuick components internally. Adding diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 6423eb124f..96071b8da1 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -119,7 +119,7 @@ utilities.") ("glib" ,glib) ("libxt" ,libxt) ("libtiff" ,libtiff) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 39510316d2..19190f4480 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -330,7 +330,7 @@ local system.") (inputs `(("libarchive" ,libarchive) ("sqlite" ,sqlite) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 2ea1521cf7..48f005f51a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -147,7 +147,7 @@ with Microsoft Compiled HTML (CHM) files") (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("qtbase" ,qtbase) ; for qmake + ("qtbase" ,qtbase-5) ; for qmake ("python-flake8" ,python-flake8) ("python-pyqt-builder" ,python-pyqt-builder) ("xdg-utils" ,xdg-utils))) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index b326030236..45d7311290 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -191,7 +191,7 @@ of categories with some of the activities available in that category. (inputs `(("openssl" ,openssl) ("python" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) @@ -260,7 +260,7 @@ Currently available boards include: ;; Recreate Makefile (invoke "qmake"))))))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia))) (home-page "https://www.tipp10.com/") (synopsis "Touch typing tutor") @@ -638,7 +638,7 @@ Portuguese, Spanish and Italian.") (replace 'configure (lambda _ (invoke "qmake" "fet.pro")))))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://www.lalescu.ro/liviu/fet/") (synopsis "Timetabling software") (description @@ -712,7 +712,7 @@ language and very flexible regarding to new or unknown keyboard layouts.") ("kxmlgui" ,kxmlgui) ("libxcb" ,libxcb) ("libxkbfile" ,libxkbfile) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols2" ,qtquickcontrols2) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 861544ee22..0e985c9750 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -277,7 +277,7 @@ format support.") ("glibmm" ,glibmm) ("libsigrok" ,libsigrok) ("libsigrokdecode" ,libsigrokdecode) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (home-page "https://www.sigrok.org/wiki/PulseView") (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok") diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 54b7b58a02..ec8d3d21d6 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -276,7 +276,7 @@ SuperCPU.") ("openal" ,openal) ("pugixml" ,pugixml) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sdl2" ,sdl2) ("sfml" ,sfml) ("soil" ,soil) @@ -376,7 +376,7 @@ older games.") #:tests? #f)) ; test suite wants mips toolchain (inputs `(("elfutils" ,elfutils) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://github.com/cvut/QtMips") (synopsis "MIPS CPU emulator") (description "This package contains a MIPS CPU emulator. The simulator @@ -620,7 +620,7 @@ The following systems are supported: ("mesa" ,mesa) ("minizip" ,minizip) ("ncurses" ,ncurses) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("sdl2" ,sdl2) ("sqlite" ,sqlite) @@ -1379,7 +1379,7 @@ as RetroArch.") ("openal" ,openal) ("pulseaudio" ,pulseaudio) ("python" ,python) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sdl" ,sdl2) ("udev" ,eudev) ("vulkan-loader" ,vulkan-loader) @@ -1799,7 +1799,7 @@ This is a part of the TiLP project.") ("pugixml" ,pugixml) ("pulseaudio" ,pulseaudio) ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("rapidjson" ,rapidjson) ("sdl" ,(sdl-union (list sdl2 sdl2-ttf))) ("sqlite" ,sqlite) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 981dd9e5e3..1074aa5621 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -201,7 +201,7 @@ `(("boost" ,boost) ("muparser" ,muparser) ("freetype" ,freetype) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (native-inputs `(("pkg-config" ,pkg-config) @@ -701,7 +701,7 @@ multipole-accelerated algorithm.") (string-append "PREFIX=" out) "phoenix.pro"))))))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtserialport" ,qtserialport) ("qtsvg" ,qtsvg) ("libgit2" ,libgit2) @@ -834,7 +834,7 @@ fonts to gEDA.") (inputs `(("boost" ,boost) ("libpng" ,libpng) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("eigen" ,eigen) ("guile" ,guile-3.0))) (home-page "https://libfive.com") @@ -2047,7 +2047,7 @@ parallel computing platforms. It also supports serial execution.") (base32 "1b5dkanz3q0y5ag80w0l85hn7axrachb5m9zvyv4zvzrfy09wa88")))) (build-system gnu-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) (native-inputs @@ -2209,7 +2209,7 @@ simulation.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("openssl" ,openssl) ;; Depends on radare2 4.5.1 officially, builds and works fine with @@ -2288,7 +2288,7 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") ("mpfr" ,mpfr) ("opencsg" ,opencsg) ("qscintilla" ,qscintilla) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia))) (native-inputs `(("bison" ,bison) @@ -2420,7 +2420,7 @@ comments."))) ("python-pyyaml" ,python-pyyaml) ("python-shiboken-2" ,python-shiboken-2) ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) @@ -2700,7 +2700,7 @@ export filters.") (base32 "1cgx24wxh2ah5pff51rcrk6x8qcdjpkxcdak7s4cfzmxvjlshydd")))) (build-system cmake-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("qtxmlpatterns" ,qtxmlpatterns) ("mesa" ,mesa) diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm index 80bfbd8c84..c602789b45 100644 --- a/gnu/packages/fcitx.scm +++ b/gnu/packages/fcitx.scm @@ -88,7 +88,7 @@ ("libintl" ,intltool) ("libxkbcommon" ,libxkbcommon))) (propagated-inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (synopsis "Fcitx Qt5 Input Context") (description "This package provides a Qt5 frontend for fcitx.") (home-page "https://github.com/fcitx/fcitx-qt5/") diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 33b0175f40..737f47f20f 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -271,7 +271,7 @@ for GTK+2/GTK+3 application.") `(("fcitx5" ,fcitx5) ("libxcb" ,libxcb) ("libxkbcommon" ,libxkbcommon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("gettext" ,gettext-minimal))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -317,7 +317,7 @@ for Qt based application.") ("fmt" ,fmt) ("libpthread-stubs" ,libpthread-stubs) ("opencc" ,opencc) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("fcitx5-qt" ,fcitx5-qt) ("qtwebkit" ,qtwebkit))) (native-inputs @@ -365,7 +365,7 @@ including input methods previous bundled inside Fcitx 4: (inputs `(("fcitx5" ,fcitx5) ("fcitx5-qt" ,fcitx5-qt) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("kitemviews" ,kitemviews) ("kwidgetsaddons" ,kwidgetsaddons) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index acc07774b1..d4c571d3ec 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -138,7 +138,7 @@ ("libevent" ,libevent) ("miniupnpc" ,miniupnpc) ("openssl" ,openssl) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:configure-flags (list @@ -773,7 +773,7 @@ the Monero command line client and daemon.") `(,@(package-inputs monero) ("libgcrypt" ,libgcrypt) ("monero" ,monero) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) @@ -1309,7 +1309,7 @@ Trezor wallet.") ("openssl" ,openssl) ("protobuf" ,protobuf) ("qrencode" ,qrencode) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zeromq" ,zeromq) ("zlib" ,zlib))) (arguments @@ -1422,7 +1422,7 @@ following three utilities are included with the library: ("openssl" ,openssl) ("protobuf" ,protobuf) ("qrencode" ,qrencode) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zeromq" ,zeromq) ("zlib" ,zlib))) (arguments @@ -1496,7 +1496,7 @@ a Qt GUI.") `(("qttools" ,qttools))) (inputs `(("python" ,python) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("rocksdb" ,rocksdb) ("zlib" ,zlib))) (home-page "https://gitlab.com/FloweeTheHub/fulcrum/") @@ -1561,7 +1561,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.") ("libevent" ,libevent) ("miniupnpc" ,miniupnpc) ("openssl" ,openssl) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools) diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 4b597dca50..e0a099e966 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -333,7 +333,7 @@ RK3036, RK3066, RK312X, RK3168, RK3188, RK3288, RK3368.") #t)))))) (inputs `(("libusb" ,libusb) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib))) (home-page "https://glassechidna.com.au/heimdall/") (synopsis "Flash firmware onto Samsung mobile devices") @@ -476,7 +476,7 @@ ME as far as possible (it only edits ME firmware image files).") "/bin")) #t))))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://github.com/LongSoft/UEFITool/") (synopsis "UEFI image editor") (description "@code{uefitool} is a graphical image file editor for diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 380a09d7f6..5509f19471 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -289,7 +289,7 @@ Includes the actual FTDI connector.") ("eigen" ,eigen) ("icestorm" ,icestorm) ("python" ,python) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("yosys" ,yosys))) (build-system cmake-build-system) (arguments diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 2ac9c838f6..78983cd991 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -461,7 +461,7 @@ support.") "1prajkx1xpp3csa0xpkrn3c2cnzvmwzxgrqb9d3gqszp3sllr2dg")))) (build-system gnu-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) @@ -1612,7 +1612,7 @@ of use.") ("mygui" ,mygui-gl) ; OpenMW does not need Ogre. ("openal" ,openal) ("openscenegraph" ,openmw-openscenegraph) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sdl" ,sdl2) ("unshield" ,unshield))) (synopsis "Re-implementation of the RPG Morrowind engine") @@ -2431,7 +2431,7 @@ utilities frequently used in roguelikes.") ("mesa" ,mesa) ("openal" ,openal) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("sdl2" ,sdl2) ("uuid.h" ,util-linux "lib") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 26d3567024..6b3a6f0e1f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -928,7 +928,7 @@ want what you have.") ("pkg-config" ,pkg-config))) (inputs `(("protobuf" ,protobuf) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) ("qttools" ,qttools) @@ -2414,7 +2414,7 @@ and defeat them with your bubbles!") ("luajit" ,luajit) ("openal" ,openal) ("physfs" ,physfs) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sdl2" ,(sdl-union (list sdl2 sdl2-image sdl2-ttf))))) (home-page "https://www.solarus-games.org/") (synopsis "Lightweight game engine for Action-RPGs") @@ -5191,7 +5191,7 @@ in-window at 640x480 resolution or fullscreen.") ("miniupnpc" ,miniupnpc) ("openal" ,openal) ("physfs" ,physfs) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("openssl" ,openssl) ("sdl2" ,sdl2) @@ -7245,7 +7245,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available. ;; with multiple "QPainter:: ... Painter not active" warnings. #:tests? #f)) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (native-inputs `(("cmake" ,cmake-minimal) @@ -8962,7 +8962,7 @@ a fortress beyond the forbidden swamp.") ("mesa" ,mesa) ("miniupnpc" ,miniupnpc) ("openal" ,openal) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("readline" ,readline) ("sdl" ,sdl2) ("tinyxml" ,tinyxml) @@ -9296,7 +9296,7 @@ and also provides the base for the FlightGear Flight Simulator.") ("openal" ,openal) ("openscenegraph" ,openscenegraph-3.4) ("plib" ,plib) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg) ("simgear" ,simgear) @@ -9423,7 +9423,7 @@ play with up to four players simultaneously. It has network support.") ("libpng" ,libpng) ("lua" ,lua-5.1) ("physfs" ,physfs) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sdl" ,(sdl-union (list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image))))) (native-inputs @@ -10108,7 +10108,7 @@ remake of that series or any other game.") ("ocl-icd" ,ocl-icd) ("openblas" ,openblas) ("opencl-headers" ,opencl-headers) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib))) (arguments '(#:configure-flags '("-DUSE_BLAS=YES") @@ -10151,7 +10151,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg))) (arguments @@ -10243,7 +10243,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("python" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) @@ -10291,7 +10291,7 @@ This package is part of the KDE games module.") ("knewstuff" ,knewstuff) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -10330,7 +10330,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("ktextwidgets" ,ktextwidgets) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Miniature golf game") @@ -10374,7 +10374,7 @@ This package is part of the KDE games module.") ("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") (synopsis "Shared library for kmahjongg and kshisen") @@ -10407,7 +10407,7 @@ other Mah Jongg like games.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("libkmahjongg" ,libkmahjongg) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -10450,7 +10450,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("libkmahjongg" ,libkmahjongg) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Shisen-Sho solitaire game") @@ -10495,7 +10495,7 @@ This package is part of the KDE games module.") ("python" ,python) ("python-twisted" ,python-twisted) ("python-pyqt" ,python-pyqt) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") (synopsis "Classical Mah Jongg game for 4 players") @@ -10538,7 +10538,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Breakout like game") @@ -10577,7 +10577,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Classical mine sweeper game") @@ -10614,7 +10614,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -10654,7 +10654,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -10693,7 +10693,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -10737,7 +10737,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("glu" ,glu) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -10794,7 +10794,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Place 5 equal pieces together, but wait, there are 3 new ones") @@ -10838,7 +10838,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Action and puzzle solving game") @@ -10882,7 +10882,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Three-in-a-row game") @@ -10918,7 +10918,7 @@ This package is part of the KDE games module.") ("ki18n" ,ki18n) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -10958,7 +10958,7 @@ This package is part of the KDE games module.") ("ktextwidgets" ,ktextwidgets) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11000,7 +11000,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Turn the board pieces to get all computers connected") @@ -11039,7 +11039,7 @@ This package is part of the KDE games module.") ("ki18n" ,ki18n) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Arcade bombing game") @@ -11084,7 +11084,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11121,7 +11121,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("phonon" ,phonon) ("qca" ,qca) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) @@ -11183,7 +11183,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg) ("shared-mime-info" ,shared-mime-info))) @@ -11225,7 +11225,7 @@ This package is part of the KDE games module.") ("kiconthemes" ,kiconthemes) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Yahtzee dice game") @@ -11265,7 +11265,7 @@ This package is part of the KDE games module.") ("ktextwidgets" ,ktextwidgets) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11311,7 +11311,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11352,7 +11352,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11391,7 +11391,7 @@ This package is part of the KDE games module.") ("ki18n" ,ki18n) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11431,7 +11431,7 @@ This package is part of the KDE games module.") ("ki18n" ,ki18n) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11465,7 +11465,7 @@ This package is part of the KDE games module.") ("ki18n" ,ki18n) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11505,7 +11505,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Port of the classic BSD console game robots") @@ -11547,7 +11547,7 @@ This package is part of the KDE games module.") ("ki18n" ,ki18n) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11585,7 +11585,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Simple ball dodging game") @@ -11626,7 +11626,7 @@ This package is part of the KDE games module.") ("ktextwidgets" ,ktextwidgets) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Battleship board game with built-in game server") @@ -11666,7 +11666,7 @@ This package is part of the KDE games module.") ("kio" ,kio) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11708,7 +11708,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://games.kde.org/") (synopsis "Dots and Boxes game") @@ -11745,7 +11745,7 @@ This package is part of the KDE games module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -11908,7 +11908,7 @@ and chess engines.") (native-inputs `(("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtspeech" ,qtspeech) ("qtsvg" ,qtsvg) @@ -12239,7 +12239,7 @@ game.") ;thanks to Debian for description ("libgcrypt" ,libgcrypt) ("libircclient" ,libircclient) ("protobuf" ,protobuf-2) ; remove package when no longer needed - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sdl" ,(sdl-union (list sdl sdl-mixer))) ("sqlite" ,sqlite) ("tinyxml" ,tinyxml) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c4bdb6aca0..a0b43308e4 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1247,7 +1247,7 @@ map display. Downloads map data from a number of websites, including ("libpng" ,libpng) ("openjpeg" ,openjpeg) ("proj.4" ,proj.4) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib))) (synopsis "Weather Forecast Visualization") (description @@ -1663,7 +1663,7 @@ using the dataset of topographical information collected by `(("gdal" ,gdal) ("libjpeg-turbo" ,libjpeg-turbo) ("proj" ,proj) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtlocation" ,qtlocation) ("qtwebchannel" ,qtwebchannel) @@ -2282,7 +2282,7 @@ growing set of geoscientific methods.") ("python-urllib3" ,python-urllib3) ("qca" ,qca) ("qscintilla" ,qscintilla) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtkeychain" ,qtkeychain) ("qtlocation" ,qtlocation) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index fefa1e01f1..9cc94dddb6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -410,7 +410,7 @@ and every application benefits from this.") ,@(package-native-inputs gpgme))) (inputs `(("gpgme" ,gpgme) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ,@(package-inputs gpgme))) (synopsis "Qt API bindings for gpgme") (description "QGpgme provides a very high level Qt API around GpgMEpp. @@ -863,7 +863,7 @@ software."))) (arguments `(#:configure-flags '("--enable-fallback-curses"))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ,@(package-inputs pinentry-tty))) (description "Pinentry provides a console and a Qt GUI that allows users to enter a diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 677ec3f33e..1219162016 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -144,7 +144,7 @@ locally for later listening.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("qt" ,qtbase))) + `(("qt" ,qtbase-5))) (arguments `(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index d2f0becec0..0eb4362858 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -85,7 +85,7 @@ (inputs `(("expat" ,expat) ("libusb" ,libusb) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib))) (native-inputs `(("which" ,which) @@ -207,7 +207,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (string-append "PREFIX=" (assoc-ref outputs "out")))))))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (native-inputs `(("qttools" ,qttools))) (home-page "https://www.gpxsee.org") @@ -246,7 +246,7 @@ such as elevation, speed, heart rate, power, temperature, and gear shifts.") ("python-pygobject" ,python-pygobject) ("python-pyserial" ,python-pyserial) ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:scons-flags (list (string-append "prefix=" %output) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 1006bb3cb4..4f465f6d99 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1500,7 +1500,7 @@ exec -a \"$0\" ~a/.brdf-real~%" (native-inputs `(("qttools" ,qttools))) ;for 'qmake' (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("mesa" ,mesa) ("glew" ,glew) ("freeglut" ,freeglut) @@ -1936,7 +1936,7 @@ Automated palette selection is supported.") ("libvpx" ,libvpx) ("libxi" ,libxi) ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 9e70961655..3047773e0f 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -767,7 +767,7 @@ model to base your own plug-in on, here it is.") ("openssl" ,openssl) ("opus" ,opus) ("orc" ,orc) - ;("qtbase" ,qtbase) + ;("qtbase" ,qtbase-5) ;("qtdeclarative" ,qtdeclarative) ;("qtx11extras" ,qtx11extras) ("soundtouch" ,soundtouch) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index da2653c546..7b29c2a215 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -707,7 +707,7 @@ including 2D color images.") ("qttools" ,qttools))) (inputs `(("gmic" ,gmic) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ,@(package-inputs gmic))) (synopsis "Qt frontend for the G'MIC image processing framework") (license license:gpl3+))) @@ -1035,7 +1035,7 @@ combine the information contained in both.") ;; not with 4.13. It really needs to be 4.12. ("itk" ,insight-toolkit-4.12) ("vtk" ,vtk-6) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("vxl" ,vxl-1) ("zlib" ,zlib))) @@ -1162,7 +1162,7 @@ substituted by matching images.") ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) (arguments diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index c7dd358ad4..f01b6a614a 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -358,7 +358,7 @@ It supports JPEG, PNG and GIF formats.") `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg) ("qtwebkit" ,qtwebkit) @@ -527,7 +527,7 @@ For PDF support, install the @emph{mupdf} package.") (("updateText\\(\\);") "")) #t))))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtimageformats" ,qtimageformats))) (home-page "https://interversehq.com/qview/") @@ -733,7 +733,7 @@ to set X desktop background.") ("opencv" ,opencv) ("python" ,python-wrapper) ("quazip" ,quazip) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 8f068a01eb..457fb90744 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1824,7 +1824,7 @@ parsing, viewing, modifying, and saving this metadata.") (native-inputs `(("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (arguments `(#:tests? #f)) ;no tests diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 2232654330..d9c03c764f 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -131,7 +131,7 @@ `(("inxi" ,inxi-minimal) ("libdbusmenu-qt" ,libdbusmenu-qt) ("qca" ,qca) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtscript" ,qtscript) ("qtsvg" ,qtsvg) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 65453be88c..baef61b824 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -475,7 +475,7 @@ protocols, as well as decentralized calling using P2P-DHT.") `(("libring" ,libring) ("network-manager" ,network-manager))) (propagated-inputs - `(("qtbase" ,qtbase))) ; Qt is included in several installed headers. + `(("qtbase" ,qtbase-5))) ; Qt is included in several installed headers. (arguments `(#:tests? #f ; There is no testsuite. #:configure-flags diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index edf53d18ac..0cf3515b03 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -1512,7 +1512,7 @@ build tree Yggdrasil.") ;; There's a Julia file for each platform, override them all (find-files "src/wrappers/" "\\.jl$"))))))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (propagated-inputs `(("julia-jllwrappers" ,julia-jllwrappers) ("julia-libglvnd-jll" ,julia-libglvnd-jll) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ef47a912ad..7a3b6b26a8 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -98,7 +98,7 @@ "10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3")))) (build-system cmake-build-system) (native-inputs - `(("qtbase" ,qtbase))) ; For tests (needs qmake) + `(("qtbase" ,qtbase-5))) ; For tests (needs qmake) (arguments `(#:phases (modify-phases %standard-phases @@ -165,7 +165,7 @@ common build settings used in software produced by the KDE community.") ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments `(#:configure-flags '("-DCMAKE_CXX_FLAGS=-fPIC" @@ -204,9 +204,9 @@ common build settings used in software produced by the KDE community.") ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) @@ -252,7 +252,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Open Collaboration Service client library") (description "Attica is a Qt library that implements the Open @@ -286,7 +286,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") ("extra-cmake-modules" ,extra-cmake-modules))) (inputs ;; TODO: qtdeclarative (yields one failing test) - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments `(#:configure-flags (list (string-append @@ -319,7 +319,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") ("fdupes" ,fdupes) ("libxml2" ,libxml2))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Default KDE Plasma 5 icon theme") (description "Breeze provides a freedesktop.org compatible icon theme. @@ -356,7 +356,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") ("python-jinja2" ,python-jinja2) ("python-pyyaml" ,python-pyyaml))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Doxygen Tools") (description "This framework contains scripts and data for building API @@ -389,7 +389,7 @@ documentation.") `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("bzip2" ,bzip2) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("xz" ,xz) ("zlib" ,zlib))) (home-page "https://community.kde.org/Frameworks") @@ -425,7 +425,7 @@ GZip format, via a subclass of QIODevice.") ("tzdata" ,tzdata-for-tests))) (inputs `(("libical" ,libical) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -485,7 +485,7 @@ and the older vCalendar.") ("gperf" ,gperf) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "String encoding and manipulating library") (description "KCodecs provide a collection of methods to manipulate @@ -523,7 +523,7 @@ Internet).") ("qttools" ,qttools) ("xorg-server" ,xorg-server-for-tests))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -588,7 +588,7 @@ propagate their changes to their respective configuration files.") ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam ("xorg-server" ,xorg-server-for-tests))) ; for the tests (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -644,7 +644,7 @@ many more.") ("dbus" ,dbus) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("kinit" ,kinit-bootstrap))) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons. (arguments @@ -688,7 +688,7 @@ as well as an API to create KDED modules.") ("qttools" ,qttools))) (inputs `(("avahi" ,avahi) ; alternativly dnssd could be used - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Network service discovery using Zeroconf") (description "KDNSSD is a library for handling the DNS-based Service @@ -711,7 +711,7 @@ infrastructure.") "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l")))) (build-system cmake-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("boost" ,boost) ("graphviz" ,graphviz) ("kiconthemes" ,kiconthemes) @@ -749,7 +749,7 @@ replace the other outdated Graphviz tools.") `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for graphical user interfaces") @@ -784,7 +784,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://invent.kde.org/frameworks/kholidays") (synopsis "Library for regional holiday information") @@ -812,7 +812,7 @@ other special events for a geographical region.") (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtscript" ,qtscript))) (arguments @@ -854,7 +854,7 @@ translation scripting.") ("pkg-config" ,pkg-config))) (inputs `(("libxscrnsaver" ,libxscrnsaver) ; X-Screensaver based poller, fallback mode - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (home-page "https://community.kde.org/Frameworks") (synopsis "Reporting of idle time of user and system") @@ -889,7 +889,7 @@ or user activity.") ;; TODO: Find a way to activate this optional include without ;; introducing a recursive dependency. ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg) @@ -919,7 +919,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item models extending the Qt model-view framework") @@ -971,7 +971,7 @@ model to observers `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item views extending the Qt model-view framework") (description "KItemViews includes a set of views, which can be used with @@ -997,7 +997,7 @@ to flat and hierarchical lists.") `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Data plotting library") (description "KPlotWidget is a QWidget-derived class that provides a virtual @@ -1028,7 +1028,7 @@ pixel units.") ;; Optional, for compile-time validation of syntax definition files: ("qtxmlpatterns" ,qtxmlpatterns))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -1074,7 +1074,7 @@ integration with a custom editor as well as a ready-to-use `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtwayland" ,qtwayland) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) @@ -1116,7 +1116,7 @@ represented by a QPoint or a QSize.") ("qttools" ,qttools) ("xorg-server" ,xorg-server-for-tests))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -1157,7 +1157,7 @@ configuration pages, message boxes, and password requests.") ("xorg-server" ,xorg-server-for-tests))) ; for the tests (inputs `(("libxrender" ,libxrender) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("xcb-utils-keysyms" ,xcb-util-keysyms) ("xcb-util-wm" ,xcb-util-wm))) @@ -1219,7 +1219,7 @@ lower level classes for interaction with the X Windowing System.") ;; Headers contain #include `(("modem-manager" ,modem-manager))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -1258,7 +1258,7 @@ messages.") ;; #include `(("network-manager" ,network-manager))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -1292,7 +1292,7 @@ which are used in DBus communication.") `(("extra-cmake-modules" ,extra-cmake-modules) ("fdupes" ,fdupes))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Oxygen provides the standard icon theme for the KDE desktop") (description "Oxygen icon theme for the KDE desktop") @@ -1317,7 +1317,7 @@ which are used in DBus communication.") (inputs `(("libdmtx" ,libdmtx) ("qrencode" ,qrencode) - ("qtbase" ,qtbase))) ;; TODO: rethink: nix propagates this + ("qtbase" ,qtbase-5))) ;; TODO: rethink: nix propagates this (home-page "https://api.kde.org/frameworks/prison/html/index.html") (synopsis "Barcode generation abstraction layer") (description "Prison is a Qt-based barcode abstraction layer/library and @@ -1343,7 +1343,7 @@ provides uniform access to generation of barcodes with data.") `(("glib" ,glib) ("pulseaudio" ,pulseaudio) ("qtdeclarative" ,qtdeclarative) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/libraries/pulseaudio-qt/") (synopsis "Qt bindings for PulseAudio") (description @@ -1378,7 +1378,7 @@ libpulse.") ("kcoreaddons" ,kcoreaddons) ("kiconthemes" ,kiconthemes) ; optional ("kirigami" ,kirigami) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols2" ,qtquickcontrols2))) (home-page "https://community.kde.org/Frameworks") @@ -1417,7 +1417,7 @@ feel.") ("flex" ,flex) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("udev" ,eudev))) ;; TODO: Add runtime-only dependency MediaPlayerInfo @@ -1449,7 +1449,7 @@ system.") (inputs `(("hunspell" ,hunspell) ;; TODO: hspell (for Hebrew), Voikko (for Finish) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Multi-language spell checker") (description "Sonnet is a plugin-based spell checking library for Qt-based @@ -1474,7 +1474,7 @@ ASpell and HUNSPELL.") (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Helper for multithreaded programming") (description "ThreadWeaver is a helper for multithreaded programming. It @@ -1519,7 +1519,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("solid" ,solid))) (home-page "https://community.kde.org/Frameworks") @@ -1553,7 +1553,7 @@ with other frameworks.") (inputs `(("kcoreaddons" ,kcoreaddons) ("polkit-qt" ,polkit-qt) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -1599,7 +1599,7 @@ utilities.") (inputs `(("kconfig" ,kconfig) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Powerful autocompletion framework and widgets") (description "This framework helps implement autocompletion in Qt-based @@ -1625,7 +1625,7 @@ integrated it into your application's other widgets.") `(("extra-cmake-modules" ,extra-cmake-modules) ("xorg-server" ,xorg-server))) ; for the tests (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (propagated-inputs `(;; As required by KF5ContactsConfig.cmake. ("kcodecs" ,kcodecs) @@ -1672,7 +1672,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. (inputs `(("kcoreaddons" ,kcoreaddons) ("kwindowsystem" ,kwindowsystem) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (home-page "https://community.kde.org/Frameworks") (synopsis "Graceful handling of application crashes") @@ -1705,7 +1705,7 @@ application crashes.") ("libxslt" ,libxslt) ("perl" ,perl) ("perl-uri" ,perl-uri) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -1775,7 +1775,7 @@ from DocBook files.") ("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) ("qtmultimedia" ,qtmultimedia) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ;; Required run-time packages ("catdoc" ,catdoc) ;; Optional run-time packages @@ -1811,7 +1811,7 @@ by applications to write metadata.") (inputs `(("karchive" ,karchive) ; for Krita and OpenRaster images ("openexr" ,openexr) ; for OpenEXR high dynamic-range images - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -1865,7 +1865,7 @@ formats.") (inputs `(("kcoreaddons" ,kcoreaddons) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (home-page "https://community.kde.org/Frameworks") (synopsis "Widgets for showing progress of asynchronous jobs") @@ -1897,7 +1897,7 @@ asynchronous jobs.") ("kcoreaddons" ,kcoreaddons) ("kwindowsystem" ,kwindowsystem) ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtspeech" ,qtspeech) ;; TODO: Think about adding dbusmenu-qt5 from ;; https://launchpad.net/libdbusmenu-qt @@ -1945,7 +1945,7 @@ covers feedback and persistent events.") ("kcoreaddons" ,kcoreaddons) ("kdoctools" ,kdoctools) ("ki18n" ,ki18n) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -2001,7 +2001,7 @@ were traditional plugins.") `(("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) ;; TODO: utempter, for managing UTMP entries - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f ; FIXME: 1/1 tests fail. #:phases @@ -2046,7 +2046,7 @@ and communicating with them using a pty.") `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("ki18n" ,ki18n) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Converting physical units") (description "KUnitConversion provides functions to convert values in @@ -2073,7 +2073,7 @@ gallons).") `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("kcodecs" ,kcodecs) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "RSS/Atom parser library") (description "@code{syndication} supports RSS (0.9/1.0, 0.91..2.0) and @@ -2123,7 +2123,7 @@ between feed formats.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("lmdb" ,lmdb) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("solid" ,solid))) (arguments @@ -2182,7 +2182,7 @@ maintaining an index of the contents of your files.") `(("boost" ,boost) ("kactivities" ,kactivities) ("kconfig" ,kconfig) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://community.kde.org/Frameworks") (synopsis "Access usage statistics collected by the activity manager") @@ -2219,7 +2219,7 @@ by which applications, and what documents have been linked to which activity.") ("kcoreaddons" ,kcoreaddons) ("kiconthemes" ,kiconthemes) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -2281,7 +2281,7 @@ using the XBEL format.") ("kpackage" ,kpackage) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for KDE System Settings modules") @@ -2316,7 +2316,7 @@ KCModules can be created with the KConfigWidgets framework.") ("kguiaddons" ,kguiaddons) ("ki18n" ,ki18n) ;; todo: PythonModuleGeneration - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qttools" ,qttools))) (arguments `(#:phases @@ -2376,7 +2376,7 @@ their settings.") ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("libepoxy" ,libepoxy) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("solid" ,solid))) (arguments @@ -2423,7 +2423,7 @@ that offer bindings to some of the Frameworks.") ("kdoctools" ,kdoctools) ("kinit" ,kinit) ("kservice" ,kservice) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Central daemon of KDE work spaces") (description "KDED stands for KDE Daemon. KDED runs in the background and @@ -2453,7 +2453,7 @@ started on demand.") `(("kconfig" ,kconfig) ("kcoreaddons" ,kcoreaddons) ("kdoctools" ,kdoctools) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ;; optional: ("kcompletion" ,kcompletion) ("kconfigwidgets" ,kconfigwidgets) @@ -2498,7 +2498,7 @@ ini-style description files.") ("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) ("kservice" ,kservice) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "User interface for running shell commands with root privileges") (description "KDESU provides functionality for building GUI front ends for @@ -2531,7 +2531,7 @@ with su and ssh respectively.") ("kparts" ,kparts) ("kservice" ,kservice) ("kwallet" ,kwallet) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtwebkit" ,qtwebkit))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Integration for QtWebKit") @@ -2561,7 +2561,7 @@ engine WebKit via QtWebKit.") `(("karchive" ,karchive) ("kconfig" ,kconfig) ("kcoreaddons" ,kcoreaddons) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -2605,7 +2605,7 @@ emoticons coming from different providers.") ("kservice" ,kservice) ("kwindowsystem" ,kwindowsystem) ("libxcb" ,libxcb) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("xcb-util-keysyms" ,xcb-util-keysyms))) (home-page "https://community.kde.org/Frameworks") @@ -2643,7 +2643,7 @@ window does not need focus for them to be activated.") ("ki18n" ,ki18n) ("kitemviews" ,kitemviews) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (arguments `(#:phases @@ -2721,7 +2721,7 @@ in applications using the KDE Frameworks.") ("kxmlgui" ,kxmlgui) ("libcap" ,libcap) ; to install start_kdeinit with CAP_SYS_RESOURCE ("plasma-framework" ,plasma-framework) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid))) (home-page "https://community.kde.org/Frameworks") (synopsis "Library to speed up start of applications on KDE workspaces") @@ -2781,7 +2781,7 @@ consumption.") ("kwidgetsaddons" ,kwidgetsaddons) ("libxml2" ,libxml2) ("libxslt" ,libxslt) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("qtx11extras" ,qtx11extras) ("sonnet" ,sonnet))) @@ -2863,7 +2863,7 @@ KIO enabled infrastructure.") ("kjobwidgets" ,kjobwidgets) ("ktextwidgets" ,ktextwidgets) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("solid" ,solid) ("sonnet" ,sonnet))) @@ -2916,7 +2916,7 @@ specification.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid))) (home-page "https://community.kde.org/Frameworks") (synopsis "Configuration dialog for desktop notifications") @@ -2970,7 +2970,7 @@ notifications which can be embedded in your application.") ("kjobwidgets" ,kjobwidgets) ("kservice" ,kservice) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid) ("sonnet" ,sonnet))) (home-page "https://community.kde.org/Frameworks") @@ -3002,7 +3002,7 @@ widgets with a user-interface defined in terms of actions.") ("ki18n" ,ki18n) ("kservice" ,kservice) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (arguments `(#:tests? #f)) ; FIXME: 1/3 tests fail. @@ -3053,7 +3053,7 @@ to easily extend the contacts collection.") ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("solid" ,solid) ("threadweaver" ,threadweaver))) @@ -3117,7 +3117,7 @@ typed.") ("kdbusaddons" ,kdbusaddons) ("kdoctools" ,kdoctools) ("ki18n" ,ki18n) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f ; FIXME: 6/10 tests fail. #:phases @@ -3192,7 +3192,7 @@ types or handled by application specific code.") ("kxmlgui" ,kxmlgui) ("libgit2" ,libgit2) ("perl" ,perl) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtscript" ,qtscript) ("qtxmlpatterns" ,qtxmlpatterns) @@ -3262,7 +3262,7 @@ library.") ("kservice" ,kservice) ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtspeech" ,qtspeech))) (home-page "https://community.kde.org/Frameworks") (synopsis "Text editing widgets") @@ -3305,7 +3305,7 @@ It supports rich text as well as plain text.") ("libgcrypt" ,libgcrypt) ("phonon" ,phonon) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Safe desktop-wide storage for passwords") (description "This framework contains an interface to KWallet, a safe @@ -3345,7 +3345,7 @@ the passwords on KDE work spaces.") ("ktextwidgets" ,ktextwidgets) ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sonnet" ,sonnet))) (arguments `(#:tests? #f ; FIXME: 1/5 tests fail. @@ -3398,7 +3398,7 @@ descriptions for integrating actions from plugins.") ("kservice" ,kservice) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid))) (home-page "https://community.kde.org/Frameworks") (synopsis "XML-RPC client") @@ -3457,7 +3457,7 @@ setUrl, setUserAgent and call.") ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg) @@ -3504,7 +3504,7 @@ script engines.") ("ki18n" ,ki18n) ("kio" ,kio) ("kirigami" ,kirigami) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (arguments `(#:tests? #f ;; seem to require network; don't find QTQuick components @@ -3582,7 +3582,7 @@ need.") ("knotificantions" ,knotifications) ("kpackage" ,kpackage) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (arguments `(#:phases @@ -3656,7 +3656,7 @@ workspace.") ("ktextwidgets" ,ktextwidgets) ("kunitconversion" ,kunitconversion) ("kwindowsystem" ,kwindowsystem) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (inputs `(("kcompletion" ,kcompletion) ("kconfig" ,kconfig) @@ -3764,7 +3764,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") ("libpng" ,libpng) ("openssl" ,openssl) ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("sonnet" ,sonnet))) (home-page "https://community.kde.org/Frameworks") @@ -3798,7 +3798,7 @@ technology and using KJS for JavaScript support.") ("pkg-config" ,pkg-config))) (inputs `(("pcre" ,pcre) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 support for Javascript scripting in Qt applications") @@ -3831,7 +3831,7 @@ support.") (inputs `(("ki18n" ,ki18n) ("kjs" ,kjs) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 embedded Javascript engine for Qt") @@ -3866,7 +3866,7 @@ QObjects, so you can script your applications.") ("kparts" ,kparts) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 plugin interface for media player features") (description "KMediaPlayer builds on the KParts framework to provide a @@ -3903,7 +3903,7 @@ KParts instead.") ("kparts" ,kparts) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtscript" ,qtscript))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 solution for application scripting") diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 617937002e..223e1aab7a 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -90,7 +90,7 @@ ("purpose" ,purpose) ("qca" ,qca) ("qoauth" ,qoauth) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtnetworkauth" ,qtnetworkauth) ("qtwebkit" ,qtwebkit) ("sonnet" ,sonnet))) @@ -162,7 +162,7 @@ Other notable features include: ("oxygen-icons" ,oxygen-icons) ; default icon set ("qca" ,qca) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) )) (home-page "http://www.kde.org/") (synopsis "Versatile and user-friendly download manager") @@ -213,7 +213,7 @@ This package is part of the KDE networking module.") ("kwindowsystem" ,kwindowsystem) ("oxygen-icons" ,oxygen-icons) ; default icon set ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qca" ,qca) ("solid" ,solid) ("sonnet" ,sonnet))) @@ -302,7 +302,7 @@ Features are: ("phonon" ,phonon) ("qca" ,qca) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("speex" ,speex) ("v4l-utils" ,v4l-utils) ;; TODO: Xmms @@ -358,7 +358,7 @@ This package is part of the KDE networking module.") ("libssh2" ,libssh) ;; TODO: libvnc{server,client} - is not tigervnc-{server,client} ("oxygen-icons" ,oxygen-icons) ; default icon set - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/internet/org.kde.krdc") (synopsis "Remote desktop client") (description "KRDC is a client application that allows you to view or even @@ -412,7 +412,7 @@ This package is part of the KDE networking module.") ;; TODO: LibKWorkspace -> plasma-workspace? ("oxygen-icons" ,oxygen-icons) ; default icon set ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("qtwebkit" ,qtwebkit) ("solid" ,solid) @@ -447,7 +447,7 @@ a full-featured client for BitTorrent.") ("kpimcommon" ,kpimcommon) ("ktextwidgets" ,ktextwidgets) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?) (home-page "https://invent.kde.org/pim/libgravatar") @@ -482,7 +482,7 @@ unnecessary network operations.") ("kio" ,kio) ("libgcrypt" ,libgcrypt) ("qca" ,qca) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid))) (home-page "https://invent.kde.org/network/libktorrent") (synopsis "BitTorrent protocol library for C++ / Qt 5 / KDE Frameworks") diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 35058363d3..21ca996246 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -71,7 +71,7 @@ ("libkcompactdisc" ,libkcompactdisc) ("libvorbis" ,libvorbis) ("phonon" ,phonon) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/multimedia/org.kde.kio_audiocd") (synopsis "Transparent audio CD integration for applications using the KDE Platform") @@ -117,7 +117,7 @@ This package is part of the KDE multimedia module.") ("oxygen-icons" ,oxygen-icons) ; default icon set ("phonon" ,phonon) ("phonon-backend-gstreamer" ,phonon-backend-gstreamer) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid))) (home-page "https://kde.org/applications/multimedia/org.kde.dragonplayer") (synopsis "Simple video player") @@ -169,7 +169,7 @@ This package is part of the KDE multimedia module.") ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ; default icon set ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ; not listed as dependency ("qtmultimedia" ,qtmultimedia) @@ -226,7 +226,7 @@ its own database. You can build and play your own playlist.") ("kconfig" ,kconfig) ("ki18n" ,ki18n) ("kio" ,kio) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/multimedia/org.kde.ffmpegthumbs") (synopsis "Video thumbnail generator for KDE using ffmpeg") (description " @@ -272,7 +272,7 @@ This package is part of the KDE multimedia module.") ("oxygen-icons" ,oxygen-icons) ; default icon set ("phonon" ,phonon) ("phonon-backend-gstreamer" ,phonon-backend-gstreamer) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("taglib" ,taglib))) (home-page "https://kde.org/applications/multimedia/org.kde.juk") @@ -368,7 +368,7 @@ This package is part of the KDE multimedia module.") ("libsndfile" ,libsndfile) ("libvorbis" ,libvorbis) ("oxygen-icons" ,oxygen-icons) ; default icon set - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtwebkit" ,qtwebkit) ("shared-mime-info" ,shared-mime-info) ("solid" ,solid) @@ -414,7 +414,7 @@ available CD drives.") ("kxmlgui" ,kxmlgui) ("libxscrnsaver" ,libxscrnsaver) ("oxygen-icons" ,oxygen-icons) ; default icon set - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid) ("v4l-utils" ,v4l-utils) ; libdvbv5 @@ -468,7 +468,7 @@ autoloading of subtitle files for use while playing video.") ("kparts" ,kparts) ("oxygen-icons" ,oxygen-icons) ; default icon set ("purpose" ,purpose) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) @@ -523,7 +523,7 @@ camera. Use it to take pictures and make videos to share.") ("oxygen-icons" ,oxygen-icons) ; default icon set ("plasma-framework" ,plasma-framework) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid))) (home-page "https://kde.org/applications/multimedia/org.kde.kmix") (synopsis "Volume control and mixer") @@ -566,7 +566,7 @@ This package is part of the KDE multimedia module.") ("libxcb" ,libxcb) ;; FIXME: why does cmake not find XEVIE and XPRINT? ("oxygen-icons" ,oxygen-icons) ; default icon set ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("cairo" ,cairo) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) @@ -642,7 +642,7 @@ Some features: ("opus" ,opus) ("oxygen-icons" ,oxygen-icons) ; default icon set ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("zlib" ,zlib))) (home-page "https://kde.org/applications/multimedia/org.kde.kwave") @@ -699,7 +699,7 @@ Its features include: ("kio" ,kio) ("kwidgetsaddons" ,kwidgetsaddons) ("libmusicbrainz" ,libmusicbrainz) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f)) ; Most tests require network (home-page "https://invent.kde.org/multimedia/libkcddb") @@ -727,7 +727,7 @@ Its features include: ("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid))) (home-page "https://invent.kde.org/multimedia/libkcompactdisc") (synopsis "KDE library for playing & ripping CDs") diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 74e8bdb8fd..db73941b42 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -79,7 +79,7 @@ ;; Do NOT add mysql or postgresql to the inputs. Otherwise the binaries ;; and wrapped files will refer to them, even if the user choices none ;; of these. Executables are searched on $PATH then. - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sqlite" ,sqlite))) (arguments `(#:tests? #f ;; TODO 135/167 tests fail @@ -151,7 +151,7 @@ programs.") ("ksmtp" ,ksmtp) ("ktextwidgets" ,ktextwidgets) ("kwallet" ,kwallet) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f)) ;; TODO: 1/1 test fails (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") @@ -196,7 +196,7 @@ collection and item views.") ("kxmlgui" ,kxmlgui) ("prison" ,prison) ("kio" ,kio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid) ("sonnet" ,sonnet))) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") @@ -240,7 +240,7 @@ to list and filter contacts.") ("kmime" ,kmime) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (arguments `(#:phases @@ -283,7 +283,7 @@ with emails through Akonadi easier.") ("kcodecs" ,kcodecs) ("ki18n" ,ki18n) ("kmime" ,kmime) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (synopsis "Akonadi notes access library") (description "Akonadi Notes is a library that effectively bridges the @@ -325,7 +325,7 @@ wrapping notes into KMime::Message objects.") ("kmime" ,kmime) ("krunner" ,krunner) ("kwindowsystem" ,kwindowsystem) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("xapian" ,xapian))) (arguments `(#:phases (modify-phases %standard-phases @@ -390,7 +390,7 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") ("ktextwidgets" ,ktextwidgets) ("kwallat" ,kwallet) ("libkdepim" ,libkdepim) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/pim/incidenceeditor") (synopsis "KDE PIM library for editing incidences") (description "This library provides an incidence editor for KDE PIM.") @@ -445,7 +445,7 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests ("prison" ,prison) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kontact.kde.org/components/kaddressbook.html") (synopsis "Address Book application to manage your contacts") (description "KAddressBook stores all the personal details of your family, @@ -486,7 +486,7 @@ CalDAV server.") ("kpimtextedit" ,kpimtextedit) ("ktextwidgets" ,ktextwidgets) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f)) ;; TODO: TZ setup (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") @@ -515,7 +515,7 @@ calendar data.") ("ki18n" ,ki18n) ("kio" ,kio) ("kxmlrpcclient" ,kxmlrpcclient) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("syndication" ,syndication))) ;; Note: Some tests take up to 90 sec. (home-page "https://invent.kde.org/pim/kblog") @@ -567,7 +567,7 @@ one of the APIs mentioned above.") ("kpimtextedit" ,kpimtextedit) ("ktextwidgets" ,ktextwidgets) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://api.kde.org/stable/calendarsupport/") (synopsis "Calendar Support library for KDE PIM") (description "The Calendar Support library provides helper utilities for @@ -604,7 +604,7 @@ calendaring applications.") ("ktextwidgets" ,ktextwidgets) ("kwidgetsaddons" ,kwidgetsaddons) ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f)) ;; TODO: seem to pull in some wrong theme (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") @@ -632,7 +632,7 @@ functions for accessing calendar data using the kcalcore API.") `(("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) ("kio" ,kio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtxmlpatterns" ,qtxmlpatterns))) (home-page "https://invent.kde.org/frameworks/kdav") (synopsis "DAV protocol implementation with KJobs") @@ -678,7 +678,7 @@ supported using GroupDAV or CardDAV.") ("libkleo" ,libkleo) ("prison" ,prison) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/pim/kdepim-apps-libs") (synopsis "KDE PIM mail related libraries and data files") (description "This package provides mail related libraries and data files @@ -739,7 +739,7 @@ for KDE PIM.") ("libkgapi" ,libkgapi) ;; TODO: libkolab ("qca" ,qca) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtnetworkauth" ,qtnetworkauth) ("qtspeech" ,qtspeech) @@ -815,7 +815,7 @@ package.") ("ktextwidgets" ,ktextwidgets) ("kxmlgui" ,kxmlgui) ("libkdepim" ,libkdepim) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/pim/eventviews") (synopsis "KDE PIM library for creating events") (description "This library provides an event creator for KDE PIM.") @@ -861,7 +861,7 @@ package.") ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/utilities/org.kde.kgpg") (synopsis "Graphical front end for GNU Privacy Guard") (description "Kgpg manages cryptographic keys for the GNU Privacy Guard, @@ -895,7 +895,7 @@ cryptography to the contents of the clipboard.") ("kpimtextedit" ,kpimtextedit) ("ktextwidgets" ,ktextwidgets) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -929,7 +929,7 @@ cryptography to the contents of the clipboard.") ("ki18n" ,ki18n) ("kio" ,kio) ("kmime" ,kmime) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") (synopsis "Library for handling IMAP") (description "This library provides a job-based API for interacting with @@ -959,7 +959,7 @@ easier to do so.") `(("ki18n" ,ki18n) ("kio" ,kio) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (propagated-inputs `(("cyrus-sasl" ,cyrus-sasl) ("openldap" ,openldap))) @@ -1010,7 +1010,7 @@ protocol for querying and modifying directory services running over TCP/IP. ") ("libkleo" ,libkleo) ("oxygen-icons" ,oxygen-icons) ;; default icon set ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -1096,7 +1096,7 @@ and retrieving certificates from LDAP servers.") ("libksieve" ,libksieve) ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) @@ -1177,7 +1177,7 @@ manager from KDE.") ("libxslt" ,libxslt) ("phonon" ,phonon) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f)) ;; TODO: 4/56 tests fail, even with "offscreen" and dbus (home-page "https://invent.kde.org/pim/mailcommon") @@ -1218,7 +1218,7 @@ dealing with email.") ("kmime" ,kmime) ("kxmlgui" ,kxmlgui) ("libkdepim" ,libkdepim) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/pim/mailimporter") (synopsis "KDE mail importer library") (description "This package provides libraries for importing mails other @@ -1259,7 +1259,7 @@ e-mail client programs into KMail and KDE PIM.") ("ktextwidgets" ,ktextwidgets) ("kwallet" ,kwallet) ("libkgapi" ,libkgapi) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f)) ;; TODO - 3/3 tests fail, require drkonqi (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") @@ -1285,7 +1285,7 @@ mail transport.") (inputs `(("kcodecs" ,kcodecs) ("kmime" ,kmime) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") (synopsis "Library for handling mbox mailboxes") (description "This is a library for handling mailboxes in mbox format, @@ -1355,7 +1355,7 @@ using a Qt/KMime C++ API.") ("libkleo" ,libkleo) ("qca" ,qca) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) @@ -1398,7 +1398,7 @@ kwebengineviewer.") (inputs `(("kcodecs" ,kcodecs) ("ki18n" ,ki18n) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -1475,7 +1475,7 @@ information in non-ASCII character sets.") ("kxmlgui" ,kxmlgui) ("libkdepim" ,libkdepim) ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (home-page "https://kontact.kde.org/components/knotes.html") (synopsis "Note-taking utility") @@ -1513,7 +1513,7 @@ Features: ("kparts" ,kparts) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") (synopsis "Kontact interface library") (description " This library provides the glue necessary for @@ -1584,7 +1584,7 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") ("libkdepim" ,libkdepim) ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests ("phonon" ,phonon) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -1639,7 +1639,7 @@ and exchanging calendar data, vCalendar and iCalendar.") (inputs `(("kcontacts" ,kcontacts) ("kpeople" ,kpeople) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/pim/kpeoplevcard") (synopsis "Expose vCard contacts to KPeople") (description @@ -1697,7 +1697,7 @@ Virtual Contact File}) files to the KPeople contact management library.") ("libkdepim" ,libkdepim) ("libxslt" ,libxslt) ("purpose" ,purpose) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtwebengine" ,qtwebengine))) (arguments `(#:tests? #f)) ;; TODO tests hang @@ -1736,7 +1736,7 @@ Virtual Contact File}) files to the KPeople contact management library.") ("ktextwidgets" ,ktextwidgets) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtspeech" ,qtspeech) ("sonnet" ,sonnet))) (arguments @@ -1770,7 +1770,7 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.") ("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) ("kio" ,kio) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f ;; TODO: does not find sasl mechs #:phases @@ -1811,7 +1811,7 @@ standard protocols for e-mail transmission.") ("kcontacts" ,kcontacts) ("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/ktnef/html/") (synopsis "Library for handling mail attachments using TNEF format") (description "Ktnef is a library for handling data in the TNEF @@ -1862,7 +1862,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") ("kmime" ,kmime) ("kwallet" ,kwallet) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/pim/libkdepim") (synopsis "Libraries for common KDE PIM apps") (description "This package provided libraries for common KDE PIM apps.") @@ -1892,7 +1892,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") ("kio" ,kio) ("kwallet" ,kwallet) ("kwindowsystem" ,kwindowsystem) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) @@ -1935,7 +1935,7 @@ various Google services.") ("kwindowsystem" ,kwindowsystem) ("kpimtextedit" ,kpimtextedit) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/pim/libkleo") (synopsis "KDE PIM cryptographic library") (description "@code{libkleo} is a library for Kleopatra and other parts of @@ -1978,7 +1978,7 @@ KDE using certificate-based crypto.") ("kwallet" ,kwallet) ("kwindowsystem" ,kwindowsystem) ("libkdepim" ,libkdepim) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index c64d8ae39f..b7a2b14f65 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -74,7 +74,7 @@ ("kpackage" ,kpackage) ("kwayland" ,kwayland) ; optional ("kwindowsystem" ,kwindowsystem) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ; optional ("qtx11extras" ,qtx11extras))) (home-page "https://invent.kde.org/plasma/breeze") @@ -99,7 +99,7 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("ki18n" ,ki18n) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/plasma/kdecoration") (synopsis "Plugin based library to create window decorations") (description "KDecoration is a library to create window decorations. @@ -127,7 +127,7 @@ manager which re-parents a Client window to a window decoration frame.") ("ki18n" ,ki18n) ("kwallet" ,kwallet) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/plasma/ksshaskpass") (synopsis "Front-end for ssh-add using kwallet") (description "Ksshaskpass is a front-end for @code{ssh-add} which stores the @@ -190,7 +190,7 @@ call it if it is not associated to a terminal.") ("libxi" ,libxi) ;XInput, required for grabbing XInput2 devices ("linux-pam" ,linux-pam) ("logind" ,elogind) ;optional loginctl support - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtx11extras" ,qtx11extras) ("solid" ,solid) @@ -221,7 +221,7 @@ call it if it is not associated to a terminal.") (inputs `(("kwayland" ,kwayland) ("libxrandr" ,libxrandr) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (arguments '(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11 @@ -261,7 +261,7 @@ basic needs and easy to configure for those who want special setups.") ("knewstuff" ,knewstuff) ("kwidgetsaddons" ,kwidgetsaddons) ("kservice" ,kservice) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtscript" ,qtscript) ("qtwebkit" ,qtwebkit) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index b9c3865a93..86f169e819 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -75,7 +75,7 @@ ("kwindowsystem" ,kwindowsystem) ("oxygen-icons" ,oxygen-icons) ;; default icon set ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid))) (arguments `(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen @@ -116,7 +116,7 @@ The main features of Dolphin are: ("ktexteditor" ,ktexteditor) ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "http://www.kde.org/") (synopsis "VCS-Plugins for Dolphin") (description "This package contains plugins that offer integration in @@ -156,7 +156,7 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.") ("kwindowsystem" ,kwindowsystem) ("libxml2" ,libxml2) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("xapian" ,xapian))) (arguments `(#:tests? #f)) ;; 1/1 test fails @@ -213,7 +213,7 @@ document meta data file.") ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtscript" ,qtscript))) (arguments `(#:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus @@ -262,7 +262,7 @@ This package is part of the KDE base applications module.") ("libxtst" ,libxtst) ("oxygen-icons" ,oxygen-icons) ;; default icon set ("pipewire" ,pipewire) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("xcb-util-image" ,xcb-util-image) ("zlib" ,zlib))) @@ -309,7 +309,7 @@ This package is part of the KDE networking module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/system/org.kde.ksystemlog") (synopsis "System log viewer") (description "This program is developed for being used by beginner users, @@ -353,7 +353,7 @@ This package is part of the KDE administration module.") ("kwayland" ,kwayland) ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (home-page "https://www.kde.org/applications/system/yakuake/") diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index e67c603e74..40267c6e91 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -68,7 +68,7 @@ ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtscript" ,qtscript))) (arguments `(#:tests? #f ;; 2/7 tests fail @@ -121,7 +121,7 @@ Kate's features include: ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set ;; TODO: QAccessibilityClient - libqaccessibilityclien - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/utilities/org.kde.kmag") (synopsis "Screen magnifier tool") (description "You can use KMagnifier to magnify a part of the screen just @@ -160,7 +160,7 @@ artists to web-designers to people with low vision.") ("libxt" ,libxt) ("phonon" ,phonon) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/utilities/org.kde.kmousetool") (synopsis "Automatic mouse click and mouse manipulation tool for the disabled") @@ -196,7 +196,7 @@ whom pressing buttons hurts.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtspeech" ,qtspeech))) (home-page "https://kde.org/applications/utilities/org.kde.kmouth") (synopsis "Type-and-say frontend for speech synthesizers") @@ -235,7 +235,7 @@ sentences to be re-spoken.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/utilities/org.kde.kronometer") (synopsis "Simple stopwatch application") (description "Kronometer is a stopwatch application. It features the @@ -279,7 +279,7 @@ to save the times and resume them later.") ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid) ("zlib" ,zlib))) (home-page "https://www.krusader.org") @@ -318,7 +318,7 @@ great on your desktop.") (inputs `(("ktexteditor" ,ktexteditor) ("imagemagick" ,imagemagick) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (home-page "https://kde.org/applications/en/graphics/org.kde.kxstitch") (synopsis "Create and print cross stitch patterns") @@ -363,7 +363,7 @@ either be created or generated from a image.") ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set ("qca" ,qca) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtscript" ,qtscript))) (arguments `(#:phases @@ -421,7 +421,7 @@ redone.") ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/utilities/org.kde.rsibreak") (synopsis "Assists in the Recovery and Prevention of Repetitive Strain Injury") @@ -468,7 +468,7 @@ remind you to take a break now and then.") ("libsmbclient" ,samba) ("oxygen-icons" ,oxygen-icons) ;; default icon set ("plasma-framework" ,plasma-framework) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("solid" ,solid))) (home-page "https://kde.org/applications/utilities/org.kde.smb4k") @@ -530,7 +530,7 @@ Features: ("ktextwidgets" ,ktextwidgets) ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/utilities/org.kde.sweeper") (synopsis "Temporary file and history cleaner") (description " diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 3b112324bf..1184aa5662 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -103,7 +103,7 @@ ("kconfig" ,kconfig) ("ki18n" ,ki18n) ("kio" ,kio) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -140,7 +140,7 @@ This package contains GUI widgets for baloo.") ("ki18n" ,ki18n) ("kiconthemes" ,kiconthemes) ("knewstuff" ,knewstuff) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/pim/grantleetheme") (synopsis "Library providing Grantlee theme support") (description "This library provides Grantlee theme support.") @@ -202,7 +202,7 @@ This package contains GUI widgets for baloo.") ("libkdepim" ,libkdepim) ("libkleo" ,libkleo) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) @@ -243,7 +243,7 @@ browser for easy news reading.") ("ffmpeg" ,ffmpeg) ("rttr" ,rttr) ("mlt" ,mlt) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("qtsvg" ,qtsvg) ("qtmultimedia" ,qtmultimedia) @@ -350,7 +350,7 @@ projects.") ("kxmlgui" ,kxmlgui) ("libkomparediff2" ,libkomparediff2) ("oxygen-icons" ,oxygen-icons) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement @@ -416,7 +416,7 @@ software (Git, Subversion, Mercurial, CVS and Bazaar).") (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (build-system cmake-build-system) (home-page "https://kde.org") (synopsis "Parser generator library for KDevplatform") @@ -445,7 +445,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (home-page "https://invent.kde.org/graphics/kdiagram") (synopsis "Libraries for creating business diagrams") @@ -532,7 +532,7 @@ illustrate project schedules.") ("openexr" ,openexr) ("perl" ,perl) ("poppler-qt5" ,poppler-qt5) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) @@ -572,7 +572,7 @@ features include brush stabilizers, brush engines and wrap-around mode.") ("kgraphviewer" ,kgraphviewer) ("kio" ,kio) ("ki18n" ,ki18n) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtxmlpatterns" ,qtxmlpatterns))) (home-page "https://apps.kde.org/en/massif-visualizer") @@ -605,7 +605,7 @@ compressed massif files can also be opened transparently.") ("ki18n" ,ki18n) ("kio" ,kio) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (build-system cmake-build-system) (home-page "https://kde.org") (synopsis "Library to compare files and strings, used in Kompare and KDevelop") @@ -632,7 +632,7 @@ used in KDE development tools Kompare and KDevelop.") `(("pkg-config" ,pkg-config))) (inputs `(("openssl" ,openssl) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://userbase.kde.org/QCA") (synopsis "Libraries for the Qt Cryptographic Architecture") (description "The Qt Cryptographic Architecture (QCA) provides a @@ -663,7 +663,7 @@ cards.") ("kcoreaddons" ,kcoreaddons) ("ki18n" ,ki18n) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qca" ,qca) ("util-linux" ,util-linux "lib"))) (home-page "https://community.kde.org/Frameworks") @@ -687,7 +687,7 @@ cards.") (arguments `(#:tests? #f)) ; both tests fail, require display (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools))) @@ -748,7 +748,7 @@ different notification systems.") ("libfakekey" ,libfakekey) ("pulseaudio-qt" ,pulseaudio-qt) ("qca" ,qca) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) @@ -832,7 +832,7 @@ communicate with each other. Here's a few things KDE Connect can do: ("kuserfeedback" ,kuserfeedback) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("shared-mime-info" ,shared-mime-info) ;; Optional. @@ -868,7 +868,7 @@ to perform data analysis.") (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://phabricator.kde.org/source/kqtquickcharts/") (synopsis "Interactive charts for Qt Quick") @@ -902,7 +902,7 @@ charts.") ("knotifications" ,knotifications) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/system/kdk") (synopsis "View Disk Usage") (description "KDiskFree displays the available file devices (hard drive @@ -930,7 +930,7 @@ unmount drives and view them in a file manager.") ("qttools" ,qttools) ("kdoctools" ,kdoctools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("karchive" ,karchive) ("ki18n" ,ki18n) ("kio" ,kio) @@ -991,7 +991,7 @@ Python, PHP, and Perl.") ("kxmlgui" ,kxmlgui) ("libsndfile" ,libsndfile) ("openal" ,openal) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) (home-page "https://games.kde.org/") @@ -1035,7 +1035,7 @@ Python, PHP, and Perl.") ("kbookmarks" ,kbookmarks) ("kcompletion" ,kcompletion) ("kconfig" ,kconfig) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("libjpeg-turbo" ,libjpeg-turbo) ("libtiff" ,libtiff) ("kirigami" ,kirigami) @@ -1084,7 +1084,7 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.") ("kdoctools" ,kdoctools))) (inputs `(("gettext" ,gettext-minimal) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/development") (synopsis "Tools for translating DocBook XML files with Gettext") (description "This is a collection of tools that facilitate translating @@ -1109,7 +1109,7 @@ PO template files.") `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("kio" ,kio) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://apps.kde.org/en/kdegraphics_mobipocket") (synopsis "KDE thumbnailer for Mobipocket files") (description "This package provides a KDE plugin that shows thumbnails of @@ -1132,7 +1132,7 @@ Mobipocket e-books in Dolphin and other KDE apps.") `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("exiv2" ,exiv2) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/graphics/libkexiv2") (synopsis "Manipulate the metadata of images") (description "Libkexiv2 wraps the Exiv2 library, allowing to manipulate @@ -1158,7 +1158,7 @@ picture metadata as EXIF/IPTC and XMP.") ("kdnssd" ,kdnssd) ("ki18n" ,ki18n) ("kio" ,kio) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/internet/org.kde.zeroconf_ioslave") (synopsis "DNS-SD Service Discovery Monitor") (description "Adds an entry to Dolphin's Network page to show local @@ -1193,7 +1193,7 @@ or Bonjour by other projects).") ;;("phpunit" ,phpunit) )) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtcharts" ,qtcharts) ("qtdeclarative" ,qtdeclarative) ("qtsvg" ,qtsvg))) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 55a1b72d74..199a0368a9 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -184,7 +184,7 @@ ("hangul" ,libhangul) ("m17n-db" ,m17n-db) ("m17n-lib" ,m17n-lib) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("rime" ,librime) ("rsvg" ,librsvg) ("wayland" ,wayland) @@ -255,7 +255,7 @@ focuses especially on Korean input (Hangul, Hanja, ...).") ("appindicator" ,libappindicator) ("chewing" ,libchewing) ("gtk+" ,gtk+) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("xtst" ,libxtst))) (synopsis "HIME Input Method Editor") (description "Hime is an extremely easy-to-use input method framework. It diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm index 2294d693c5..5b72c0e0be 100644 --- a/gnu/packages/lego.scm +++ b/gnu/packages/lego.scm @@ -115,7 +115,7 @@ restrictions that stem from limitations of the standard RCX firmware.") `(("qttools" ,qttools))) ; for lrelease (inputs `(("mesa" ,mesa) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib))) (arguments '(#:tests? #f diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index deda49a4bc..1c60e767b0 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -860,7 +860,7 @@ and video calls or instant messaging capabilities to an application.") ("liblinphone" ,liblinphone) ("mediastreamer2" ,mediastreamer2) ("ortp" ,ortp) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) diff --git a/gnu/packages/logo.scm b/gnu/packages/logo.scm index 17c3990a94..cf70910656 100644 --- a/gnu/packages/logo.scm +++ b/gnu/packages/logo.scm @@ -37,7 +37,7 @@ "0cpyj1ji6hjy7zzz05672f0j6fr0mwpc1y3sq36hhkv2fkpidw22")))) (build-system gnu-build-system) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index b4cdcaac0f..c797b63754 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -90,7 +90,7 @@ (native-inputs `(("doxygen" ,doxygen))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://launchpad.net/libdbusmenu-qt") (synopsis "Qt implementation of the DBusMenu spec") (description "This library provides a Qt implementation of the DBusMenu @@ -150,7 +150,7 @@ to statistics about the system on which it's run.") `(("pkg-config" ,pkg-config) ("glib" ,glib))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (propagated-inputs ;; Dependent projects require Perl via the CMake files. `(("perl" ,perl))) @@ -188,7 +188,7 @@ itself as well as other components maintained by the LXQt project.") (propagated-inputs ;; required by Qt5XdgIconLoader.pc `(("glib" ,glib) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -259,7 +259,7 @@ components of the LXQt desktop environment.") (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools))) (home-page "https://lxqt-project.org") @@ -287,7 +287,7 @@ and memory usage or network traffic.") `(("kwindowsystem" ,kwindowsystem) ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -380,7 +380,7 @@ the operating system LXQt is running on.") ("libqtxdg" ,libqtxdg) ("libxcursor" ,libxcursor) ("libxi" ,libxi) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("solid" ,solid) @@ -450,7 +450,7 @@ configuration of both LXQt and the underlying operating system.") `(("kwindowsystem" ,kwindowsystem) ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -498,7 +498,7 @@ as a whole and are not limited to distinct applications.") `(("kwindowsystem" ,kwindowsystem) ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -544,7 +544,7 @@ according to the Desktop Notifications Specification.") `(("kwindowsystem" ,kwindowsystem) ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -595,7 +595,7 @@ of other programs.") ("lxqt-globalkeys" ,lxqt-globalkeys) ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("solid" ,solid) @@ -660,7 +660,7 @@ of other programs.") ("libqtxdg" ,libqtxdg) ("pcre" ,pcre) ("polkit-qt" ,polkit-qt) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -709,7 +709,7 @@ LXQt.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("lxqt-globalkeys" ,lxqt-globalkeys) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("solid" ,solid))) @@ -757,7 +757,7 @@ when laptop batteries are low on power.") `(("libdbusmenu-qt" ,libdbusmenu-qt) ("libfm-qt" ,libfm-qt) ("libqtxdg" ,libqtxdg) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -798,7 +798,7 @@ Qt with LXQt.") ("lxqt-globalkeys" ,lxqt-globalkeys) ("muparser" ,muparser) ("pcre" ,pcre) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -846,7 +846,7 @@ allows for launching applications or shutting down the system.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("procps" ,procps) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("xdg-user-dirs" ,xdg-user-dirs))) @@ -916,7 +916,7 @@ for the LXQt desktop environment.") `(("kwindowsystem" ,kwindowsystem) ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("sudo" ,sudo))) @@ -1001,7 +1001,7 @@ for LXQt.") ("libxcb" ,libxcb) ("menu-cache" ,menu-cache) ("pcre" ,pcre) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1027,7 +1027,7 @@ components to build desktop file managers which belongs to LXDE.") (build-system cmake-build-system) (inputs `(("libfm-qt" ,libfm-qt) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1069,7 +1069,7 @@ LXDE.") (build-system cmake-build-system) (inputs `(("libconfig" ,libconfig) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("pkg-config" ,pkg-config) @@ -1105,7 +1105,7 @@ manager Compton.") (inputs `(("libexif" ,libexif) ("libfm-qt" ,libfm-qt) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -1141,7 +1141,7 @@ image viewer.") ("openbox" ,openbox) ("pango" ,pango) ("pcre" ,pcre) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -1171,7 +1171,7 @@ window manager OpenBox.") `(("glib" ,glib) ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1202,7 +1202,7 @@ window manager OpenBox.") ("libxrender" ,libxrender) ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -1228,7 +1228,7 @@ processes currently in existence, much like code{top} or code{ps}.") (base32 "10lv475qj0x3c3vl4yhjyr6y10qj5pq8n5pal5k24f6pf7xv412f")))) (build-system cmake-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("utf8proc" ,utf8proc))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -1253,7 +1253,7 @@ processes currently in existence, much like code{top} or code{ps}.") (base32 "0rfv7a6ncm8fs8aicinh9l29w4636gxzcqz735jmch2r41v9i1d9")))) (build-system cmake-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("qtermwidget" ,qtermwidget))) (native-inputs @@ -1282,7 +1282,7 @@ QTermWidget.") (inputs `(("kwindowsystem" ,kwindowsystem) ("libqtxdg" ,libqtxdg) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -1314,7 +1314,7 @@ easily publishing them on internet image hosting services.") `(("glib" ,glib) ("json-glib" ,json-glib) ("libfm-qt" ,libfm-qt) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1349,7 +1349,7 @@ like @command{tar} and @command{zip}.") (build-system cmake-build-system) (inputs `(("kwindowsystem" ,kwindowsystem) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("liblxqt" ,liblxqt) ("qtx11extras" ,qtx11extras) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 90c1bb7721..1686ba8d48 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2086,7 +2086,7 @@ script files.") (name "octave") (inputs `(("qscintilla" ,qscintilla) - ("qt" ,qtbase) + ("qt" ,qtbase-5) ,@(package-inputs octave-cli))) (native-inputs `(("qttools" , qttools) ;for lrelease @@ -2359,7 +2359,7 @@ ASCII text files using Gmsh's own scripting language.") ("python-dbus" ,python-dbus) ("python-h5py" ,python-h5py) ;optional, for HDF5 data ("python-pyqt" ,python-pyqt) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (propagated-inputs `(("python-numpy" ,python-numpy))) @@ -4581,7 +4581,7 @@ evaluates expressions using the standard order of operations.") "0maw5am6rrkyjrprfg113zjq37mqj0iaznkg4h2927ff7wrprc94")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qttools" ,qttools))) (inputs `(("libx11" ,libx11) ("zlib" ,zlib) @@ -5167,7 +5167,7 @@ reduction.") `(("boost" ,boost) ("glu" ,glu) ("mesa" ,mesa) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (build-system cmake-build-system) (synopsis "Toolset for the mCRL2 formal specification language") (description @@ -6098,7 +6098,7 @@ functions.") (base32 "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk")))) (build-system cmake-build-system) - (inputs `(("qtbase" ,qtbase))) + (inputs `(("qtbase" ,qtbase-5))) (native-inputs `(("qttools" ,qttools))) (arguments `(#:phases diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9ff45026e1..499b7a8f3a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -180,7 +180,7 @@ ("hunspell" ,hunspell) ("libidn" ,libidn) ("qca" ,qca) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) ("qtwebkit" ,qtwebkit) @@ -1606,7 +1606,7 @@ instant messenger with audio and video chat capabilities.") ("sqlite" ,sqlite) ("openal" ,openal) ("qrencode" ,qrencode) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("sqlcipher" ,sqlcipher))) (native-inputs @@ -2227,7 +2227,7 @@ notifications, and Python scripting support.") (base32 "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs")))) (build-system cmake-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia))) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON") @@ -2331,7 +2331,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ("lmdbxx" ,lmdbxx) ("mtxclient" ,mtxclient) ("openssl" ,openssl) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) @@ -2384,7 +2384,7 @@ There is support for: (build-system qt-build-system) (inputs `(("libqmatrixclient" ,libqmatrixclient) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) @@ -2724,7 +2724,7 @@ as phones, embedded computers or microcontrollers.") "\"../build")) #t))))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel))) (propagated-inputs @@ -2853,7 +2853,7 @@ social and chat platform.") ("qca" ,qca) ("qhttp" ,qhttp) ("qite" ,qite) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 94ed6de5dd..c856198c5c 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -447,7 +447,7 @@ support") ("libebur128" ,libebur128) ("libmtp" ,libmtp) ("mpg123" ,mpg123) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) ("taglib" ,taglib) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 68d48a2937..c9b949d0c3 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -231,7 +231,7 @@ ("pkg-config" ,pkg-config))) (inputs `(("dbus" ,dbus) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ;; Plugin dependencies ("alsa-lib" ,alsa-lib) @@ -434,7 +434,7 @@ score, keyboard, guitar, drum and controller views.") ("libxml2" ,libxml2) ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("sqlite" ,sqlite) ("sparsehash" ,sparsehash) @@ -527,7 +527,7 @@ playing your music.") ("libmtp" ,libmtp) ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("sqlite" ,sqlite) ("taglib" ,taglib))) @@ -759,7 +759,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") ("libsndfile" ,libsndfile) ("lrdf" ,lrdf) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtxmlpatterns" ,qtxmlpatterns) ("zlib" ,zlib))) (home-page "http://www.hydrogen-music.org") @@ -1999,7 +1999,7 @@ your own lessons.") ("boost" ,boost) ("minizip" ,minizip) ("pugixml" ,pugixml) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("rapidjson" ,rapidjson) ("rtmidi" ,rtmidi) ("timidity" ,timidity++) @@ -2082,7 +2082,7 @@ users to select LV2 plugins and run them with jalv.") ("alsa-lib" ,alsa-lib) ("non-session-manager" ,non-session-manager) ("liblo" ,liblo) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) @@ -2115,7 +2115,7 @@ oscillators and stereo effects.") ("alsa-lib" ,alsa-lib) ("non-session-manager" ,non-session-manager) ("liblo" ,liblo) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) @@ -2148,7 +2148,7 @@ effects.") ("alsa-lib" ,alsa-lib) ("non-session-manager" ,non-session-manager) ("liblo" ,liblo) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) @@ -2181,7 +2181,7 @@ effects.") ("non-session-manager" ,non-session-manager) ("liblo" ,liblo) ("fftwf" ,fftwf) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) @@ -2761,7 +2761,7 @@ browser.") "/manpages/docbook.xsl"))) #t))))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qttools" ,qttools) ("alsa-lib" ,alsa-lib))) @@ -2809,7 +2809,7 @@ backends, including ALSA, OSS, Network and FluidSynth.") #t))))) (inputs `(("drumstick" ,drumstick) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) (native-inputs @@ -3149,7 +3149,7 @@ from the command line.") (arguments `(#:tests? #f)) ; no "check" target (inputs - `(("qt" ,qtbase) + `(("qt" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("alsa-lib" ,alsa-lib) ("jack" ,jack-1) @@ -4467,7 +4467,7 @@ develop custom plugins for use in other applications without programming.") `(#:configure-flags (list "--enable-qt5"))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("alsa-lib" ,alsa-lib) ("jack" ,jack-1) ("liblo" ,liblo) @@ -4498,7 +4498,7 @@ modules running in parallel.") `(#:configure-flags (list "--enable-qt5"))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("alsa-lib" ,alsa-lib))) (native-inputs `(("pkg-config" ,pkg-config) @@ -4681,7 +4681,7 @@ are a C compiler and glib. Full API documentation and examples are included.") "0g9pls46iggg7rdm65vzfj8nyr3v2n5xkp54c4qbh9hhalpsw4ay")))))) (inputs `(("sdl" ,sdl) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) ("fltk" ,fltk) ("libogg" ,libogg) @@ -4786,7 +4786,7 @@ standalone JACK client and an LV2 plugin is also available.") ("portaudio" ,portaudio) ("portmidi" ,portmidi) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols2" ,qtquickcontrols2) @@ -4864,7 +4864,7 @@ sample library.") ("lv2" ,lv2) ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) ; required by rtaudio - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("rtaudio" ,rtaudio) ("rubberband" ,rubberband) @@ -5056,7 +5056,7 @@ specification and header.") ("libsamplerate" ,libsamplerate) ("lilypond" ,lilypond) ("lrdf" ,lrdf) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("tar" ,tar) ("lirc" ,lirc) ("wavpack" ,wavpack) @@ -5162,7 +5162,7 @@ the electronic or dubstep genre.") `(("alsa-lib" ,alsa-lib) ("drumstick" ,drumstick) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/pedrolcl/Linux-SonivoxEas") @@ -5546,7 +5546,7 @@ discard bad quality ones. ("fftw" ,fftw) ("jack" ,jack-1) ("portaudio" ,portaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg))) (native-inputs diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0769438133..56945bff72 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -255,7 +255,7 @@ protocols.") ("gnutls" ,gnutls) ("libtiff" ,libtiff) ("openssl" ,openssl) - ("qt5" ,qtbase) + ("qt5" ,qtbase-5) ("udev" ,eudev))) (synopsis "Camera stack and framework") (description "LibCamera is a complex camera support library for GNU+Linux, @@ -1495,7 +1495,7 @@ of the same name.") ("krb5" ,mit-krb5) ("nghttp2:lib" ,nghttp2 "lib") ("minizip" ,minizip) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) ("sbc" ,sbc) diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index 15e1811d6b..a60aeaa3b5 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -180,7 +180,7 @@ monospaced or proportional.") ("podofo" ,podofo) ("poppler-qt5" ,poppler-qt5) ("sane-backends" ,sane-backends) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtspell" ,qtspell) ("quazip" ,quazip) ("tesseract" ,tesseract-ocr))) diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index 942e194739..bedbad7e60 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -177,7 +177,7 @@ GUI based workflow. It is primarily used in the Orange framework.") ("python-serverfiles" ,python-serverfiles) ("python-xlrd" ,python-xlrd) ("python-xlsxwriter" ,python-xlsxwriter) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("xdg-utils" ,xdg-utils))) (home-page "https://orangedatamining.com/") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 33d63b5809..9c8912c5e8 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -161,7 +161,7 @@ human.") ("libxi" ,libxi) ("libxtst" ,libxtst) ("qrencode" ,qrencode) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("quazip" ,quazip) ; XC_KEESHARE @@ -693,7 +693,7 @@ key URIs using the standard otpauth:// scheme.") (native-inputs `(("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (home-page "https://qtpass.org") (synopsis "GUI for password manager password-store") diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 8f163bdd37..9298332940 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -177,7 +177,7 @@ information.") `(("python-pypdf2" ,python-pypdf2) ("python-pyqt" ,python-pyqt) ("python-poppler-qt5" ,python-poppler-qt5) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "http://crazy-compilers.com/flyer-composer") (synopsis "Rearrange PDF pages to print as flyers on one sheet") (description "@command{flyer-composer} can be used to prepare one- or @@ -302,7 +302,7 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (define-public poppler-qt5 (package/inherit poppler (name "poppler-qt5") - (inputs `(("qtbase" ,qtbase) + (inputs `(("qtbase" ,qtbase-5) ,@(package-inputs poppler))) (synopsis "Qt5 frontend for the Poppler PDF rendering library"))) @@ -342,7 +342,7 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") `(("python-sip" ,python-sip-4) ("python-pyqt" ,python-pyqt) ("poppler-qt5" ,poppler-qt5) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://pypi.org/project/python-poppler-qt5/") (synopsis "Python bindings for Poppler-Qt5") (description @@ -400,7 +400,7 @@ reading and editing of existing PDF files.") (inputs `(("cups" ,cups) ("freetype" ,freetype) ("libpng" ,libpng) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib))) (arguments `(#:tests? #f)) ; there is no check target @@ -847,7 +847,7 @@ program capable of converting PDF into other formats.") ("djvulibre" ,djvulibre) ("libspectre" ,libspectre) ("poppler-qt5" ,poppler-qt5) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (arguments `(#:imported-modules ((guix build qt-build-system) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 943e8caa90..ead70c3e22 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -617,7 +617,7 @@ and enhance them.") (inputs `(("graphicsmagick" ,graphicsmagick) ("libomp" ,libomp) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://photoflare.io") (synopsis "Quick, simple but powerful image editor") (description "Photoflare is a cross-platform image editor with an aim diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 40aa523b23..f495d51c83 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -159,7 +159,7 @@ for unprivileged applications.") (inputs `(("polkit" ,polkit))) (propagated-inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index 9ab9da37fb..f78923966c 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -57,11 +57,11 @@ #t)))))) (inputs `(("libusb" ,libusb) - ("qt" ,qtbase) + ("qt" ,qtbase-5) ("qtsvg" ,qtsvg))) (native-inputs `(("pkg-config" ,pkg-config) - ("qmake" ,qtbase))) + ("qmake" ,qtbase-5))) (synopsis "Graphical program to drive plotting cutters") (description "Robocut is a simple graphical program that allows you to cut graphics diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm index 4d3c3faca0..b4d52d8d85 100644 --- a/gnu/packages/profiling.scm +++ b/gnu/packages/profiling.scm @@ -207,7 +207,7 @@ with calls to the POMP2 measurement interface.") (inputs `(("dbus" ,dbus) ("zlib" ,zlib))) (native-inputs `(("perl" ,perl) - ("qtbase" ,qtbase) ; native because of qmake + ("qtbase" ,qtbase-5) ; native because of qmake ("which" ,which))) ;; FIXME: The doc is 14MB, but adding a doc output results in a cycle. diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm index b8741520f0..f8a60af760 100644 --- a/gnu/packages/pumpio.scm +++ b/gnu/packages/pumpio.scm @@ -62,7 +62,7 @@ #t))))) (inputs `(("aspell" ,aspell) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("tidy" ,tidy))) (synopsis "Qt-based pump.io client") (description "Pumpa is a simple pump.io client written in C++ and Qt.") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 18e756d682..cfcfcfb27c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13320,7 +13320,7 @@ ISO 8859, etc.).") ("python-pytest-cov" ,python-pytest-cov) ("python-pytest-xdist" ,python-pytest-xdist))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (propagated-inputs `(("python-h5py" ,python-h5py) ("python-numpy" ,python-numpy) @@ -25648,7 +25648,7 @@ implementations.") ("swig" ,swig))) (inputs `(("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("libxi" ,libxi) ("libice" ,libice) ("soqt" ,soqt) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f992314777..a8ccb12f51 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -134,7 +134,7 @@ (chdir "libqite") #t))))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia))) (home-page "https://github.com/Ri0n/qite/") (synopsis "Qt Interactive Text Elements") @@ -187,7 +187,7 @@ (native-inputs `(("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (synopsis "Qt5 Configuration Tool") (description "Qt5CT is a program that allows users to configure Qt5 @@ -228,13 +228,13 @@ window managers, that don't provide Qt integration by themselves.") (string-append "-DCMAKE_CXX_FLAGS=-I" (assoc-ref %build-inputs "qtbase") "/include/qt5/QtXkbCommonSupport/" - ,(package-version qtbase))))) + ,(package-version qtbase-5))))) (native-inputs `(("cmake-shared" ,cmake-shared) ("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtwayland" ,qtwayland) ("wayland" ,wayland) ("xkbcommon" ,libxkbcommon))) @@ -261,7 +261,7 @@ applications on Wayland.") ;; Optional: lcov and cccc, both are for code coverage `(("doxygen" ,doxygen))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtscript" ,qtscript))) (build-system cmake-build-system) @@ -298,7 +298,7 @@ system, and the core design of Django is reused in Grantlee.") (string-append "https://distfiles.macports.org/qt5/" component "-everywhere-src-" version ".tar.xz"))) -(define-public qtbase +(define-public qtbase-5 (package (name "qtbase") (version "5.15.2") @@ -557,7 +557,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-deprecated qt qtbase) (define-public qtsvg - (package (inherit qtbase) + (package (inherit qtbase-5) (name "qtsvg") (version "5.15.2") (source (origin @@ -570,7 +570,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (native-inputs `(("perl" ,perl))) (inputs `(("mesa" ,mesa) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib))) (arguments `(#:phases @@ -660,7 +660,7 @@ HostData=lib/qt5 ("libtiff" ,libtiff) ("libwebp" ,libwebp) ("mesa" ,mesa) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib))) (synopsis "Additional Image Format plugins for Qt") (description "The QtImageFormats module contains plugins for adding @@ -682,7 +682,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (native-inputs `(("perl" ,perl))) (inputs `(("mesa" ,mesa) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (synopsis "Qt Extras for X11") (description "The QtX11Extras module includes the library to access X11 from within Qt 5."))) @@ -709,7 +709,7 @@ from within Qt 5."))) #t)))))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative))) - (inputs `(("qtbase" ,qtbase))) + (inputs `(("qtbase" ,qtbase-5))) (synopsis "Qt XML patterns module") (description "The QtXmlPatterns module is a XQuery and XPath engine for XML and custom data models. It contains programs such as xmlpatterns and @@ -748,7 +748,7 @@ xmlpatternsvalidator."))) ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (synopsis "Qt QML module (Quick 2)") (description "The Qt QML module provides a framework for developing applications and libraries with the QML language. It defines and implements the @@ -772,7 +772,7 @@ with JavaScript and C++."))) ("qtdeclarative" ,qtdeclarative))) (inputs `(("bluez" ,bluez) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (synopsis "Qt Connectivity module") (description "The Qt Connectivity modules provides modules for interacting with Bluetooth and NFC."))) @@ -793,7 +793,7 @@ with Bluetooth and NFC."))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative))) - (inputs `(("qtbase" ,qtbase))) + (inputs `(("qtbase" ,qtbase-5))) (synopsis "Qt Web Sockets module") (description "WebSocket is a web-based protocol designed to enable two-way communication between a client application and a remote host. The Qt @@ -825,7 +825,7 @@ consume data received from the server, or both."))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative))) - (inputs `(("qtbase" ,qtbase))) + (inputs `(("qtbase" ,qtbase-5))) (synopsis "Qt Sensors module") (description "The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. The Qt Sensors API also provides a motion gesture @@ -870,7 +870,7 @@ recognition API for devices."))) `(("alsa-lib" ,alsa-lib) ("mesa" ,mesa) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ;; Gstreamer is needed for the mediaplayer plugin ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base))) @@ -924,7 +924,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) ("libxrender" ,libxrender) ("mesa" ,mesa) ("mtdev" ,mtdev) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("vulkan-headers" ,vulkan-headers) ("wayland" ,wayland))) (synopsis "Qt Wayland module") @@ -943,7 +943,7 @@ compositor libraries."))) "17gp5qzg4wdg8qlxk2p3mh8x1vk33rf33wic3fy0cws193bmkiar")))) (native-inputs `(("perl" ,perl))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("eudev" ,eudev))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) @@ -987,7 +987,7 @@ interacting with serial ports from within Qt."))) #t))))))) (inputs `(("libsocketcan" ,libsocketcan) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtserialport" ,qtserialport))) (synopsis "Qt Serial Bus module") (description "The Qt Serial Bus API provides classes and functions to @@ -1008,7 +1008,7 @@ and others."))) `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) ("qtwebsockets" ,qtwebsockets))) - (inputs `(("qtbase" ,qtbase))) + (inputs `(("qtbase" ,qtbase-5))) (synopsis "Web communication library for Qt") (description "The Qt WebChannel module enables peer-to-peer communication between the host (QML/C++ application) and the client (HTML/JavaScript @@ -1036,7 +1036,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (native-inputs '()) (inputs `(("mesa" ,mesa) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtwebsockets" ,qtwebsockets) ("zlib" ,zlib))) @@ -1061,7 +1061,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (native-inputs `(("perl" ,perl))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (synopsis "Display web content in a QML application") (description "Qt WebView provides a way to display web content in a QML @@ -1092,7 +1092,7 @@ native APIs where it makes sense."))) (inputs `(("icu4c" ,icu4c) ("openssl" ,openssl) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib))) (synopsis "Qt Location and Positioning modules") (description "The Qt Location module provides an interface for location, @@ -1117,7 +1117,7 @@ positioning and geolocation plugins."))) ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (synopsis "Qt Tools and Designer modules") (description "The Qt Tools module provides a set of applications to browse the documentation, translate applications, generate help files and other stuff @@ -1138,7 +1138,7 @@ that helps in Qt development."))) `(("perl" ,perl) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (synopsis "Qt Script module") (description "Qt provides support for application scripting with ECMAScript. The following guides and references cover aspects of programming with @@ -1158,7 +1158,7 @@ ECMAScript and Qt."))) (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (synopsis "Qt Quick Controls and other Quick modules") (description "The QtScript module provides classes for making Qt @@ -1179,7 +1179,7 @@ can be used to build complete interfaces in Qt Quick."))) (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (synopsis "Qt Quick Controls 2 and other Quick 2 modules") (description "The Qt Quick Controls 2 module contains the Qt Labs Platform @@ -1201,7 +1201,7 @@ not available."))) (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (synopsis "Qt Graphical Effects module") (description "The Qt Graphical Effects module provides a set of QML types @@ -1229,7 +1229,7 @@ coloring, and many more."))) ("freetype" ,freetype) ("libxrender" ,libxrender) ("sdl2" ,sdl2) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (synopsis "Qt Gamepad module") (description "The Qt Gamepad module is an add-on library that enables Qt @@ -1257,7 +1257,7 @@ and mobile applications targeting TV-like form factors."))) (("scion") "#")) #t)))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (synopsis "Qt SCXML module") (description "The Qt SCXML module provides functionality to create state @@ -1277,7 +1277,7 @@ also contains functionality to support data models and executable content."))) (base32 "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7")))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (synopsis "Qt Purchasing module") (description "The Qt Purchasing module provides and in-app API for @@ -1297,7 +1297,7 @@ purchasing goods and services."))) (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (synopsis "Qt Charts module") (description "The Qt Charts module provides a set of easy to use chart @@ -1321,7 +1321,7 @@ selecting one of the charts themes.") (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (synopsis "Qt Data Visualization module") (description "The Qt Data Visualization module provides a way to visualize @@ -1352,7 +1352,7 @@ customized by using themes or by adding custom items and labels to them.") (("oauth1 ") "# oauth1 ")) #t)))))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (synopsis "Qt Network Authorization module") (description "The Qt Network Authorization module provides an implementation of OAuth and OAuth2 authenticathon methods for Qt."))) @@ -1383,7 +1383,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) "integration_multiprocess")) #t)))))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (synopsis "Qt Remote Objects module") (description "The Qt Remote Objects module is an @dfn{inter-process @@ -1406,7 +1406,7 @@ processes or computers."))) (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1442,7 +1442,7 @@ message."))) ("qttools" ,qttools))) (inputs `(("enchant" ,enchant) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://github.com/manisandro/qtspell") (synopsis "Spell checking for Qt text widgets") (description @@ -1455,7 +1455,7 @@ using the Enchant spell-checking library.") (package (inherit qtsvg) (name "qtwebengine") - (version (package-version qtbase)) + (version (package-version qtbase-5)) (source (origin (method url-fetch) @@ -1737,7 +1737,7 @@ using the Enchant spell-checking library.") ("pciutils" ,pciutils) ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) ("qtwebchannel" ,qtwebchannel) @@ -1916,13 +1916,13 @@ module provides support functions to the automatically generated code.") (patches (search-patches "pyqt-configure.patch")))) (build-system gnu-build-system) (native-inputs - `(("qtbase" ,qtbase))) ; for qmake + `(("qtbase" ,qtbase-5))) ; for qmake (propagated-inputs `(("python-sip" ,python-sip) ("python-pyqt5-sip" ,python-pyqt5-sip))) (inputs `(("python" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtconnectivity" ,qtconnectivity) ("qtdeclarative" ,qtdeclarative) ("qtlocation" ,qtlocation) @@ -2028,12 +2028,12 @@ contain over 620 classes.") `(("python" ,python) ("python-sip" ,python-sip) ;; qtbase is required for qmake - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (inputs `(("python" ,python-wrapper) ("python-sip" ,python-sip) ("python-pyqt" ,python-pyqt) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) @@ -2180,7 +2180,7 @@ top of the PyQt bindings for Qt. PyQt-builder is used to build PyQt itself.") (("\\$\\$\\[QT_HOST_DATA\\]") (string-append out "/lib/qt$${QT_MAJOR_VERSION}"))) (invoke "qmake"))))))) - (native-inputs `(("qtbase" ,qtbase))) + (native-inputs `(("qtbase" ,qtbase-5))) (home-page "https://www.riverbankcomputing.co.uk/software/qscintilla/intro") (synopsis "Qt port of the Scintilla C++ editor control") (description "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ @@ -2278,7 +2278,7 @@ This package provides the Python bindings."))) `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (arguments `(#:tests? #f ; No tests included #:phases @@ -2388,7 +2388,7 @@ securely. It will not store any data unencrypted unless explicitly requested.") '("qtlockedfile" "qtpropertybrowser" "qtservice" "qtsingleapplication" "qtsoap"))))))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (synopsis "Collection of Qt extensions") (description "QtSolutions is a set of components extending Qt. @itemize @@ -2421,7 +2421,7 @@ that can be only started once per user. (base32 "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0")))) (build-system gnu-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qttools" ,qttools))) (arguments @@ -2504,7 +2504,7 @@ different kinds of sliders, and much more.") ("sqlite" ,sqlite) ("fontconfig" ,fontconfig) ("libxrender" ,libxrender) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtlocation" ,qtlocation) ("qtmultimedia" ,qtmultimedia) @@ -2569,7 +2569,7 @@ time Web content can be enhanced with native controls.") (native-inputs `(("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative))) (home-page "https://filcuc.github.io/DOtherSide/index.html") (synopsis "C language library for creating bindings for the Qt QML language") @@ -2607,7 +2607,7 @@ a binding language: (native-inputs `(("qttools" ,qttools))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets") (synopsis "Color management widgets") (description "QtColorWidgets provides a Qt color dialog that is more @@ -2636,7 +2636,7 @@ color-related widgets.") (sha256 (base32 "0vp8lpxvd1nlp4liqrlvslpqrgfn0wpiwizzdsjbj22zzb8vxikc")))))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (build-system gnu-build-system) (arguments `(#:phases @@ -2685,7 +2685,7 @@ color-related widgets.") ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments `(#:tests? #f @@ -2735,7 +2735,7 @@ color-related widgets.") `(("libxml2" ,libxml2) ("libxslt" ,libxslt) ("clang-toolchain" ,clang-toolchain) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdatavis3d" ,qtdatavis3d) ("qtlocation" ,qtlocation) ("qtmultimedia" ,qtmultimedia) @@ -2803,7 +2803,7 @@ generate Python bindings for your C or C++ code.") (inputs `(("python-pyside-2" ,python-pyside-2) ("python-shiboken-2" ,python-shiboken-2) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (native-inputs `(("python" ,python-wrapper))) (arguments @@ -2847,7 +2847,7 @@ generate Python bindings for your C or C++ code.") (lambda* (#:key make-flags #:allow-other-keys) (apply invoke (cons "qmake" make-flags))))))) (native-inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qttools" ,qttools))) (inputs `(("glu" ,glu))) @@ -2890,7 +2890,7 @@ being fully customizable and easy to extend.") `(("pkg-config" ,pkg-config) ("cmake" ,cmake))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("coin3D" ,coin3D-4))) (home-page "https://github.com/coin3d/soqt") (synopsis "Qt GUI component toolkit library for Coin") diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index d0b7446c3c..618b2cfeaa 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -527,7 +527,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") ("python-pygobject" ,python-pygobject) ("python-pyqt" ,python-pyqt) ("python-pyyaml" ,python-pyyaml) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qwt" ,qwt) ("sdl" ,sdl) ("volk" ,volk) @@ -797,7 +797,7 @@ to the fix block above. ("log4cpp" ,log4cpp) ("portaudio" ,portaudio) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("volk" ,volk))) (arguments @@ -1091,7 +1091,7 @@ users.") ("fftwf" ,fftwf) ("hamlib" ,wsjtx-hamlib) ("libusb" ,libusb) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtserialport" ,qtserialport))) (arguments @@ -1150,7 +1150,7 @@ weak-signal conditions.") ("fftwf" ,fftwf) ("hamlib" ,wsjtx-hamlib) ("libusb" ,libusb) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtserialport" ,qtserialport))) (arguments @@ -1403,7 +1403,7 @@ NanoVNA vector network analyzers.") ("hamlib" ,hamlib) ("openjpeg" ,openjpeg) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("v4l-utils" ,v4l-utils))) (arguments `(#:tests? #f ; No test suite. @@ -1512,7 +1512,7 @@ methods: `(("alsa-lib" ,alsa-lib) ("ncurses" ,ncurses) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:configure-flags '("--disable-static") #:phases @@ -1641,7 +1641,7 @@ Compatible hardware/software: ("libpcap" ,libpcap) ("opus" ,opus) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtwebkit" ,qtwebkit) ("qwt" ,qwt) @@ -1713,7 +1713,7 @@ receiver.") ("libusb" ,libusb) ("mpg123" ,mpg123) ("rtl-sdr" ,rtl-sdr) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtcharts" ,qtcharts) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) @@ -1949,7 +1949,7 @@ voice formats.") ("opencv" ,opencv) ("opus" ,opus) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtcharts" ,qtcharts) ("qtdeclarative" ,qtdeclarative) ("qtlocation" ,qtlocation) @@ -2005,7 +2005,7 @@ various hardware.") (inputs `(("fftwf" ,fftwf) ("liquid-dsp" ,liquid-dsp) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://github.com/miek/inspectrum") (synopsis "Radio signal analyser") (description @@ -2029,7 +2029,7 @@ software-defined radio receivers.") (build-system qt-build-system) (inputs `(("qcustomplot" ,qcustomplot) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtserialport" ,qtserialport))) (arguments diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index fbf10be366..87dcc6f890 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -57,7 +57,7 @@ `(("sdl2" ,sdl2))) (propagated-inputs ;; 'Viewer.h' includes 'QGLWidget'. - `(("qtbase" ,qtbase) ;the viewer module needs Qt5 + MESA + `(("qtbase" ,qtbase-5) ;the viewer module needs Qt5 + MESA ("mesa" ,mesa))) (synopsis "Robot simulator") (description @@ -107,7 +107,7 @@ hundred times faster than real-time.") `(("dashel" ,dashel) ("enki" ,enki) ("protobuf" ,protobuf-3.5) ;for logging - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qttools" ,qttools) ;for libQt5Help, needed by "studio" ("qtwebkit" ,qtwebkit) diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 1a267be13c..a9372735bf 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -87,7 +87,7 @@ ("podofo" ,podofo) ("poppler" ,poppler) ("python" ,python) ; need Python library - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("zlib" ,zlib))) (native-inputs diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 2b64117dc6..c85b4f801c 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -192,7 +192,7 @@ ("libzip" ,libzip) ("openssl" ,openssl) ("python-nautilus" ,python-nautilus) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtkeychain" ,qtkeychain) @@ -352,7 +352,7 @@ See also: megacmd, the official tool set by MEGA.") ("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) ("sqlite" ,sqlite) ("zlib" ,zlib))) @@ -397,7 +397,7 @@ silently and reliably flow across to every other.") #t)))) #:tests? #f)) ; no test target (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtwebkit" ,qtwebkit))) (home-page "https://github.com/sieren/QSyncthingTray") (synopsis "Traybar Application for Syncthing") diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 9d4325ffdf..4d7d803b72 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -569,7 +569,7 @@ formats, including all versions of RSS and Atom.") ("qttools" ,qttools))) (inputs `(("qtwebkit" ,qtwebkit) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("phonon" ,phonon) ("sqlite" ,sqlite))) diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index 1f8f8f351e..b241d29f6a 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -82,7 +82,7 @@ ("libxi" ,libxi) ("libx11" ,libx11) ("libxtst" ,libxtst) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://symless.com/synergy") (synopsis "Mouse and keyboard sharing utility") (description diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6f77482117..a1822b3892 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -538,7 +538,7 @@ Telegram project, for its use in telegram desktop client.") ("opus" ,opus) ("pulseaudio" ,pulseaudio) ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase) + ("qt" ,qtbase-5) ("qt5ct" ,qt5ct) ("qtimageformats" ,qtimageformats) ("qtwayland" ,qtwayland) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 9d8184801c..f75a168948 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -643,7 +643,7 @@ address of one of the participants.") ("opus" ,opus) ; avoid bundled ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("speech-dispatcher" ,speech-dispatcher) ("speex" ,speex) ; avoid bundled @@ -705,7 +705,7 @@ Mumble consists of two applications for separate usage: ("libilbc" ,libilbc) ("libsndfile" ,libsndfile) ("libxml2" ,libxml2) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols" ,qtquickcontrols) ("readline" ,readline) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 06ace5e238..9377e5622b 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -645,7 +645,7 @@ embedded kernel situations.") #t)))) (build-system gnu-build-system) (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols))) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b9eeb0e792..da19a57e59 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6500,7 +6500,7 @@ PDF documents.") "texmaker.pro"))))))) (inputs `(("poppler-qt5" ,poppler-qt5) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("qtwebkit" ,qtwebkit) ("zlib" ,zlib))) @@ -6606,7 +6606,7 @@ and Karl Berry.") ("libx11" ,libx11) ("mythes" ,mythes) ("python" ,python) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) (propagated-inputs diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0b6a4cd1f5..06ae653df8 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -650,7 +650,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. ("qttools" ,qttools))) ; for lrelease (inputs `(("hunspell" ,hunspell) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) @@ -856,7 +856,7 @@ editors.") ("guile" ,guile-1.8) ("perl" ,perl) ("python" ,python-wrapper) - ("qt" ,qtbase) + ("qt" ,qtbase-5) ("qtsvg" ,qtsvg))) (arguments `(#:tests? #f ; no check target diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e4ff86c9b5..8596706d11 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -559,7 +559,7 @@ applications by providing high-level classes for commonly required tasks.") (inputs `(;; XXX: Build fails with libvideogfx. ;; ("libvideogfx" ,libvideogfx) - ("qt" ,qtbase) + ("qt" ,qtbase-5) ("sdl" ,sdl))) (synopsis "H.265 video codec implementation") (description "Libde265 is an implementation of the h.265 video codec. It is @@ -926,7 +926,7 @@ H.264 (MPEG-4 AVC) video streams.") ("lzo" ,lzo) ("pcre2" ,pcre2) ("pugixml" ,pugixml) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("utfcpp" ,utfcpp) ("zlib" ,zlib))) @@ -1839,7 +1839,7 @@ videoformats depend on the configuration flags of ffmpeg.") ("pulseaudio" ,pulseaudio) ("protobuf" ,protobuf) ("python" ,python-wrapper) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("samba" ,samba) @@ -2731,7 +2731,7 @@ for use with HTML5 video.") ("libvpx" ,libvpx) ("libxv" ,libxv) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("sqlite" ,sqlite) ("zlib" ,zlib))) (arguments @@ -3021,7 +3021,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") ("rubberband" ,rubberband) ("libsamplerate" ,libsamplerate) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("sdl" ,sdl) ("sox" ,sox))) @@ -3091,7 +3091,7 @@ tools, XML authoring components, and an extensible plug-in based API.") ("glu" ,glu) ("libjpeg" ,libjpeg-turbo) ("libx11" ,libx11) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("eudev" ,eudev))) (synopsis "Realtime video capture utilities for Linux") (description "The v4l-utils provide a series of libraries and utilities to @@ -3155,7 +3155,7 @@ be used for realtime video capture via Linux-specific APIs.") ("mbedtls" ,mbedtls-apache) ("mesa" ,mesa) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("speexdsp" ,speexdsp) @@ -3230,7 +3230,7 @@ OBS audio sources.") #t))))) (inputs `(("obs" ,obs) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://github.com/Palakis/obs-websocket") (synopsis "OBS plugin for remote control via WebSockets") (description "This OBS plugin allows you to establish a WebSocket channel @@ -3422,7 +3422,7 @@ making @dfn{screencasts}.") ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments @@ -4502,7 +4502,7 @@ create smoother and stable videos.") ("imagemagick" ,imagemagick) ("jsoncpp" ,jsoncpp) ("libopenshot-audio" ,libopenshot-audio) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("zeromq" ,zeromq))) (arguments diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 26b41bb567..9f4cc79bf8 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -472,7 +472,7 @@ access.") ("font-google-noto" ,font-google-noto) ("font-openmoji" ,font-openmoji) ("openssl" ,openssl) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg))) (home-page "https://kristall.random-projects.net") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 31c78fc3b4..d1f1d0f755 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -237,7 +237,7 @@ #t))))) (inputs `(("http-parser" ,http-parser) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://github.com/azadkuh/qhttp/") (synopsis "Qt-based HTTP Library") (description @@ -1125,7 +1125,7 @@ project) (add-before 'check 'render-offscreen (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (home-page "http://qjson.sourceforge.net") (synopsis "Library that maps JSON data to QVariant objects") (description "QJson is a Qt-based library that maps JSON data to @@ -1150,7 +1150,7 @@ instances, while JSON's objects will be mapped to @code{QVariantMap}.") (build-system gnu-build-system) (inputs `(("qca" ,qca) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments '(#:tests? #f ;FIXME: some tests are failing #:phases @@ -8157,7 +8157,7 @@ It contains the code shared by all Kiwix ports.") ("libmicrohttpd" ,libmicrohttpd) ("libzim" ,libzim) ("pugixml" ,pugixml) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) @@ -8166,7 +8166,7 @@ It contains the code shared by all Kiwix ports.") ("zstd" ,zstd "lib"))) (native-inputs `(("pkg-config" ,pkg-config) - ("qmake" ,qtbase))) + ("qmake" ,qtbase-5))) (home-page "https://wiki.kiwix.org/wiki/Software") (synopsis "Viewer and manager of ZIM files") (description "Kiwix Desktop allows you to enjoy a lot of different content diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index a956a2f522..5f29ac9657 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -319,7 +319,7 @@ with X11 or Wayland, or in a text terminal with ncurses.") `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") #:tests? #f)) ; Test suite is a rather manual process. (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras))) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f593ee96d1..1b7468b918 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6518,7 +6518,7 @@ and embedded platforms.") (package/inherit uim (name "uim-qt") (inputs - `(("qt" ,qtbase) + `(("qt" ,qtbase-5) ("qtx11extras" ,qtx11extras) ,@(package-inputs uim))) (arguments -- cgit v1.2.3 From 8b07bbdcf707a2f54188fcbb4f9ad7f4e8a63070 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 14 Jun 2021 13:46:15 +0200 Subject: gnu: python-pygit2: Update to 1.6.0. * gnu/packages/python-xyz.scm (python-pygit2): Update to 1.6.0. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cfcfcfb27c..f6af612e4f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5322,13 +5322,13 @@ color scales, and color space conversion easy. It has support for: (define-public python-pygit2 (package (name "python-pygit2") - (version "1.4.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (pypi-uri "pygit2" version)) (sha256 - (base32 "1j71iskvirkm8jzfmwdm79v69878m9iix8a8cn4xidgr3nmkisyb")))) + (base32 "0qjd5aqpmla64da4pb47vdnrmnqdbn7248a4fzs7f5q1ax7fmb3s")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; tests don't run correctly in our environment -- cgit v1.2.3 From bccf2a9e25bbd2f6125cdc4452352d743d323d97 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 18 Jun 2021 16:54:33 +0530 Subject: gnu: python-miniboa: Update to 1.0.8. * gnu/packages/python-xyz.scm (python-miniboa): Update to 1.0.8. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f6af612e4f..bb263a6f20 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2016, 2017, 2021 Stefan Reichör ;;; Copyright © 2016, 2017, 2019 Alex Vong -;;; Copyright © 2016, 2017, 2018 Arun Isaac +;;; Copyright © 2016, 2017, 2018, 2021 Arun Isaac ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Julien Lepiller ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Thomas Danckaert @@ -2818,14 +2818,14 @@ matching them against a list of media-ranges.") (define-public python-miniboa (package (name "python-miniboa") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (pypi-uri "miniboa" version)) (sha256 (base32 - "09jh3pn4rh7kh7jayanf8jzy6gp03791b5a193w6148cf3i6k9m3")))) + "002c1aki9hsrwj5plrwdrf3sk8rn95fqylqyjx2arrjfpsih4dgs")))) (build-system python-build-system) (home-page "https://github.com/shmup/miniboa") (synopsis "Simple, single-threaded Telnet server") -- cgit v1.2.3