From 5949dc9870560a474d79337b8cfe3abdde7792f3 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 25 Aug 2022 19:25:45 +0800 Subject: [PATCH 5/9] gnu: python-pyqt+qscintilla: Rename to python-pyqt-5+qscintilla. * gnu/packages/qt.scm (python-pyqt+qscintilla): Rename to python-pyqt-5+qscintilla. * gnu/packages/geo.scm (qgjs)[inputs]: Ditto. * gnu/packages/medical.scm (openmolar-1)[inputs]: Ditto. * gnu/packages/python-xyz.scm (autokey)[inputs]: Ditto. --- gnu/packages/geo.scm | 2 +- gnu/packages/medical.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/qt.scm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 66c97d3d6a..2678c08a02 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2607,7 +2607,7 @@ (define-public qgis python-owslib python-psycopg2 python-pygments - python-pyqt+qscintilla + python-pyqt-5+qscintilla python-pytz python-pyyaml python-requests diff --git a/gnu/packages/medical.scm b/gnu/packages/medical.scm index 6c9cc757eb..60fb8c6091 100644 --- a/gnu/packages/medical.scm +++ b/gnu/packages/medical.scm @@ -49,7 +49,7 @@ (define-public openmolar-1 (("/usr") (assoc-ref outputs "out"))) #t))))) (inputs - (list python-pyqt+qscintilla python-mysqlclient qscintilla)) + (list python-pyqt-5+qscintilla python-mysqlclient qscintilla)) (home-page "https://openmolar.com/om1") (synopsis "Dental practice management software") (description "Openmolar is a dental practice management suite. Its diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 67d1128b88..82eaeec90f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4357,7 +4357,7 @@ (define-public autokey python-ipython python-pygobject python-pyinotify - python-pyqt+qscintilla + python-pyqt-5+qscintilla python-xlib wmctrl zenity)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 25bc0a1dad..d9b32749cc 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3333,7 +3333,7 @@ (define-public python-qscintilla ;; PyQt only looks for modules in its own directory. It ignores environment ;; variables such as PYTHONPATH, so we need to build a union package to make ;; it work. -(define-public python-pyqt+qscintilla +(define-public python-pyqt-5+qscintilla (package/inherit python-pyqt-5 (name "python-pyqt+qscintilla") (source #f) -- 2.37.2