* gnu/packages/qt.scm (qtsensors): Rename to qtsensors-5 * gnu/packages/qt.scm (python-pyqt, python-pyside-2) * gnu/packages/geo.scm (openorienteering-mapper) * gnu/packages/kde-plasma.scm (kscreen) * gnu/packages/education.scm (gcompris-qt) Adjust inputs. Change-Id: Ie18fdf82881e508ecc25c535088672d1a89f19ba --- gnu/packages/education.scm | 3 ++- gnu/packages/geo.scm | 3 ++- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/qt.scm | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 698f15678b..fb432ee844 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Nicolò Balzarotti ;;; Copyright © 2022 Luis Felipe López Acevedo ;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -192,7 +193,7 @@ (define-public gcompris-qt qtgraphicaleffects qtmultimedia-5 qtquickcontrols2-5 - qtsensors + qtsensors-5 qtsvg-5)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 687effcace..2a1bf2b935 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Roman Scherer ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Denis 'GNUtoo' Carikli +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2575,7 +2576,7 @@ (define-public openorienteering-mapper qtbase-5 qtimageformats-5 qtlocation - qtsensors + qtsensors-5 zlib)) (native-inputs (list doxygen diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index cf45fa59f7..1d41d35a56 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -793,7 +793,7 @@ (define-public kscreen libkscreen libxi plasma-wayland-protocols - qtsensors + qtsensors-5 qtbase-5 qtx11extras xcb-util)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6b58fe2211..5a24b7da25 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1664,7 +1664,7 @@ (define-public qtwebsockets (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtsensors +(define-public qtsensors-5 (package (inherit qtsvg-5) (name "qtsensors") @@ -3730,7 +3730,7 @@ (define-public python-pyqt ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsensors" ,qtsensors) + ("qtsensors" ,qtsensors-5) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) @@ -4545,7 +4545,7 @@ (define-public python-pyside-2 qtquickcontrols2-5 qtscript qtscxml - qtsensors + qtsensors-5 qtspeech qtsvg-5 qttools-5 -- 2.41.0