From 5890b5be7cc4ceaa6efad623eb56300dfc1a3e15 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 25 Aug 2022 19:05:17 +0800 Subject: [PATCH 3/9] gnu: python-pyqt-without-qtwebkit: Rename to python-pyqt-5-without-qtwebkit. Automated by following script: git grep -l '\bpython-pyqt-without-qtwebkit' | \ xargs sed -E 's/python-pyqt-without-qtwebkit/python-pyqt-5-without-qtwebkit/g' -i --- gnu/packages/backup.scm | 2 +- gnu/packages/ebook.scm | 4 ++-- gnu/packages/education.scm | 2 +- gnu/packages/orange.scm | 2 +- gnu/packages/python-check.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/radio.scm | 2 +- gnu/packages/vpn.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0d03d2e87f..f673e16a4a 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1336,7 +1336,7 @@ (define-public vorta python-paramiko python-peewee python-psutil - python-pyqt-without-qtwebkit + python-pyqt-5-without-qtwebkit python-secretstorage ;; This is included so that the qt-wrap phase picks it up. qtsvg-5)) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index edcf7b486f..f105d43754 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -197,7 +197,7 @@ (define-public calibre python-py7zr python-pychm python-pygments - python-pyqt-without-qtwebkit + python-pyqt-5-without-qtwebkit python-pyqtwebengine-5 python-regex speech-dispatcher @@ -243,7 +243,7 @@ (define-public calibre (string-append "[tool.sip.project] sip-include-dirs = [\"" #$(this-package-input - "python-pyqt-without-qtwebkit") + "python-pyqt-5-without-qtwebkit") "/share/sip\"]"))) (substitute* "src/calibre/ebooks/pdf/pdftohtml.py" (("PDFTOHTML = 'pdftohtml'") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 3c574b4176..b2e8eb4568 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -803,7 +803,7 @@ (define-public anki ("python-pyaudio" ,python-pyaudio) ;; `python-pyqtwebengine-5' must precede `python-pyqt' in PYTHONPATH. ("python-pyqtwebengine-5" ,python-pyqtwebengine-5) - ("python-pyqt" ,python-pyqt-without-qtwebkit) + ("python-pyqt" ,python-pyqt-5-without-qtwebkit) ("python-requests" ,python-requests) ("python-send2trash" ,python-send2trash) ("python-sip" ,python-sip) diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index ef6f36d8a8..0da1f28692 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -160,7 +160,7 @@ (define-public orange python-orange-widget-base python-pandas python-pygments - python-pyqt-without-qtwebkit + python-pyqt-5-without-qtwebkit python-pyqtgraph python-pyqtwebengine-5 python-pyyaml diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 7cc266fbce..e866de2212 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1624,7 +1624,7 @@ (define-public python-pytest-qt (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (propagated-inputs - (list python-pyqt-without-qtwebkit)) + (list python-pyqt-5-without-qtwebkit)) (native-inputs (list python-pytest python-pytest-runner python-setuptools-scm)) (home-page "https://github.com/pytest-dev/pytest-qt") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f7971b75fa..d362850466 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15562,7 +15562,7 @@ (define-public python-pyqtgraph (list qtbase-5)) (propagated-inputs (list python-h5py python-numpy python-pyopengl python-scipy - python-pyqt-without-qtwebkit)) + python-pyqt-5-without-qtwebkit)) (home-page "http://www.pyqtgraph.org") (synopsis "Scientific graphics and GUI library for Python") (description diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e6779e333a..df12c37964 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3127,7 +3127,7 @@ (define-public python-pyqtwebengine-5 (inputs `(("python" ,python-wrapper) ("python-sip" ,python-sip) - ("python-pyqt" ,python-pyqt-without-qtwebkit) + ("python-pyqt" ,python-pyqt-5-without-qtwebkit) ("qtbase" ,qtbase-5) ("qtsvg-5" ,qtsvg-5) ("qtdeclarative-5" ,qtdeclarative-5) @@ -3191,7 +3191,7 @@ (define-public python-pyqtwebengine-5 ;; depending on qtwebkit. ;; Ultimately, it would be nicer to have a more modular set of python-pyqt-* ;; packages that could be used together. -(define-public python-pyqt-without-qtwebkit +(define-public python-pyqt-5-without-qtwebkit (package/inherit python-pyqt (name "python-pyqt-without-qtwebkit") (inputs diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index bc2c13b847..7d1d9da0b1 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -597,7 +597,7 @@ (define-public gnuradio python-numpy python-pycairo python-pygobject - python-pyqt-without-qtwebkit + python-pyqt-5-without-qtwebkit python-pyqtgraph python-pyyaml qtbase-5 diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index eeb5991303..a0fd20d246 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -750,7 +750,7 @@ (define-public openconnect-sso python-lxml python-prompt-toolkit python-requests - python-pyqt-without-qtwebkit + python-pyqt-5-without-qtwebkit python-pyqtwebengine-5 python-pysocks python-pyxdg diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 8708efdb56..634d9ea0bf 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -491,7 +491,7 @@ (define-public qutebrowser ;; FIXME: python-pyqtwebengine-5 needs to come before python-pyqt so ;; that it's __init__.py is used first. python-pyqtwebengine-5 - python-pyqt-without-qtwebkit + python-pyqt-5-without-qtwebkit ;; While qtwebengine-5 is provided by python-pyqtwebengine-5, it's ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. qtwebengine-5)) -- 2.37.2