11 files changed, 19 insertions(+), 19 deletions(-)

M gnu/packages/animation.scm
M gnu/packages/education.scm
M gnu/packages/engineering.scm
M gnu/packages/finance.scm
M gnu/packages/geo.scm
M gnu/packages/image-processing.scm
M gnu/packages/kde-frameworks.scm
M gnu/packages/messaging.scm
M gnu/packages/music.scm
M gnu/packages/qt.scm
M gnu/packages/simulation.scm

@@ 352,7 352,7 @@ waveform until they line up with the proper sounds.")
                 "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh"))))
     (build-system gnu-build-system)
     (inputs
-     (list bash-minimal qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5))
+     (list bash-minimal qtbase-5 qtxmlpatterns-5 qtmultimedia-5 qtsvg-5))
     (arguments
      (list
       #:phases

@@ 601,7 601,7 @@ specialized device.")
            qtsvg-5
            qtwebchannel-5
            qtwebengine-5
-           qtxmlpatterns
+           qtxmlpatterns-5
            quazip-5
            sdl
            zlib))


@@ 735,7 735,7 @@ charts.")
            qtgraphicaleffects
            qtquickcontrols2-5
            qtx11extras
-           qtxmlpatterns))
+           qtxmlpatterns-5))
     (home-page "https://edu.kde.org/ktouch/")
     (synopsis "Touch typing tutor")
     (description

@@ 3561,7 3561,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
            qtwebengine
            qtwayland
            qtx11extras
-           qtxmlpatterns
+           qtxmlpatterns-5
            sqlite
            tbb-2020                     ; Same version as opencascade-occt
            vtk

@@ 836,7 836,7 @@ the Monero command line client and daemon.")
                qtquickcontrols2-5
                qtsvg-5
                qtwayland-5
-               qtxmlpatterns)))
+               qtxmlpatterns-5)))
     (arguments
      (list #:tests? #f ; No tests
            #:configure-flags

@@ 3980,7 3980,7 @@ latitude and longitude.")
            python-numpy
            qtbase-5
            qtsvg-5
-           qtxmlpatterns
+           qtxmlpatterns-5
            qwt
            zlib))
     (home-page "https://www.gplates.org")

@@ 1160,7 1160,7 @@ recalculates.")
            qtwebchannel-5
            qtwebengine-5
            qtx11extras
-           qtxmlpatterns
+           qtxmlpatterns-5
            sdl2
            sqlite
            tbb

@@ 1535,7 1535,7 @@ integration with a custom editor as well as a ready-to-use
     (native-inputs
      (list extra-cmake-modules perl qttools-5
            ;; Optional, for compile-time validation of syntax definition files:
-           qtxmlpatterns))
+           qtxmlpatterns-5))
     (inputs
      (list qtbase-5))))
 


@@ 4705,7 4705,7 @@ library.")
            qtbase-5
            qtdeclarative-5
            qtscript-5
-           qtxmlpatterns
+           qtxmlpatterns-5
            solid-5
            sonnet-5))
     (arguments

@@ 1500,7 1500,7 @@ default.")
                   qtquickcontrols2-5
                   qtsvg-5
                   qtmultimedia-5
-                  qtxmlpatterns
+                  qtxmlpatterns-5
                   qqc2-desktop-style
                   qxmpp
                   sonnet

@@ 1000,8 1000,8 @@ settings (aliasing, linear interpolation and cubic interpolation).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/hydrogen-music/hydrogen")
-             (commit version)))
+              (url "https://github.com/hydrogen-music/hydrogen")
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32 "1i5gz5zck8s0kskjgnx9c75gh7zx0kbjsqzl2765f99p9svprirq"))))


@@ 1031,7 1031,7 @@ settings (aliasing, linear interpolation and cubic interpolation).")
            pulseaudio
            qtbase-5
            qtsvg-5
-           qtxmlpatterns
+           qtxmlpatterns-5
            qtwayland-5
            zlib))
     (home-page "http://hydrogen-music.org/")

@@ 1569,7 1569,7 @@ XLSX document format.")
      (list qtbase-5))
     (synopsis "Qt5 build for the qxlsx library")))
 
-(define-public qtxmlpatterns
+(define-public qtxmlpatterns-5
   (package (inherit qtsvg-5)
     (name "qtxmlpatterns")
     (version "5.15.15")


@@ 3065,7 3065,7 @@ processes or computers.")
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs (list qtbase-5))
-    (native-inputs (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns))
+    (native-inputs (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns-5))
     (synopsis "Qt Speech module")
     (description "The Qt Speech module enables a Qt application to support
 accessibility features such as text-to-speech, which is useful for end-users


@@ 4311,7 4311,7 @@ module provides support functions to the automatically generated code.")
        ("qtwebchannel-5" ,qtwebchannel-5)
        ("qtwebsockets-5" ,qtwebsockets-5)
        ("qtx11extras" ,qtx11extras)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (arguments
       (list
        #:tests? #f ; No tests.


@@ 5351,7 5351,7 @@ color-related widgets.")
            libxslt
            python-wrapper
            qtbase-5
-           qtxmlpatterns))
+           qtxmlpatterns-5))
     (arguments
      (list
       #:tests? #f


@@ 5461,7 5461,7 @@ color-related widgets.")
            qtwebengine-5
            qtwebsockets-5
            qtx11extras
-           qtxmlpatterns))
+           qtxmlpatterns-5))
     (propagated-inputs
      (list python-shiboken-2))
     (native-inputs

@@ 188,7 188,7 @@
                          qtsvg-5
                          qttools-5
                          qtwebengine-5
-                         qtxmlpatterns
+                         qtxmlpatterns-5
                          utfcpp
                          vtk
                          xz))