guix_mirror_bot pushed a commit to branch c++-team
in repository guix.
commit 95ed40a6767f3726160618e32e9dcd3a047e2fb5
Author: Greg Hogan <[email protected]>
AuthorDate: Wed May 14 16:49:46 2025 +0000
gnu: Restore gnu-build-system phases.
* gnu/packages/bioinformatics.scm (bandage),
* gnu/packages/games.scm (chessx)
<#:phases>: Restore build phase.
* gnu/packages/disk.scm (qdirstat)
[arguments]<#:tests?>: Disable.
<#:phases>: Restore build and install phases.
* gnu/packages/ebook.scm (inkbox),
* gnu/packages/engineering.scm (qelectrotech),
* gnu/packages/games.scm (doom-runner, moonlight-qt, pokerth,
qcheckers),
* gnu/packages/gps.scm (gpxsee),
* gnu/packages/hardware.scm (openrgb),
* gnu/packages/image-viewers.scm (qview),
* gnu/packages/qt.scm (signond)
<#:phases>: Restore build and install phases.
* gnu/packages/education.scm (openboard),
* gnu/packages/emulators.scm (qtmips),
* gnu/packages/qt.scm (qtwidgetanimationframework)
<#:phases>: Restore build phase.
Change-Id: I28f22d4764e1fc23c8b83515d442042b698b5696
---
gnu/packages/bioinformatics.scm | 4 ++
gnu/packages/disk.scm | 6 +++
gnu/packages/ebook.scm | 7 +++-
gnu/packages/education.scm | 4 ++
gnu/packages/emulators.scm | 71 ++++++++++++++++++----------------
gnu/packages/engineering.scm | 7 +++-
gnu/packages/games.scm | 85 +++++++++++++++++++++++++----------------
gnu/packages/gps.scm | 7 +++-
gnu/packages/hardware.scm | 7 +++-
gnu/packages/image-viewers.scm | 7 +++-
gnu/packages/qt.scm | 11 +++++-
11 files changed, 145 insertions(+), 71 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index b7150f9689..5d90d35dec 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -18841,6 +18841,9 @@ Thus the per-base error rate is similar to the raw
input reads.")
(build-system qt-build-system)
(arguments
(list
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
;; TODO: Once <https://issues.guix.gnu.org/47475> is fixed,
;; consider uncommenting the following:
;;
@@ -18861,6 +18864,7 @@ Thus the per-base error rate is similar to the raw
input reads.")
(with-directory-excursion "tests"
(setenv "XDG_RUNTIME_DIR" (getcwd))
(invoke "./bandage_command_line_tests.sh")))))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install
(lambda _
(install-file "Bandage" (string-append #$output "/bin")))))))
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index a4df50bd4b..87ce589e1a 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1805,11 +1805,17 @@ wrapper for disk usage querying and visualisation.")
(build-system qt-build-system)
(arguments
(list
+ #:tests? #f
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
(lambda _
(system* "qmake" (string-append "INSTALL_PREFIX=" #$output))))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases 'install))
(add-after 'install 'wrap
(lambda _
(wrap-program (string-append #$output
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index d772d5244c..8deb82aa40 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -405,6 +405,9 @@ accessing and converting various ebook file formats.")
#:tests? #f ; no test suite
#:make-flags
#~(list (string-append "PREFIX=" #$output))
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'prefix-opt
@@ -414,7 +417,9 @@ accessing and converting various ebook file formats.")
#$output))))
(replace 'configure
(lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke (cons "qmake" make-flags)))))))
+ (apply invoke (cons "qmake" make-flags))))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(native-inputs
(list qtbase-5))
(synopsis "EBook reader")
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index e7abb7b858..a7b037cc14 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -513,6 +513,9 @@ specialized device.")
(arguments
(list
#:tests? #f ;no tests
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-initial-values
@@ -541,6 +544,7 @@ specialized device.")
(replace 'configure
(lambda _
(invoke "qmake" "OpenBoard.pro")))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
(replace 'install
(lambda* (#:key inputs #:allow-other-keys)
(let* ((share (string-append #$output "/share"))
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index b36ba153a5..37c9bfc84c 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -705,39 +705,44 @@ emulate a serial nullmodem over TCP/IP.")
"1fal7a8y5g0rqqjrk795jh1l50ihz01ppjnrfjrk9vkjbd59szbp"))))
(build-system qt-build-system)
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "qmake"
- (string-append "PREFIX=" (assoc-ref outputs "out"))
- "qtmips.pro")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (substitute* "tests/test.sh"
- (("qtchooser.*") ""))
- (substitute* '("tests/cpu_trap/test.sh"
- "tests/registers/test.sh")
- (("sub-qtmips_cli") "qtmips_cli"))
- (if tests?
- (invoke "tests/run-all.sh")
- #t)))
- (replace 'install
- ;; There is no install target.
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin"))
- (apps (string-append out "/share/applications"))
- (icons (string-append out "/share/icons/hicolor")))
- (install-file "qtmips_gui/qtmips_gui" bin)
- (install-file "qtmips_cli/qtmips_cli" bin)
- (install-file "data/qtmips.desktop" apps)
- (install-file "data/icons/qtmips_gui.svg"
- (string-append icons "/scalable/apps"))
- (install-file "data/icons/qtmips_gui.png"
- (string-append icons "/48x48/apps"))
- #t))))
- #:tests? #f)) ; test suite wants mips toolchain
+ (list
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "qmake"
+ (string-append "PREFIX=" (assoc-ref outputs "out"))
+ "qtmips.pro")))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (substitute* "tests/test.sh"
+ (("qtchooser.*") ""))
+ (substitute* '("tests/cpu_trap/test.sh"
+ "tests/registers/test.sh")
+ (("sub-qtmips_cli") "qtmips_cli"))
+ (if tests?
+ (invoke "tests/run-all.sh")
+ #t)))
+ (replace 'install
+ ;; There is no install target.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (apps (string-append out "/share/applications"))
+ (icons (string-append out "/share/icons/hicolor")))
+ (install-file "qtmips_gui/qtmips_gui" bin)
+ (install-file "qtmips_cli/qtmips_cli" bin)
+ (install-file "data/qtmips.desktop" apps)
+ (install-file "data/icons/qtmips_gui.svg"
+ (string-append icons "/scalable/apps"))
+ (install-file "data/icons/qtmips_gui.png"
+ (string-append icons "/48x48/apps"))
+ #t))))
+ #:tests? #f)) ; test suite wants mips toolchain
(inputs
(list elfutils qtbase-5 qtwayland-5))
(home-page "https://github.com/cvut/QtMips";)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 1603164ec5..e5dea1f2a5 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -961,6 +961,9 @@ required for Fritzing app.")
;; XXX: tests are built for the CMake build option but it seems to be
;; broken in 0.8.0.
(list #:tests? #f
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
@@ -968,7 +971,9 @@ required for Fritzing app.")
;; Patch hardcoded path before running qmake.
(substitute* "qelectrotech.pro"
(("\\/usr\\/local") #$output))
- (invoke "qmake"))))))
+ (invoke "qmake")))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(native-inputs
(list pkg-config qttools-5))
(inputs
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e0312b80ae..3daac7e580 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1547,6 +1547,9 @@ practise.")
(arguments
(list
#:tests? #f ;no tests
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
@@ -1556,6 +1559,8 @@ practise.")
#$output))
(invoke "qmake" "DoomRunner.pro" "-spec" "linux-g++"
"\"CONFIG+=release\"")))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases 'install))
(add-after 'install 'install-xdg
(lambda _
(with-directory-excursion "Install/XDG"
@@ -7100,6 +7105,9 @@ colors, pictures, and sounds.")
(arguments
(list
#:tests? #f ;no test suite
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
@@ -7115,7 +7123,9 @@ colors, pictures, and sounds.")
((" h264bitstream.*\n") "")
((" app \\\\") " app")
(("app.depends") "INCLUDEPATH +="))
- (invoke "qmake" (string-append "PREFIX=" #$output)))))))
+ (invoke "qmake" (string-append "PREFIX=" #$output))))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(native-inputs (list pkg-config qttools-5))
(inputs (list ffmpeg
h264bitstream
@@ -11686,12 +11696,17 @@ can be downloaded from
@url{https://zero.sjeng.org/best-network}.";)
(arguments
(list
#:tests? #f
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
(lambda _
(invoke "qmake"
- (string-append "PREFIX=" #$output)))))))
+ (string-append "PREFIX=" #$output))))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(inputs (list qtbase-5 qtsvg-5))
(home-page "https://portnov.github.io/qcheckers/";)
(synopsis "Qt-based checkers boardgame")
@@ -11878,35 +11893,36 @@ and chess engines.")
(inputs
(list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib))
(arguments
- `(#:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "chessx.pro"
- (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
- (search-input-file inputs "/bin/lrelease")))))
- (add-after 'fix-paths 'make-qt-deterministic
- (lambda _
- (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")
- #t))
- (add-after 'make-qt-deterministic 'disable-versioncheck
- (lambda _
- (substitute* "src/database/settings.cpp"
- (("\"/General/onlineVersionCheck\", true")
- "\"/General/onlineVersionCheck\", false"))
- #t))
- (replace 'configure
- (lambda _
- (invoke "qmake")
- #t))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (install-file "release/chessx" (string-append out "/bin"))
- (install-file "unix/chessx.desktop"
- (string-append out "/share/applications")))
- #t)))))
+ (list
+ #:tests? #f
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "chessx.pro"
+ (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
+ (search-input-file inputs "/bin/lrelease")))))
+ (add-after 'fix-paths 'make-qt-deterministic
+ (lambda _
+ (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1")))
+ (add-after 'make-qt-deterministic 'disable-versioncheck
+ (lambda _
+ (substitute* "src/database/settings.cpp"
+ (("\"/General/onlineVersionCheck\", true")
+ "\"/General/onlineVersionCheck\", false"))))
+ (replace 'configure
+ (lambda _
+ (invoke "qmake")))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (install-file "release/chessx" (string-append out "/bin"))
+ (install-file "unix/chessx.desktop"
+ (string-append out "/share/applications"))))))))
(synopsis "Chess game database")
(description
"ChessX is a chess database. With ChessX you can operate on your
@@ -12280,6 +12296,9 @@ game.") ;thanks to Debian for description
(arguments
(list
#:tests? #f ; No test suite
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
@@ -12302,7 +12321,9 @@ game.") ;thanks to Debian for description
(replace 'configure
(lambda _
(invoke "qmake" "pokerth.pro" "CONFIG+=client"
- (string-append "PREFIX=" #$output)))))))
+ (string-append "PREFIX=" #$output))))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(home-page "https://www.pokerth.net";)
(synopsis "Texas holdem poker game")
(description
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index aefb993f79..8ee1515d6b 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -220,6 +220,9 @@ coordinates as well as partial support for adjustments in
global coordinate syst
(list
#:qtbase qtbase
#:tests? #f ; no tests
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases #~(modify-phases %standard-phases
(replace 'configure
;; Use lrelease to convert TS translation files into QM
files.
@@ -227,7 +230,9 @@ coordinates as well as partial support for adjustments in
global coordinate syst
(apply invoke "lrelease"
(find-files "lang" "\\.ts"))
(invoke "qmake"
- (string-append "PREFIX=" #$output)))))))
+ (string-append "PREFIX=" #$output))))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases
'install)))))
(inputs (list libxkbcommon qtbase qtpositioning qtserialport qtsvg))
(native-inputs (list qttools))
(home-page "https://www.gpxsee.org";)
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index ff063bd368..961d524b4b 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -1149,6 +1149,9 @@ technology, such as head mounted displays with built in
head tracking.")
#:tests? #f ; doesn't have tests
#:make-flags
#~(list (string-append "INSTALL_ROOT=" #$output ))
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'unbundle
@@ -1167,7 +1170,9 @@ technology, such as head mounted displays with built in
head tracking.")
"/bin/chmod")))))
;; Call qmake instead of configure to create a Makefile.
(replace 'configure
- (lambda _ (invoke "qmake" "PREFIX=/" "OpenRGB.pro"))))))
+ (lambda _ (invoke "qmake" "PREFIX=/" "OpenRGB.pro")))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(inputs
(list coreutils
hidapi
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index a95441d9c9..9172a8722f 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -822,6 +822,9 @@ Poppler-Qt5 binding, PDF documents.")
(list
#:qtbase qtbase
#:tests? #f ; test code doesn't compile
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
@@ -836,7 +839,9 @@ Poppler-Qt5 binding, PDF documents.")
(lambda _
(substitute* "src/qvaboutdialog.cpp"
(("qvApp->checkUpdates\\(\\);") "")
- (("updateText\\(\\);") "")))))))
+ (("updateText\\(\\);") ""))))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(native-inputs
(list qttools))
(inputs
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7a0b404cc1..d41a1e2b98 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5218,6 +5218,9 @@ programming paradigm.")
(arguments
(list #:qtbase qtbase
#:tests? #f ;no tests
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
;; This project does not have any build rule but its demo has
@@ -5234,6 +5237,7 @@ programming paradigm.")
(replace 'configure
(lambda _
(invoke "qmake")))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
;; No install rule exists.
(replace 'install
(lambda _
@@ -6096,6 +6100,9 @@ a secure way.")))
(inputs (list dbus glib libaccounts-glib))
(arguments
(list #:tests? #f ; Figure out how to run tests
+ #:modules '((guix build qt-build-system)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ (guix build utils))
#:phases
#~(modify-phases %standard-phases
(replace 'configure
@@ -6118,7 +6125,9 @@ a secure way.")))
(string-append "PREFIX=" #$output)
(string-append "LIBDIR=" #$output "/lib")
(string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath,"
- #$output "/lib -Wl,-rpath,")))))))
+ #$output "/lib -Wl,-rpath,"))))
+ (replace 'build (assoc-ref gnu:%standard-phases 'build))
+ (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
(home-page "https://accounts-sso.gitlab.io/signond/index.html";)
(synopsis "Perform user authentication over D-Bus")
(description "This package provides a D-Bus service which performs user
