diff options
147 files changed, 3649 insertions, 1727 deletions
diff --git a/CODEOWNERS b/CODEOWNERS index b4f5ffe737..b077b79a6e 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -7,6 +7,7 @@ # usually suited as a reviewer. gnu/packages/audio\.scm @guix/audio +gnu/packages/fluidplug\.scm @guix/audio gnu/packages/xiph\.scm @guix/audio gnu/packages/commencement\.scm @guix/bootstrap diff --git a/doc/guix.texi b/doc/guix.texi index 3ab8708592..8bf0c873d4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -135,6 +135,7 @@ Copyright @copyright{} 2024-2025 Nigko Yerden@* Copyright @copyright{} 2024 Troy Figiel@* Copyright @copyright{} 2024 Sharlatan Hellseher@* Copyright @copyright{} 2024 45mg@* +Copyright @copyright{} 2024 Greg Hogan@* Copyright @copyright{} 2025 Sören Tempel@* Copyright @copyright{} 2025 Rostislav Svoboda@* Copyright @copyright{} 2025 Zacchaeus@* @@ -9704,16 +9705,40 @@ This variable is exported by @code{(guix build-system cmake)}. It implements the build procedure for packages using the @url{https://www.cmake.org, CMake build tool}. -It automatically adds the @code{cmake} package to the set of inputs. -Which package is used can be specified with the @code{#:cmake} -parameter. +This build system adds the following keyword parameters to the ones +defined by @code{gnu-build-system}: + +@table @code +@item #:cmake +The @code{cmake} package is added to the set of inputs. Which package +is used can be specified with the @code{#:cmake} parameter. + +@item #:build-type +The @code{#:build-type} parameter specifies in abstract terms the flags +passed to the compiler; it defaults to @code{"RelWithDebInfo"} (short +for ``release mode with debugging information''), which roughly means +that code is compiled with @code{-O2 -g}, as is the case for +Autoconf-based packages by default. + +@item #:generator +This parameter specifies the +@url{https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html, CMake generator} +responsible for writing the input files for the native build system. + +@item #:test-exclude +Tests matching this regular expression are excluded from testing by +@url{https://cmake.org/cmake/help/latest/manual/ctest.1.html, ctest}. -The @code{#:configure-flags} parameter is taken as a list of flags -passed to the @command{cmake} command. The @code{#:build-type} -parameter specifies in abstract terms the flags passed to the compiler; -it defaults to @code{"RelWithDebInfo"} (short for ``release mode with -debugging information''), which roughly means that code is compiled with -@code{-O2 -g}, as is the case for Autoconf-based packages by default. +@item #:test-repeat-until-pass? +Directs @url{https://cmake.org/cmake/help/latest/manual/ctest.1.html, ctest} to +@url{https://cmake.org/cmake/help/latest/manual/ctest.1.html#cmdoption-ctest-repeat, repeat} +failed tests up to @code{#:test-repeat-until-pass-count} times and is enabled by +default. + +@item #:test-repeat-until-pass-count +When @code{#:test-repeat-until-pass?} is enabled this parameter sets the maximum +number of failures for each test. The default is @code{5}. +@end table @end defvar @defvar composer-build-system @@ -23201,7 +23226,7 @@ Services of this type can be extended by other services to specify (simple-service 'my-extra-onion-service tor-service-type (list (tor-onion-service-configuration (name "extra-onion-service") - (mapping '((80 . "127.0.0.1:8080")))))) + (mapping '((80 "127.0.0.1:8080")))))) @end lisp @end defvar @@ -23275,8 +23300,8 @@ Service. @item @code{mapping} (type: alist) Association list of port to address mappings. The following example: @lisp -'((22 . "127.0.0.1:22") - (80 . "127.0.0.1:8080")) +'((22 "127.0.0.1:22") + (80 "127.0.0.1:8080")) @end lisp maps ports 22 and 80 of the Onion Service to the local ports 22 and 8080. @@ -44561,7 +44586,7 @@ The @code{rootless-podman-service-type} sets up the system to allow unprivileged users to run @command{podman} commands: @lisp -(use-service-modules containers networking @dots{}) +(use-service-modules containers dbus desktop networking @dots{}) (use-modules (gnu system accounts)) ;for 'subid-range' (operating-system @@ -44577,14 +44602,17 @@ unprivileged users to run @command{podman} commands: "audio" "video"))) %base-user-accounts)) (services - (append (list (service iptables-service-type) - (service rootless-podman-service-type - (rootless-podman-configuration - (subgids - (list (subid-range (name "alice")))) - (subuids - (list (subid-range (name "alice"))))))) - %base-services))) + (cons* (service dbus-root-service-type) + (service dhcpcd-service-type) + (service elogind-service-type) + (service iptables-service-type) + (service rootless-podman-service-type + (rootless-podman-configuration + (subgids + (list (subid-range (name "alice")))) + (subuids + (list (subid-range (name "alice")))))) + %base-services))) @end lisp The @code{iptables-service-type} is required for Podman to be able to setup its diff --git a/etc/teams.scm b/etc/teams.scm index 28f2504048..329e3a6133 100755 --- a/etc/teams.scm +++ b/etc/teams.scm @@ -448,6 +448,7 @@ already exists. Lookup team IDs among CURRENT-TEAMS." #:name "Audio team" #:description "Audio related packages." #:scope (list "gnu/packages/audio.scm" + "gnu/packages/fluidplug.scm" "gnu/packages/xiph.scm"))) (define-team bootstrap @@ -1275,6 +1276,11 @@ the \"texlive\" importer." "Yelninei") hurd) +(define-member (person "Giacomo Leidi" + "goodoldpaul@autistici.org" + "fishinthecalculator") + audio) + (define (find-team name) (or (hash-ref %teams (string->symbol name)) diff --git a/gnu/local.mk b/gnu/local.mk index 0d68693656..0c5e68ee08 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -50,7 +50,7 @@ # Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> # Copyright © 2022, 2024, 2025 Remco van 't Veer <remco@remworks.net> # Copyright © 2022, 2024, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com> -# Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com> +# Copyright © 2022, 2023, 2025 John Kehayias <john.kehayias@protonmail.com> # Copyright © 2022 muradm <mail@muradm.net> # Copyright © 2022 Hilton Chain <hako@ultrarare.space> # Copyright © 2022 Alex Griffin <a@ajgrf.com> @@ -306,6 +306,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/flashing-tools.scm \ %D%/packages/flex.scm \ %D%/packages/fltk.scm \ + %D%/packages/fluidplug.scm \ %D%/packages/fonts.scm \ %D%/packages/fontutils.scm \ %D%/packages/fpga.scm \ @@ -1055,6 +1056,7 @@ dist_patch_DATA = \ %D%/packages/patches/bdb-4-5-configure.patch \ %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \ %D%/packages/patches/biboumi-cmake-ignore-git.patch \ + %D%/packages/patches/brasero-fix-gcc-14-build-failure.patch \ %D%/packages/patches/brightnessctl-elogind-support.patch \ %D%/packages/patches/bsd-games-2.17-64bit.patch \ %D%/packages/patches/bsd-games-add-configure-config.patch \ @@ -1074,7 +1076,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/binutils-mingw-w64-deterministic.patch \ %D%/packages/patches/binutils-2.41-fix-cross.patch \ - %D%/packages/patches/bloomberg-bde-cmake-module-path.patch \ %D%/packages/patches/bloomberg-bde-tools-fix-install-path.patch \ %D%/packages/patches/boolector-find-googletest.patch \ %D%/packages/patches/boost-fix-duplicate-definitions-bug.patch \ @@ -1083,6 +1084,7 @@ dist_patch_DATA = \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \ %D%/packages/patches/busybox-add-missing-sha-NI-guard.patch \ + %D%/packages/patches/busybox-no-cbq.patch \ %D%/packages/patches/c2rust-ast-exporter-local-search.patch \ %D%/packages/patches/cadical-add-shared-library.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ @@ -1145,7 +1147,6 @@ dist_patch_DATA = \ %D%/packages/patches/clog-fix-shared-build.patch \ %D%/packages/patches/clucene-gcc-14.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ - %D%/packages/patches/cmake-curl-certificates-3.24.patch \ %D%/packages/patches/coda-use-system-libs.patch \ %D%/packages/patches/cogl-fix-double-free.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ @@ -1714,7 +1715,6 @@ dist_patch_DATA = \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kismet-unbundle-boost.patch \ %D%/packages/patches/kitty-fix-wayland-protocols.patch \ - %D%/packages/patches/kiwix-desktop-newer-libkiwix.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/knot-remove-runtime-deps.patch \ @@ -2130,6 +2130,7 @@ dist_patch_DATA = \ %D%/packages/patches/procmail-ambiguous-getline-debian.patch \ %D%/packages/patches/procmail-CVE-2014-3618.patch \ %D%/packages/patches/procmail-CVE-2017-16844.patch \ + %D%/packages/patches/procmail-gcc-14.patch \ %D%/packages/patches/proj-7-initialize-memory.patch \ %D%/packages/patches/proot-add-clone3.patch \ %D%/packages/patches/proot-add-missing-include.patch \ @@ -2248,8 +2249,6 @@ dist_patch_DATA = \ %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \ %D%/packages/patches/rng-tools-revert-build-randstat.patch \ %D%/packages/patches/rocclr-5.6.0-enable-gfx800.patch \ - %D%/packages/patches/rocm-bandwidth-test-5.5.0-fix-includes.patch \ - %D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \ %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \ %D%/packages/patches/rottlog-direntry.patch \ %D%/packages/patches/ruby-actionpack-remove-browser-tests.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d9d2f59c84..7012b5dd3b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2689,16 +2689,20 @@ command.") (build-system qt-build-system) (arguments (list + #:tests? #f ; no tests ;; Make sure the (rarely updated) package 'imagemagick/stable' ;; does not end up in the closure. #:disallowed-references (list imagemagick/stable) - #:test-target "check" + #:modules '((guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "wpa_supplicant/wpa_gui-qt4"))) (replace 'configure (lambda _ (invoke "qmake" "wpa_gui.pro"))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) (add-after 'build 'build-icons (lambda _ ;; Inkscape complains (but works) without a writable $HOME. diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 24738a4c01..d8aa9ab2f9 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -68,6 +68,7 @@ (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:parallel-tests? #f #:configure-flags #~(list "-DZINT_QT6=ON" "-DZINT_TEST=ON" diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 8773aa323f..83572e2fc6 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -831,8 +831,7 @@ cosine/ sine transforms or DCT/DST).") ;; See: https://fftw.org/release-notes.html (name "fftw-cmake") (build-system cmake-build-system) - (arguments (default-keyword-arguments '() - '())) + (arguments '(#:tests? #f)) (description (string-append (package-description fftw) " This CMake build offers the file FFTW3LibraryDepends.cmake required by some dependent packages, absent in the @@ -1202,7 +1201,8 @@ features, and more.") (inherit eigen) (name "eigen-benchmarks") (arguments - '(#:phases (modify-phases %standard-phases + '(#:tests? #f ; no tests + #:phases (modify-phases %standard-phases (delete 'configure) (replace 'build (lambda* (#:key outputs #:allow-other-keys) @@ -1285,9 +1285,7 @@ features, and more.") (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - (list - #:configure-flags #~(list "-DBUILD_TESTS=ON") - #:test-target "xtest")) + (list #:configure-flags #~(list "-DBUILD_TESTS=ON"))) (native-inputs (list doctest googletest diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 20ed472292..f804f98a0f 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -123,7 +123,8 @@ use their packages mostly unmodified in our Android NDK build system.") (base32 "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399")))) (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") + `(#:tests? #f + #:configure-flags '("-DBUILD_SHARED_LIBS=ON") #:phases (modify-phases %standard-phases (add-after 'install 'install-host-libraries diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 8423befab8..c76f55127c 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -747,10 +747,9 @@ files.") (build-system cmake-build-system) (arguments (list - #:tests? #f + #:tests? #f ;; XXX: insists on using bundled googletest #:configure-flags - #~(list "-DBUILD_TESTING=off" ;; XXX: insists on using bundled googletest - "-DBUILD_SHARED_LIBS=ON" + #~(list "-DBUILD_SHARED_LIBS=ON" #$@(let ((target (%current-target-system))) (if target (cond ((string-prefix? "arm" target) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 0112ff5ecf..a96b4661fd 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -436,7 +436,6 @@ rendering of the atmosphere model and examine its properties. #:configure-flags #~(list "-DBUILD_PYTHON3=ON" "-DBUILD_PYTHON=OFF" - "-DBUILD_TESTING=TRUE" "-DUSE_HDF5=ON" "-DUSE_OPENMP=OFF" "-DUSE_THREADS=ON" @@ -1361,14 +1360,16 @@ standard astronomy libraries: #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) (string-append "PREFIX=" #$output)) - #:test-target "test" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (chdir "../source") - (setenv "CC" #$(cc-for-target)))))))) + (replace 'check + (lambda* (#:rest args) + (with-directory-excursion "../source" + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "test" args))))))) (native-inputs (list python-wrapper)) (home-page "https://github.com/kbarbary/sep") @@ -9602,7 +9603,6 @@ deconvolution). Such post-processing is not performed by Stackistry.") (list ;; FIXME: Tests keep failing on 100% when preparing test-suit for INDI. #:tests? #f - #:test-target "test" #:configure-flags #~(list "-DENABLE_GPS=1" ;; TODO: Enable when all of the dependencies are available for Qt6. diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 35cffb3693..c481b5a3de 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2163,11 +2163,14 @@ object library.") (sha256 (base32 "1lgasyk8j4cl9178vci1dph63nks3cgwhf8y1d04z9dc8gg15dyn")))) (build-system cmake-build-system) + (arguments + '(#:configure-flags '("-DBUILD_STATIC_LIBRARY=ON"))) ; required to build tests (native-inputs (list bison flex gettext-minimal zlib)) (inputs (list alsa-lib boost + cunit jack-1 ladspa liblo @@ -4004,8 +4007,10 @@ buffers, and audio capture.") (patches (search-patches "alure-dumb-2.patch")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;no tests - #:configure-flags '("-DMODPLUG=ON"))) + (list + #:cmake cmake-3.25 + #:tests? #f ;no tests + #:configure-flags #~(list "-DMODPLUG=ON"))) (native-inputs (list pkg-config)) (inputs (list dumb flac @@ -4216,6 +4221,9 @@ link REQUIRED)")))))) "-DFORTIFY=ON" "-DLIBSCSYNTH=ON" "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases ;; HOME must be defined otherwise supercollider throws a "ERROR: @@ -4243,6 +4251,7 @@ link REQUIRED)")))))) (lambda _ (system "Xvfb &") (setenv "DISPLAY" ":0"))) + (replace 'install (assoc-ref gnu:%standard-phases 'install)) (add-before 'install 'install-ide (lambda _ (let* ((ide #$output:ide) @@ -4326,7 +4335,6 @@ using Guix System.") (build-system cmake-build-system) (arguments (list - #:cmake cmake-next #:build-type "Release" ;; The build system uses CMake modules features that are only available ;; when using Ninja. @@ -4904,15 +4912,18 @@ surround and reverb.") (define-public libxmp (package (name "libxmp") - (version "4.4.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/xmp/libxmp/" version "/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1kycz4jsyvmf7ny9227b497wc7y5ligydi6fvvldmkf8hk63ad9m")))) + (version "4.6.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libxmp/libxmp") + (commit (string-append "libxmp-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mb54n2cqr8wvq02x9v8vdanvn01bhy0j1pyq2n3iykfnpjx4f2m")))) (build-system gnu-build-system) + (native-inputs (list autoconf)) (home-page "https://xmp.sourceforge.net/") (synopsis "Module player library") (description @@ -4924,19 +4935,19 @@ Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).") (define-public xmp (package (name "xmp") - (version "4.1.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/xmp/xmp/" version "/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x")))) + (version "4.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libxmp/xmp-cli") + (commit (string-append "xmp-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0c015v8r91g5nspfn6lldkw76dg3xjyg3x6s2sbiw6b3n7bf8znk")))) (build-system gnu-build-system) - (native-inputs - (list pkg-config)) - (inputs - (list libxmp pulseaudio)) + (native-inputs (list autoconf automake pkg-config)) + (inputs (list libxmp pulseaudio)) (home-page "https://xmp.sourceforge.net/") (synopsis "Extended module player") (description diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 4909a375a1..320081d818 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> -;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019-2023, 2025 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2020, 2023, 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> @@ -369,10 +369,15 @@ differences.") ;; XXX: On 32-bit Hurd platforms, 'time_t' is defined as a 32-bit ;; integer in 'hurd_types.defs', so this Gnulib test always fails. #:make-flags - #~#$(if (and (not (%current-target-system)) - (string=? (%current-system) "i586-gnu")) - #~'("XFAIL_TESTS=test-year2038") - #~'()) + #~#$(cond ((and (not (%current-target-system)) + (string=? (%current-system) "i586-gnu")) + #~'("XFAIL_TESTS=test-year2038")) + ;; TODO: Figure out why these gnulib tests are failing. + ((and (not (%current-target-system)) + (target-ppc64le?)) + #~'("XFAIL_TESTS=test-float-h large-subopt")) + (else + #~'())) #:configure-flags #~#$(if (%current-target-system) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 69484bbb64..4ca7998cc7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7270,8 +7270,6 @@ bases are detected.") (bin (string-append #$output "/bin/"))) (mkdir-p bin) (copy-recursively "." share) - (delete-file (string-append share "/Chrysalis/build/CMakeFiles/CMakeOutput.log")) - (delete-file (string-append share "/Inchworm/build/CMakeFiles/CMakeOutput.log")) (wrap-program (string-append share "Trinity") `("R_LIBS_SITE" ":" = (,(getenv "R_LIBS_SITE"))) @@ -7325,7 +7323,7 @@ bases are detected.") (list coreutils gzip which)) - (native-inputs (list cmake)) + (native-inputs (list cmake-minimal)) (home-page "https://github.com/trinityrnaseq/trinityrnaseq/wiki") (synopsis "Trinity RNA-Seq de novo transcriptome assembly") (description "Trinity assembles transcript sequences from Illumina RNA-Seq @@ -11369,7 +11367,6 @@ seamless support for BCF and VCF files.") (list #:configure-flags '(list "-DMORPHEUS_GUI=OFF" - "-DBUILD_TESTING=ON" "-DDOWNLOAD_XTENSOR=OFF") #:phases '(modify-phases %standard-phases @@ -18823,6 +18820,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: ;; @@ -18843,6 +18843,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"))))))) @@ -23466,8 +23467,7 @@ The output is in SAM format.") "0slkagrk3nfi2qsksv6b1brj6zhx4bj4bkib2sdycvrcd10ql2lh")))) (build-system cmake-build-system) (arguments - `(#:test-target "test" - #:configure-flags + `(#:configure-flags ,#~(list "-DWITH_CHECK=ON" (string-append "-DLIBXML_LIBRARY=" #$(this-package-input "libxml2") @@ -24595,14 +24595,20 @@ both types of files.") (build-system cmake-build-system) (arguments (list - #:test-target "simple_test" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "src/megahit" - (("os.path.join\\(script_path, '..'\\)") - "os.path.join(script_path, '../source')"))))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "src/megahit" + (("os.path.join\\(script_path, '..'\\)") + "os.path.join(script_path, '../source')")))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "simple_test" args)))))) (inputs (list python-wrapper zlib)) (home-page "https://www.ncbi.nlm.nih.gov/pubmed/25609793") (synopsis "Meta-genome assembler") @@ -25188,33 +25194,33 @@ module capable of computing base-level alignments for very large sequences.") (outputs '("out" "doc")) (arguments (list + #:test-exclude (string-join (list "TestFileMetaInformation" + "TestElement2" + "TestSCUValidation" + "TestWriter" + "TestAnonymizer4" + "TestPrinter1" + "TestEcho" + ;; The scanner tests depend on TestWriter output. + "TestStrictScanner1" + "TestStrictScanner2_1" + "TestStrictScanner2" + "TestStrictScanner2_2" + "TestFind") + "|") + #:configure-flags + #~(list "-DGDCM_BUILD_TESTING=true" + "-DGDCM_DOCUMENTATION:BOOL=ON" + "-DGDCM_PDF_DOCUMENTATION:BOOL=OFF" + (string-append "-DGDCM_INSTALL_DOC_DIR=" + #$output:doc "/share/doc/" #$name)) #:phases #~(modify-phases %standard-phases (add-before 'build 'set-HOME ;; The build spams ‘Fontconfig error: No writable cache ;; directories’ in a seemingly endless loop otherwise. (lambda _ - (setenv "HOME" "/tmp")))) - #:configure-flags - #~(list "-DGDCM_BUILD_TESTING=true" - (string-append "-DCMAKE_CTEST_ARGUMENTS=-E;" - "'TestFileMetaInformation" - "|TestElement2" - "|TestSCUValidation" - "|TestWriter" - "|TestAnonymizer4" - "|TestPrinter1" - "|TestEcho" - ;; The scanner tests depend on TestWriter output - "|TestStrictScanner1" - "|TestStrictScanner2_1" - "|TestStrictScanner2" - "|TestStrictScanner2_2" - "|TestFind'") - "-DGDCM_DOCUMENTATION:BOOL=ON" - "-DGDCM_PDF_DOCUMENTATION:BOOL=OFF" - (string-append "-DGDCM_INSTALL_DOC_DIR=" - #$output:doc "/share/doc/" #$name)))) + (setenv "HOME" "/tmp")))))) (native-inputs (list docbook-xsl doxygen graphviz libxslt)) (home-page "https://gdcm.sourceforge.net/wiki/index.php/Main_Page") (synopsis "Grassroots DICOM library") diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 309f85c716..ac8e496201 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -524,7 +524,13 @@ desktops.") (arguments (list #:qtbase qtbase #:configure-flags #~(list "-DTESTING=ON") - #:test-target "check")) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:rest args) + ;; Fix for "enable_testing" not in the top-level directory. + (with-directory-excursion "test" + (apply (assoc-ref %standard-phases 'check) args))))))) (native-inputs (list qttools)) (inputs diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index c466e03139..7121cec4d4 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -329,7 +329,7 @@ files and generates build instructions for the Ninja build system.") import sys sys.path.insert(0, '~a') # EASY-INSTALL-ENTRY-SCRIPT" (site-packages inputs outputs))))))))) - (inputs (list python ninja)) + (inputs (list python ninja/pinned)) (home-page "https://mesonbuild.com/") (synopsis "Build system designed to be fast and user-friendly") (description @@ -359,7 +359,7 @@ resembles Python.") "-k" "not test_pep518"))) (propagated-inputs (list meson - ninja + ninja/pinned python-colorama python-cython-3 python-pyproject-metadata diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 053994a52a..fea4531620 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -47,7 +47,8 @@ (base32 "1923f21rnlbv1qjvk2qhgqnki5mkgr6z0p8dvzs9jr3l5vrxy49k")) (patches - (search-patches "busybox-add-missing-sha-NI-guard.patch")))) + (search-patches "busybox-add-missing-sha-NI-guard.patch" + "busybox-no-cbq.patch")))) (build-system gnu-build-system) (arguments (list #:phases diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index faf7779ce7..da8b558c6f 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -126,10 +126,12 @@ available in French.") (build-system cmake-build-system) (arguments (list - #:test-target "testit" #:configure-flags #~(list "-DUSE_SYSTEM_TZ_DB=ON" "-DBUILD_SHARED_LIBS=ON" "-DBUILD_TZ_LIB=ON" "-DENABLE_DATE_TESTING=ON") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-bin-bash @@ -148,7 +150,11 @@ available in French.") (lambda _ (for-each delete-file '("test/solar_hijri_test/parse.pass.cpp" - "test/tz_test/zoned_time_deduction.pass.cpp"))))))) + "test/tz_test/zoned_time_deduction.pass.cpp")))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "testit" args)))))) (synopsis "Date and time library for C++11 and C++14") (description "Date is a header only C++ library that extends the chrono date @@ -172,6 +178,7 @@ algorithms library for calendar dates and durations. It also provides the (build-system cmake-build-system) (arguments (list + #:parallel-tests? #f #:configure-flags #~(list "-DSHARED_ONLY=true" ;; required by evolution-data-server "-DGOBJECT_INTROSPECTION=true" diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 84dec5974c..9660cff1c7 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -587,7 +587,8 @@ PyUnit and others.") (base32 "0mf55yi8ahpczl9jz2is3dnghfi3g9qz5vch7mx7akqx4gfhhviz")))) (build-system cmake-build-system) - (arguments (list #:configure-flags + (arguments (list #:tests? #f + #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" "-DSNITCH_DO_TEST=ON" "-DSNITCH_USE_SYSTEM_DOCTEST=ON"))) @@ -1145,7 +1146,8 @@ package.") (base32 "1cv55x3amwrvfan9pr8dfnicwr8r6ar3yf6cg9v6nykd6m2v3qsv")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + `(#:tests? #f + #:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) (native-inputs `(("python" ,python-wrapper))) (home-page "https://github.com/google/googletest/") @@ -1355,7 +1357,9 @@ with the @code{klee} package.") (arguments (list #:strip-directories #~(list "bin") ;don't strip LLVM bitcode in /lib - #:test-target "check" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -1371,6 +1375,7 @@ with the @code{klee} package.") (substitute* "test/lit.cfg" (("addEnv\\('PWD'\\)" env) (string-append env "\n" "addEnv('GUIX_PYTHONPATH')"))))) + (replace 'check (assoc-ref gnu:%standard-phases 'check)) (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -3607,12 +3612,11 @@ tests. The output format is JSON.") (list) (list #:configure-flags #~(list "-DTROMPELOEIL_BUILD_TESTS=yes"))) (list - #:test-target "test/self_test" #:phases #~(modify-phases %standard-phases (replace 'check - (lambda* (#:key tests? test-target #:allow-other-keys) + (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke test-target)))))))) + (invoke "test/self_test")))))))) (native-inputs (list catch2-3)) (home-page "https://github.com/rollbear/trompeloeil") (synopsis "Header only C++14 mocking framework") diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 522778776c..5cbdad2822 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -604,7 +604,6 @@ usual algorithms you expect from a modern molecular dynamics implementation.") (search-input-file %build-inputs "/lib/inchi/libinchi.so.1")) (string-append "-DINCHI_INCLUDE_DIR=" (search-input-directory %build-inputs "/include/inchi"))) - #:test-target "test" #:phases '(modify-phases %standard-phases ;; Fixed upstream: diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 608080954f..b269365d5a 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2024 dan <i@dan.games> ;;; Copyright © 2024 Charles <charles@charje.net> +;;; Copyright © 2024 Greg Hogan <code@greghogan.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -131,6 +132,7 @@ using the CMake build system.") '("Modules/CompilerId/Xcode-3.pbxproj.in" "Modules/Internal/CPack/CPack.RuntimeScript.in" "Source/cmGlobalXCodeGenerator.cxx" + "Source/cmLocalNinjaGenerator.cxx" "Source/cmLocalUnixMakefileGenerator3.cxx" "Source/cmExecProgramCommand.cxx" "Tests/CMakeLists.txt" @@ -172,14 +174,16 @@ using the CMake build system.") ;; ELF headers. "Utilities/cmelf" ;; CMake header wrappers. - "Utilities/cm3p")) + "Utilities/cm3p" + ;; Pkg-config file format parser based on llparse. + "Utilities/cmllpkgc")) ;;; The "bootstrap" CMake. It is used to build 'cmake-minimal' below, as well ;;; as any dependencies that need cmake-build-system. (define-public cmake-bootstrap (package (name "cmake-bootstrap") - (version "3.24.2") + (version "3.31.8") (source (origin (method url-fetch) (uri (string-append "https://cmake.org/files/v" @@ -187,8 +191,7 @@ using the CMake build system.") "/cmake-" version ".tar.gz")) (sha256 (base32 - "1ny8y2dzc6fww9gzb1ml0vjpx4kclphjihkxagxigprxdzq2140d")) - (patches (search-patches "cmake-curl-certificates-3.24.patch")))) + "1akcmx9w5wbygq088hrr13l6n4b5npqvh9jk20934bfwhg5f7kg3")))) (build-system gnu-build-system) (arguments (list @@ -211,7 +214,10 @@ using the CMake build system.") ;; By default CMake is built without any optimizations. Use ;; the recommended Release target for a ~2.5x speedup. - "--" "-DCMAKE_BUILD_TYPE=Release")) + "--" "-DCMAKE_BUILD_TYPE=Release" + + ;; The debugger creates a circular dependency on cppdap. + "-DCMake_ENABLE_DEBUGGER=OFF")) #:make-flags #~(let ((skipped-tests (list #$@%common-disabled-tests @@ -251,7 +257,15 @@ using the CMake build system.") "!defined(__GNU__)"))))) #~())))) (inputs - (list libuv bzip2 curl expat file jsoncpp libarchive rhash zlib)) + (list bzip2 + curl + expat + file + jsoncpp/pinned + libarchive + libuv + rhash + zlib)) (native-search-paths (list (search-path-specification (variable "CMAKE_PREFIX_PATH") @@ -318,6 +332,8 @@ and workspaces that can be used in the compiler environment of your choice.") (list #:configure-flags #~(list "-DCMAKE_USE_SYSTEM_LIBRARIES=ON" + ;; The debugger creates a circular dependency on cppdap. + "-DCMake_ENABLE_DEBUGGER=OFF" (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-" #$(version-major+minor (package-version cmake-bootstrap)))) @@ -349,6 +365,7 @@ and workspaces that can be used in the compiler environment of your choice.") (invoke "ctest" "-j" (if parallel-tests? (number->string (parallel-job-count)) "1") + "--output-on-failure" "--exclude-regex" (string-append "^(" (string-join skipped-tests "|") ")$"))) (format #t "test suite not run~%")))))) @@ -361,7 +378,7 @@ and workspaces that can be used in the compiler environment of your choice.") (package (inherit cmake-minimal) (name "cmake") - (version "3.25.1") + (version "4.0.3") (source (origin (inherit (package-source cmake-minimal)) (method url-fetch) @@ -376,8 +393,7 @@ and workspaces that can be used in the compiler environment of your choice.") ,@rest)))) (sha256 (base32 - "1n4inb3fvk70sni5gmkljqw3cyllalyg3fnr9rlr7x3aa44isl8w")) - (patches (search-patches "cmake-curl-certificates-3.24.patch")))) + "1yrzkwkr2nxl8hcjkk333l9ycbw9prkg363k4km609kknyvkfdcd")))) (outputs '("out" "doc")) (arguments (substitute-keyword-arguments (package-arguments cmake-minimal) @@ -414,58 +430,28 @@ and workspaces that can be used in the compiler environment of your choice.") (delete-file-recursively (string-append #$output html))))))))) (inputs (modify-inputs (package-inputs cmake-minimal) - (prepend ncurses))) ;required for ccmake + (prepend ncurses) ;required for ccmake + ;; Avoid circular dependency with (gnu packages debug). + (prepend (module-ref (resolve-interface '(gnu packages debug)) + 'cppdap)))) ;; Extra inputs required to build the documentation. (native-inputs (modify-inputs (package-native-inputs cmake-minimal) (append python-sphinx - texinfo))) - (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) + texinfo))))) -(define-public cmake-next - (package - (inherit cmake) - (version "4.0.1") - (source (origin - (method url-fetch) - (uri (string-append "https://cmake.org/files/v" - (version-major+minor version) - "/cmake-" version ".tar.gz")) - (sha256 - (base32 - "1q9119wg68vz3ki4g3yw3dkb90zpbr13vy2raar21rb31vhafc6n")))) - (native-inputs - (modify-inputs (package-native-inputs cmake) - ;; Avoid circular dependency with (gnu packages debug). Note: cppdap - ;; is built with cmake, so when the default cmake is updated to this - ;; version this circular dependency will need to be worked around. - (prepend (module-ref (resolve-interface '(gnu packages debug)) - 'cppdap)))))) - -(define-public cmake-minimal-3.30 - (package - (inherit cmake-minimal) - (version "3.30.3") - (source (origin - (method url-fetch) - (uri (string-append "https://cmake.org/files/v" - (version-major+minor version) - "/cmake-" version ".tar.gz")) - (sha256 - (base32 - "1r48zym4dy4mvwzk704zh1vx9gb4a910f424ypvis28mcxdy2pbd")))) - (arguments - (substitute-keyword-arguments (package-arguments cmake-minimal) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'delete-help-documentation))))) - (native-inputs - (modify-inputs (package-native-inputs cmake-minimal) - ;; Avoid circular dependency with (gnu packages debug). Note: cppdap - ;; is built with cmake, so when the default cmake-minimal is updated to - ;; this version this circular dependency will need to be worked around. - (prepend (module-ref (resolve-interface '(gnu packages debug)) - 'cppdap)))))) +(define-public cmake-3.25 + (hidden-package + (package/inherit cmake + (version "3.25.3") + (source (origin + (method url-fetch) + (uri (string-append "https://cmake.org/files/v" + (version-major+minor version) + "/cmake-" version ".tar.gz")) + (sha256 + (base32 + "074hw6pr7w4j6mfnpm3xh99cm6chjf4rjpi4qkmnvjlhsl0mg6fc"))))))) (define-public cmake-minimal-cross (package diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 9ab21880c8..7d081e3e3f 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -190,14 +190,14 @@ desired software component.") (define-public cflow (package (name "cflow") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/cflow/cflow-" version ".tar.bz2")) (sha256 (base32 - "11khr78090jjyqa2l26bdz0myjx6b212lz216dhjc7h0z754c4fh")))) + "1f4s979phyjz8qss10d0fqa4paa6z3wwdz23d9zqgixnamxn48c3")))) (build-system gnu-build-system) ;; Needed to have cflow-mode.el installed. @@ -711,8 +711,7 @@ possible to collect coverage information without special compiler switches.") (arguments '(#:build-type "RelWithDebInfo" #:configure-flags - '("-DRTAGS_NO_ELISP_FILES=1" - "-DBUILD_TESTING=FALSE") + '("-DRTAGS_NO_ELISP_FILES=1") #:tests? #f)) (native-inputs (list pkg-config)) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 96b28206f7..503fa18a55 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -875,6 +875,7 @@ with the sfArk algorithm.") (build-system cmake-build-system) (arguments (list + #:parallel-tests? #f #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" "-DMZ_BUILD_TESTS=ON" "-DMZ_BUILD_UNIT_TESTS=ON" @@ -2167,6 +2168,15 @@ timestamps in the file header with a fixed time (1 January 2008). (base32 "18578xbzj8j89srv4bwayjm11bg56fl34sya0znq4fwq3apm037i")))) (build-system cmake-build-system) + (arguments + (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + ;; Avoid the integration test, which requires a system bus. + (replace 'check (assoc-ref gnu:%standard-phases 'check))))) (inputs (list zlib)) (native-inputs (list perl ; for the documentation @@ -2872,7 +2882,8 @@ computations.") "17kqwvw2n6bgzidi8f5906s5hc9wm1lbfbpd491gf7csxjck99sx")))) (build-system cmake-build-system) (arguments - (list #:configure-flags #~(list "-DBUILD_STATIC=OFF" + (list #:parallel-tests? #f + #:configure-flags #~(list "-DBUILD_STATIC=OFF" "-DDEACTIVATE_AVX2=ON" "-DDEACTIVATE_AVX512=ON" "-DPREFER_EXTERNAL_LZ4=ON" @@ -3007,7 +3018,8 @@ can append files to the end of such compressed archives.") "00ibddiy62kbs9wl52c35j0hbqanx6pi7lvzkpzmbsizkj8mhp1p")))) (build-system cmake-build-system) (arguments - '(#:configure-flags + '(#:tests? #f + #:configure-flags (let* ((out (assoc-ref %outputs "out")) (lib (string-append out "/lib"))) (list diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index d90948f059..1a2aa6b75d 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -73,7 +73,7 @@ (define-public crun (package (name "crun") - (version "1.22") + (version "1.23.1") (source (origin (method url-fetch) @@ -83,7 +83,7 @@ "/crun-" version ".tar.gz")) (sha256 (base32 - "1cggwb5libxjx4x96hd2v1pd4rm7m7bll37j888khsc5s486q32z")))) + "1y23fz82d7zaa2svyzjhfhahl6l0a3yrasfbcfacplhkwk7bflnp")))) (build-system gnu-build-system) (arguments (list @@ -684,7 +684,7 @@ being rootless and not requiring any daemon to be running.") (define-public buildah (package (name "buildah") - (version "1.40.1") + (version "1.41.0") (source (origin (method git-fetch) @@ -692,7 +692,7 @@ being rootless and not requiring any daemon to be running.") (url "https://github.com/containers/buildah") (commit (string-append "v" version)))) (sha256 - (base32 "109xvnx65gbajxipq2h0669bzzxyc6hfmdcijgngijxj5kwx5cgq")) + (base32 "12vl3g5h9m9pw0zpi88j7sjx0db8ardigh2x8h3a3qa9m5hlnqnb")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 4c75400dea..3832b67aec 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -338,6 +338,8 @@ Segmentation and Registration Toolkit.") (base32 "1nm6d87j11jc5617qk58a81ajxgrncr7xsf4dkyscrygi2n3dbgz")))) (build-system cmake-build-system) + (arguments + (list #:tests? #f)) (home-page "https://github.com/Martchus/cpp-utilities/") (synopsis "Useful C++ classes and routines") (description @@ -832,8 +834,7 @@ of XDG base directories, such as XDG_CONFIG_HOME.") (build-system cmake-build-system) (arguments (list - #:configure-flags #~(list "-DBUILD_TESTS=ON") - #:test-target "xtest")) + #:configure-flags #~(list "-DBUILD_TESTS=ON"))) (native-inputs (list doctest googletest)) @@ -848,32 +849,30 @@ mathematical functions operating on batches.") (license license:bsd-3))) (define-public icecream-cpp - ;; Last release was in 2020. - (let ((commit "95c8b91c2214be76a2847cd4ab37dccd9250ed77") - (revision "0")) - (package - (name "icecream-cpp") - (version (git-version "0.3.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/renatoGarcia/icecream-cpp") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0zw4aj5xs13grf7qj6f33dq7md9hn5i9mf6kz66b5jsx2fly6xxs")))) - (build-system cmake-build-system) - (arguments - (list #:configure-flags #~(list "-DBUILD_TESTING=ON"))) - (native-inputs (list boost catch2)) - (home-page "https://github.com/renatoGarcia/icecream-cpp") - (synopsis "C++ library for @code{printf} debugging") - (description - "IceCream-Cpp is a C++ library for @code{printf} debugging. It is + (package + (name "icecream-cpp") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/renatoGarcia/icecream-cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pl3qibxa9m7qkfpxszablwyhlnn9qz0cgms8kr2wwvxdzipr1p0")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DCMAKE_CXX_STANDARD=17"))) + (native-inputs (list boost catch2)) + (home-page "https://github.com/renatoGarcia/icecream-cpp") + (synopsis "C++ library for @code{printf} debugging") + (description + "IceCream-Cpp is a C++ library for @code{printf} debugging. It is inspired by the @url{https://github.com/gruns/icecream, Python library} of the same name.") - (license license:expat)))) + (license license:expat))) (define-public google-highway (package @@ -927,7 +926,6 @@ library for SIMD (Single Instruction, Multiple Data) with runtime dispatch.") "0q7bpywn8ljsj3dymvv19cm7n0r51vg5hj1jsapdl5bwpwf7bf41")))) (build-system cmake-build-system) (native-inputs (list gcc-15 pkg-config)) - (arguments (list #:cmake cmake-next)) (inputs (list cairo hyprutils libjpeg-turbo @@ -1370,6 +1368,7 @@ a cooperatively interruptible thread that is joined upon destruction.") (sha256 (base32 "090i2qg88iknldxd6v2mh3jfvkdkwc5m38czhrbm58r3y835fy0y")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (home-page "https://github.com/ToruNiina/toml11") (synopsis "TOML for modern C++") (description @@ -1443,8 +1442,7 @@ for C++17.") (build-system cmake-build-system) (arguments (list - #:configure-flags #~(list "-DBUILD_TESTS=ON") - #:test-target "xtest")) + #:configure-flags #~(list "-DBUILD_TESTS=ON"))) (native-inputs (list doctest googletest @@ -1646,7 +1644,8 @@ tools: (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:parallel-tests? #f + #:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DHTTPLIB_TEST=ON" "-DHTTPLIB_COMPILE=ON" @@ -1965,7 +1964,8 @@ hierarchies and multiple types of execution resources.") (base32 "05g4dp1359rsx0y2wrg2yv4zx3aq5anxr8jgb2c5f1ay3nq3639s")))) (build-system cmake-build-system) (arguments - (list #:configure-flags + (list #:tests? #f + #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"))) (inputs (list kokkos @@ -2593,10 +2593,17 @@ provides a number of utilities to make coding with expected cleaner.") (sha256 (base32 "032rb84ahvdnc1m6sj4lflrwnk4p1f2jsq1pv03xbgizp2lr2pkx")))) (build-system cmake-build-system) - (arguments (list #:test-target "check" - ;; -Werror appears to report false positives. - ;; See <https://github.com/arximboldi/immer/issues/223>. - #:configure-flags #~(list "-DDISABLE_WERROR=ON"))) + (arguments + (list + ;; -Werror appears to report false positives. + ;; See <https://github.com/arximboldi/immer/issues/223>. + #:configure-flags #~'("-DDISABLE_WERROR=ON") + #:modules `((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check (assoc-ref gnu:%standard-phases 'check))))) (inputs (list boost libgc c-rrb)) (native-inputs (list catch2-3 doctest fmt pkg-config)) (home-page "https://sinusoid.es/immer") @@ -2621,7 +2628,14 @@ written in C++.") (modules '((guix build utils))) (snippet #~(delete-file-recursively "tools")))) (build-system cmake-build-system) - (arguments (list #:test-target "check")) + (arguments + (list + #:modules `((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check (assoc-ref gnu:%standard-phases 'check))))) (native-inputs (list boost catch2)) (home-page "https://sinusoid.es/zug") (synopsis "Higher-order sequence transformers") @@ -2642,13 +2656,16 @@ composable sequential transformations.") (sha256 (base32 "1by9d49qnkncifyjcq16zy605d7v4ps6hvc01q5nsp1nbswm94m4")))) (build-system cmake-build-system) - (arguments (list #:test-target "check" - #:configure-flags #~(list "-Dlager_BUILD_EXAMPLES=no") + (arguments (list #:configure-flags #~(list "-Dlager_BUILD_EXAMPLES=no") + #:modules `((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'delete-failing-tests (lambda _ - (delete-file-recursively "test/event_loop")))))) + (delete-file-recursively "test/event_loop"))) + (replace 'check (assoc-ref gnu:%standard-phases 'check))))) (inputs (list boost immer zug)) (native-inputs (list catch2 cereal)) (home-page "https://sinusoid.es/lager") @@ -3228,95 +3245,87 @@ validation.") "038i9nmk85vpxvs546w6cyci0ppdrrp5wnlv1kffxw29x71a3g5l")))))) (define-public bloomberg-bde-tools - (let ((commit "23217675939d434537ef74b91f71b63054e36572")) - (package - (name "bloomberg-bde-tools") - ;; Recent releases are not tagged so commit must be used for checkout. - (version "4.13.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bloomberg/bde-tools") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1x440fa8fghigipn6w8zdr60kkvxrkxs2n9a5hf3y33b8aygh8iv")) - (patches - (search-patches - "bloomberg-bde-tools-fix-install-path.patch")))) - (build-system copy-build-system) - ;; Unable to be an inline dependency of bloomberg-bde due to patch. - (properties '((hidden? . #t))) - (synopsis "Tools for developing and building libraries modeled on BDE") - (description - "This package provides the cmake imports needed to build bloomberg-bde.") - (home-page "https://github.com/bloomberg/bde-tools") - (license license:asl2.0)))) + (package + (name "bloomberg-bde-tools") + (version "4.27.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bloomberg/bde-tools") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zkf6vdvzp73h6bai6kmd062k0wyqwrrdv2z9m416kgxr6qickl2")) + (patches + (search-patches + "bloomberg-bde-tools-fix-install-path.patch")))) + (build-system copy-build-system) + ;; Unable to be an inline dependency of bloomberg-bde due to patch. + (properties '((hidden? . #t))) + (synopsis "Tools for developing and building libraries modeled on BDE") + (description + "This package provides the cmake imports needed to build bloomberg-bde.") + (home-page "https://github.com/bloomberg/bde-tools") + (license license:asl2.0))) (define-public bloomberg-bde - (let ((commit "445a8ac4223b90ee0a46749b87ffbbd21788e132")) (package - (name "bloomberg-bde") - ;; Recent releases are not tagged so commit must be used for checkout. - (version "4.14.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bloomberg/bde") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hf09d4fcn77s1vv6qrh0sa0rv9wijpk55km6p3zi2ymkb2cha3c")) - (patches - (search-patches - "bloomberg-bde-cmake-module-path.patch")) - ;;(modules '((guix build utils))) - (snippet - `(begin - ;; FIXME: Delete bundled software. The third-party packages - ;; may be patched or modified from upstream sources. - ;;(for-each delete-file-recursively - ;; (list "thirdparty")) - ;; Delete failing tests. - (for-each - delete-file - (list "groups/bal/balcl/balcl_commandline.t.cpp" - "groups/bal/balst/balst_resolver_filehelper.t.cpp" - "groups/bal/balst/balst_stacktraceprintutil.t.cpp" - "groups/bal/balst/balst_stacktraceutil.t.cpp" - "groups/bsl/bslh/bslh_hash.t.cpp" - "groups/bsl/bsls/bsls_timeutil.t.cpp")) - #t)))) - (build-system cmake-build-system) - (arguments - `(#:parallel-tests? #f ; Test parallelism may fail inconsistently. - ;; Set UFID to build shared libraries. Flag descriptions can be found at - ;; https://bloomberg.github.io/bde-tools/bbs/reference/bbs_build_configuration.html#ufid - #:configure-flags '("-DUFID=opt_dbg_exc_mt_64_shr_cpp20") - #:phases - (modify-phases %standard-phases - ;; Explicitly build tests separate from the main build. - (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "all.t" - `(,@(if #:parallel-build? - `("-j" ,(number->string (parallel-job-count))) - '()) - ,@make-flags))))))) - (native-inputs - (list bloomberg-bde-tools pkg-config python)) - (synopsis "Foundational C++ libraries used at Bloomberg") - (description - "The BDE Development Environment libraries provide an enhanced + (name "bloomberg-bde") + (version "4.27.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bloomberg/bde") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17315r9j20pvv4ccnd59m85miq96hp07pysfr64glb7r4f4zjkfs")) + ;;(modules '((guix build utils))) + (snippet + `(begin + ;; FIXME: Delete bundled software. The third-party packages + ;; may be patched or modified from upstream sources. + ;;(for-each delete-file-recursively + ;; (list "thirdparty")) + )))) + (build-system cmake-build-system) + (arguments + (list + ;; Set UFID to build shared libraries. Flag descriptions can be found at + ;; https://bloomberg.github.io/bde-tools/bbs/reference/bbs_build_configuration.html#ufid + #:configure-flags #~(list "-DUFID=opt_dbg_exc_mt_64_shr_cpp20") + #:test-exclude (string-join (list "balcl_commandline.t" + "balst_stacktraceprintutil.t" + "bslalg_numericformatterutil.t" + "bslh_hash.t" + "bslstl_deque.0[1345].t" + "bslstl_queue.t" + "bslstl_stack.t") + "|") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + ;; Explicitly build tests after the main build. + (add-after 'build 'build-tests + (lambda* (#:key make-flags #:allow-other-keys #:rest args) + (apply (assoc-ref gnu:%standard-phases 'build) + (list #:make-flags (list "all.t")))))))) + (native-inputs + (list bloomberg-bde-tools pkg-config python)) + (synopsis "Foundational C++ libraries used at Bloomberg") + (description + "The BDE Development Environment libraries provide an enhanced implementation of STL containers, vocabulary types for representing common concepts (like dates and times), and building blocks for developing multi-threaded applications and network applications.") - (home-page "https://github.com/bloomberg/bde") - ;; Out-of-memory on i686-linux, compile errors with non-x86. - (supported-systems '("x86_64-linux")) - (license license:asl2.0)))) + (home-page "https://github.com/bloomberg/bde") + ;; Out-of-memory on i686-linux, compile errors with non-x86. + (supported-systems '("x86_64-linux")) + (license license:asl2.0))) (define-public gulrak-filesystem (package @@ -4031,7 +4040,8 @@ based on the implementation of std::variant in libc++.") (base32 "15l0jy3v4p6rgg9dk8zr80lqp51s32ii62cm4s90400ragdgh10v")))) (build-system cmake-build-system) (arguments - '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + '(#:tests? #f + #:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) (native-inputs (list pkg-config)) (inputs (list gtk+)) (home-page "https://github.com/btzy/nativefiledialog-extended") diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a2031ad0c9..2bfa37ea90 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -217,6 +217,7 @@ (base32 "1dg3g66az17z4snxxw7cslqdkrvbx2nnyry73yi77yp0vpri1lz8")))) (arguments (list + #:tests? #f #:configure-flags #~(list "-DBUILD_EXTENSIONS=autocomplete;icu;json;parquet;tpch;" ;; There is no git checkout from which to read the version tag. @@ -1568,11 +1569,12 @@ pictures, sounds, or video.") (list #:imported-modules `((guix build union) ,@%cmake-build-system-modules) #:modules `(,@%cmake-build-system-modules + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils) (guix build union) (ice-9 match)) #:configure-flags #~(list "-DAPACHE_ONLY=ON" "-DSEND_TELEMETRY_DEFAULT=OFF") - #:test-target "regresschecklocal" #:phases #~(modify-phases (@ (guix build cmake-build-system) %standard-phases) (add-after 'unpack 'patch-install-location @@ -1641,7 +1643,9 @@ pictures, sounds, or video.") (("histogram_test\\.sql\\.in") "#histogram_test.sql.in"))))))) (add-after 'prepare-tests 'check - (assoc-ref %standard-phases 'check))))) + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "regresschecklocal" args)))))) (inputs (list openssl postgresql)) (home-page "https://www.timescale.com/") (synopsis "Time-series extension for PostgreSQL") @@ -5181,7 +5185,6 @@ with integrated support for finding required rows quickly.") (build-system cmake-build-system) (arguments (list - #:cmake cmake ;needs 3.25+ #:tests? #f #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 485cd03b7d..2f64467bf1 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -325,7 +325,8 @@ to the structure and choosing one or more fields to act as the key.") "0m542xpys54bni29zibgrfpgpd0zgyny4h131virxsanixsbz52z"))))))) (build-system cmake-build-system) (arguments - `(#:phases + `(#:tests? #f + #:phases (modify-phases %standard-phases (add-after 'install 'install-static-library (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 49584fc60e..a452c849fc 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1809,11 +1809,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/documentation.scm b/gnu/packages/documentation.scm index dc01277976..0eebedd503 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -216,7 +216,6 @@ markup) can be customized and extended by the user.") (assoc-ref %build-inputs "cross-libc") "/include")) #~'()) - #:test-target "tests" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-bibtex-test 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 c27ca88c73..33855baef4 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -240,8 +240,7 @@ of categories with some of the activities available in that category. (setenv "DISPLAY" ":1") ;; The test suite wants to write to /homeless-shelter (setenv "HOME" (getcwd))))) - #:configure-flags #~(list "-DQML_BOX2D_MODULE=disabled" - "-DBUILD_TESTING=TRUE"))) + #:configure-flags #~(list "-DQML_BOX2D_MODULE=disabled"))) (native-inputs (list extra-cmake-modules gettext-minimal @@ -514,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 @@ -542,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")) @@ -692,6 +695,7 @@ language and very flexible regarding to new or unknown keyboard layouts.") (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list qtdeclarative-5)) + (arguments (list #:tests? #f)) (home-page "https://invent.kde.org/libraries/kqtquickcharts") (synopsis "QtQuick plugin to render beautiful and interactive charts") (description @@ -736,6 +740,7 @@ charts.") qtquickcontrols2-5 qtx11extras qtxmlpatterns-5)) + (arguments (list #:tests? #f)) (home-page "https://edu.kde.org/ktouch/") (synopsis "Touch typing tutor") (description diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 9ee51a0918..096c8b22a4 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Daniel Maksymow <daniel.maksymow@tuta.io> ;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -304,6 +305,18 @@ static analysis of the ELF binaries at hand.") (description "Libelf is a C library to access ELF object files.") (license lgpl2.0+))) + +;; This is a shared library version of libelf, currently only needed for ROCm +;; packages in (gnu packages rocm). +(define-public libelf-shared + (package + (inherit libelf) + (arguments + (substitute-keyword-arguments (package-arguments libelf) + ((#:make-flags flags #~'()) + #~(append #$flags '("CFLAGS=-fPIC"))))) + (properties `((hidden? . #t) ,@(package-properties libelf))))) + (define-public patchelf (package (name "patchelf") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 514692336f..222d065db3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -691,6 +691,32 @@ just one-off queries and multiple independent sessions. It requires an OpenAI API key.") (license license:gpl3+))) +(define-public emacs-gptel-prompts + ;; No releases. + (let ((commit "deca98e1aff1b0570cd1672addfb6dcc74402332") + (revision "0")) + (package + (name "emacs-gptel-prompts") + (version (git-version "1.0" revision commit)) + (source + (origin + (uri (git-reference + (url "https://github.com/jwiegley/gptel-prompts/") + (commit commit))) + (method git-fetch) + (sha256 + (base32 "0wh2ydiy1k6j0hdw7n7qyzx6c2g4mcpd3gp79h1ay1hh0f85596b")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (arguments (list #:tests? #f)) ;no tests + (propagated-inputs (list emacs-gptel)) + (home-page "https://github.com/jwiegley/gptel-prompts/") + (synopsis "Alternative Gptel directives management") + (description + "This package offers an advanced way to manage Gptel directives, using +files rather than customizing the variable directly.") + (license license:gpl2+)))) + (define-public emacs-gptel-quick (let ((commit "d7a3aedefdc656a136d5664f2dac165a1f6ebf0e") (revision "1")) @@ -11344,6 +11370,7 @@ described on the homepage.") (name "emacs-irony-mode-server") (arguments (list + #:tests? #f #:phases #~(modify-phases %standard-phases (replace 'configure @@ -25924,16 +25951,16 @@ highlighting and indentation support.") (define-public emacs-terraform-mode (package (name "emacs-terraform-mode") - (version "1.0.1") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/emacs-terraform-mode") + (url "https://github.com/hcl-emacs/terraform-mode") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "10wndnlsv7f2yn83n1wamnhiwyhxkdlmwld9yk0m2kkxx4pwfgfj")))) + (base32 "15xgjyl864crx3vpalds68x0vn1qzibkqdcjlbp87xiq88dx2q1x")))) (build-system emacs-build-system) (arguments (list #:test-command #~(list "emacs" "--batch" @@ -25944,7 +25971,7 @@ highlighting and indentation support.") "-f" "ert-run-tests-batch-and-exit"))) (propagated-inputs (list emacs-dash emacs-hcl-mode)) - (home-page "https://github.com/syohex/emacs-terraform-mode") + (home-page "https://github.com/hcl-emacs/terraform-mode") (synopsis "Major mode for Terraform") (description "@code{emacs-terraform-mode} provides a major mode for working with diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 9f64863e9b..130b2e0877 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -147,7 +147,6 @@ (build-system cmake-build-system) (arguments (list #:tests? #f ; No tests - #:cmake cmake-next ; Requires cmake >= 3.28 #:configure-flags #~(list "-DARES_BUILD_LOCAL=FALSE" "-DARES_BUILD_OFFICIAL=TRUE" @@ -491,6 +490,9 @@ It aims to support Nintendo DSi and 3DS as well.") (build-system cmake-build-system) (arguments (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-before 'configure 'generate-fonts&hardcode-libvulkan-path @@ -512,6 +514,10 @@ It aims to support Nintendo DSi and 3DS as well.") (("\"vulkan\", 1") (string-append "\"vulkan\"")) (("\"vulkan\"") (string-append "\"" libvulkan "\"")) (("Common::DynamicLibrary::GetVersionedFilename") ""))))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "unittests" args))) (add-before 'install 'build-codeloader.bin (lambda _ (with-directory-excursion "../source/docs" @@ -537,8 +543,7 @@ It aims to support Nintendo DSi and 3DS as well.") (rename-file "dsp_coef.bin" "Data/Sys/GC/dsp_coef.bin"))))) #:configure-flags #~(list "-DUSE_DISCORD_PRESENCE=OFF" ;avoid bundled discord-rpc lib - "-DDSPTOOL=ON") - #:test-target "unittests")) + "-DDSPTOOL=ON"))) (native-inputs (list (cross-gcc "powerpc-linux-gnu") gettext-minimal @@ -868,39 +873,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") @@ -4130,7 +4140,7 @@ graphic filters. Some of its features include: (("include\\(cmake/") "include("))))) (build-system pyproject-build-system) - (native-inputs (list cmake pkg-config python-setuptools python-wheel)) + (native-inputs (list cmake-minimal pkg-config python-setuptools python-wheel)) (home-page "https://www.unicorn-engine.org") (synopsis "Generic CPU emulator framework") (description @@ -4579,7 +4589,7 @@ stack-machine, written in ANSI C. Graphical output is implemented using SDL2.") (base32 "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig")))) (build-system pyproject-build-system) (native-inputs - (list cmake + (list cmake-minimal python-setuptools python-wheel)) (home-page "https://www.keystone-engine.org") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fb7f0f7d06..77383428b5 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -311,21 +311,25 @@ their devices.") (build-system qt-build-system) (arguments (list - #:test-target "check" + #: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 "BOOST_DIR=" #$(this-package-input "boost"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append #$output "/bin")) - (share (string-append #$output "/share/librecad"))) - (mkdir-p bin) - (install-file "unix/librecad" bin) - (mkdir-p share) - (copy-recursively "unix/resources" share))))))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'check (assoc-ref gnu:%standard-phases 'check)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append #$output "/bin")) + (share (string-append #$output "/share/librecad"))) + (mkdir-p bin) + (install-file "unix/librecad" bin) + (mkdir-p share) + (copy-recursively "unix/resources" share))))))) (inputs (list bash-minimal boost muparser freetype qtbase-5 qtsvg-5)) (native-inputs @@ -451,11 +455,14 @@ utilities.") ;; and then in .gmo files. To avoid that, simply make sure 'msgmerge' ;; never runs. See <https://bugs.debian.org/792687>. "ac_cv_path_MSGMERGE=true" - ;; FIXME: pcb package is broken at this point; it might be replaced - ;; by pcb-rnd or use pcb again when fixed. - ;; (string-append "--with-pcb-datadir=" pcb "/share") - ;; (string-append "--with-pcb-lib-path=" pcb - ;; "/share/pcb/pcblib-newlib:" pcb "/share/pcb/newlib") + (string-append "--with-pcb-datadir=" + #$(this-package-input "pcb") + "/share") + (string-append "--with-pcb-lib-path=" + #$(this-package-input "pcb") + "/share/pcb/pcblib-newlib:" + #$(this-package-input "pcb") + "/share/pcb/newlib") "--with-gtk3" "CFLAGS=-fcommon" "--enable-guild" @@ -558,6 +565,7 @@ utilities.") gtksheet guile-3.0 guile-readline + pcb shared-mime-info)) (home-page "https://lepton-eda.github.io/") (synopsis "GPL Electronic Design Automation") @@ -587,6 +595,13 @@ features.") (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'convert-encoding + (lambda _ + (for-each + (lambda (name) + (invoke "iconv" "-f" "LATIN1" "-t" "UTF-8" name "-o" name)) + '("src/pcb-menu.res.in" + "src/pcb-menu.res.h")))) (add-before 'check 'pre-check (lambda _ (system "Xvfb :1 &") @@ -895,6 +910,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 @@ -902,7 +920,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 @@ -1144,12 +1164,12 @@ fonts to gEDA.") (build-system cmake-build-system) (arguments (list + #:tests? #f ; Several tests fail due to floating point error. #:imported-modules `((guix build guile-build-system) ,@%cmake-build-system-modules) #:modules '((guix build cmake-build-system) ((guix build guile-build-system) #:prefix guile:) (guix build utils)) - #:test-target "libfive-test" #:configure-flags #~(list (string-append "-DPYTHON_SITE_PACKAGES_DIR=" @@ -1409,10 +1429,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_FORMATS=html") - #:tests? #f ;no test suite - #:phases - (modify-phases %standard-phases - (delete 'build)))) + #:tests? #f)) ;no test suite (native-inputs (list asciidoc gettext-minimal git-minimal @@ -3031,8 +3048,9 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") (build-system cmake-build-system) (inputs (list tbb clipper2 assimp python-nanobind googletest)) (arguments - ;; can be removed once emscripten is packaged - `(#:configure-flags '("-DMANIFOLD_JSBIND=OFF"))) + (list #:tests? #f + ;; can be removed once emscripten is packaged + #:configure-flags #~(list "-DMANIFOLD_JSBIND=OFF"))) (synopsis "Geometry library for topological robustness") (description "Manifold is a geometry library dedicated to creating and operating on @@ -3427,6 +3445,72 @@ models in the STL and OFF file formats.") (home-page "https://openscad.org/") (license license:gpl2+)))) +(define-public pythonscad + (let ((commit "e2641ca1a208a9a54a034a8818a9774ad4d5867c") + (version "0.0.0") + (revision "0")) + (package + (inherit openscad) + (name "pythonscad") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pythonscad/pythonscad") + (commit commit) + ;; Needed for libraries/MCAD, a library specific to OpenSCAD + ;; which is included as a submodule. All other libraries are + ;; deleted in the patch-source build phase. + (recursive? #t))) + (sha256 + (base32 "1i6yajamdrha2kpgyhn7jn6dv35qmgq0zsqv8cdzdqg5142v66ay")) + (modules '((guix build utils))) + (snippet #~(begin + ;; Delete all unbundled libraries to replace them with + ;; guix packages. + (delete-file-recursively "submodules") + (substitute* "CMakeLists.txt" + ;; Remove bundled libraries from cmake. + (("add_subdirectory\\(submodules\\)") + "")))) + (file-name (git-file-name name version)))) + (arguments + (substitute-keyword-arguments (package-arguments openscad) + ((#:configure-flags flags + '()) + #~(append #$flags + (list "-DENABLE_LIBFIVE=ON" "-DUSE_BUILTIN_LIBFIVE=OFF" + (string-append "-DPYTHON_VERSION=" + #$(version-major+minor + (package-version python)))))) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + ;; Fix detection of EGL (see + ;; https://github.com/openscad/openscad/issues/5880). + (("target_link_libraries\\(OpenSCAD PRIVATE OpenGL::EGL\\)") + "find_package(ECM REQUIRED NO_MODULE) + list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + find_package(EGL REQUIRED) + target_link_libraries(OpenSCAD PRIVATE EGL::EGL)") + ;; Use the system sanitizers-cmake module. + (("\\$\\{CMAKE_SOURCE_DIR\\}/submodules/sanitizers-cmake/cmake") + (string-append (assoc-ref inputs "sanitizers-cmake") + "/share/sanitizers-cmake/cmake"))))))))) + (inputs (modify-inputs (package-inputs openscad) + (append curl libfive))) + (synopsis "Script-based 3D modeling app whith Python support") + (description + "PythonSCAD is a programmatic 3D modeling application. It allows you +to turn simple code into 3D models suitable for 3D printing. It is a fork of +OpenSCAD which not only adds support for using Python as a native language, +but also adds new features and improves existing ones.") + (home-page "https://pythonscad.org/") + (license license:gpl2+)))) + (define-public emacs-scad-mode (package (name "emacs-scad-mode") @@ -3649,7 +3733,8 @@ extension and customization.") (build-system cmake-build-system) (inputs (list hdf5-1.10)) (arguments - `(#:phases + `(#:parallel-tests? #f + #:phases (modify-phases %standard-phases (add-after 'install 'remove-test-output (lambda* (#:key outputs #:allow-other-keys) @@ -4104,6 +4189,7 @@ calibration of the milling depth.") (arguments (list #:build-type "Release" + #:tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'unpack-libdxfrw (lambda _ @@ -5578,13 +5664,7 @@ towards field theory.") (commit commit))) (sha256 (base32 "1c7vimy065908qs5nwhnrk9pp0wh8pjgdvz2hwb12a9wcsj50kf0")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - ;; make tests deterministic by seeding the random number generator - (snippet '(substitute* '("orocos_kdl/tests/treeinvdyntest.cpp" - "orocos_kdl/tests/solvertest.cpp") - (("srand\\( \\(unsigned\\)time\\( NULL \\)\\)") - "srand(0u)"))))) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs (list cppunit)) (propagated-inputs (list eigen)) @@ -5592,10 +5672,20 @@ towards field theory.") (list #:configure-flags #~(list "-DENABLE_TESTS=ON") - #:test-target "check" #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'chdir + (add-after 'unpack 'fix-tests + (lambda _ + ;; Make tests deterministic by seeding the random number generator. + (substitute* '("orocos_kdl/tests/treeinvdyntest.cpp" + "orocos_kdl/tests/solvertest.cpp") + (("srand\\( \\(unsigned\\)time\\( NULL \\)\\)") + "srand(0u)")) + ;; CTest requires tests to be enabled in the top-level directory. + (substitute* "orocos_kdl/CMakeLists.txt" + (("IF\\( ENABLE_TESTS \\)" _all) + (string-append _all "\n" "enable_testing()"))))) + (add-after 'fix-tests 'chdir (lambda _ (chdir "orocos_kdl")))))) (home-page "https://docs.orocos.org/kdl/overview.html") diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 7952f5cc4b..ac6c80a952 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -516,7 +516,9 @@ including input methods previous bundled inside Fcitx 4: (sha256 (base32 "1kg0hddds7raqf5y4qw2x02hb4i5impv4hjfm2qvcn3g775rzrq6")))) (build-system cmake-build-system) - (arguments (list #:configure-flags #~(list "-DUSE_QT6=ON"))) + (arguments + (list #:tests? #f + #:configure-flags #~(list "-DUSE_QT6=ON"))) (inputs (list fcitx5 fcitx5-qt diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 1bc64735b7..20c5356765 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1359,8 +1359,10 @@ agent.") (inputs (list libzip qtsvg qtwebengine qt5compat)) (arguments (list #:tests? #f ; tests do not even build with Qt6 anymore - #:test-target "check" #:qtbase qtbase ; use Qt6 + #:modules '((guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (replace 'configure @@ -1372,6 +1374,7 @@ agent.") (substitute* "kitsasproject.pro" ((" *(unittest|testit).*") "") (("\\\\") "")))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) (replace 'install (lambda* _ (install-file "kitsas/kitsas" diff --git a/gnu/packages/fluidplug.scm b/gnu/packages/fluidplug.scm new file mode 100644 index 0000000000..c731f295ba --- /dev/null +++ b/gnu/packages/fluidplug.scm @@ -0,0 +1,480 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2025 Giacomo Leidi <goodoldpaul@autistici.org> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu packages fluidplug) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (guix packages) + #:use-module (guix records) + #:use-module (guix utils) + #:use-module (gnu packages audio) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages pkg-config) + #:use-module (srfi srfi-1) + #:export (fluidplug-plugin + fluidplug-plugin? + fluidplug-plugin-name + fluidplug-plugin-path + fluidplug-plugin-hash + fluidplug-plugin-license + + fluidplug-lv2 + + fluidplug-plugin->package + fluidplug-airfont320-lv2 + fluidplug-avl-drumkits-perc-lv2 + fluidplug-black-pearl-4a-lv2 + fluidplug-black-pearl-4b-lv2 + fluidplug-black-pearl-5-lv2 + fluidplug-red-zeppelin-4-lv2 + fluidplug-red-zeppelin-5-lv2 + fluidplug-fluidgm-lv2 + fluidplug-fluidbass-lv2 + fluidplug-fluidbrass-lv2 + fluidplug-fluidchromperc-lv2 + fluidplug-fluiddrums-lv2 + fluidplug-fluidensemble-lv2 + fluidplug-fluidethnic-lv2 + fluidplug-fluidguitars-lv2 + fluidplug-fluidorgans-lv2 + fluidplug-fluidpercussion-lv2 + fluidplug-fluidpianos-lv2 + fluidplug-fluidpipes-lv2 + fluidplug-fluidreeds-lv2 + fluidplug-fluidsoundfx-lv2 + fluidplug-fluidstrings-lv2 + fluidplug-fluidsynthfx-lv2 + fluidplug-fluidsynthleads-lv2 + fluidplug-fluidsynthpads-lv2)) + +(define-record-type* <fluidplug-plugin> + fluidplug-plugin make-fluidplug-plugin + fluidplug-plugin? + (name fluidplug-plugin-name) ;string + (hash fluidplug-plugin-hash) ;string + (path fluidplug-plugin-path) ;string + (license fluidplug-plugin-license ;license + (default license:cc-by-sa4.0))) + +(define (fluidplug-plugin->package-name record) + (string-append "fluidplug-" + (string-downcase + (string-replace-substring + (fluidplug-plugin-name record) "_" "-")) + "-lv2")) + +(define (fluidplug-plugin->origin record) + (origin + (method url-fetch) + (uri + (string-append "https://download.linuxaudio.org/" + "musical-instrument-libraries/sf2/" + (fluidplug-plugin-path record))) + (sha256 + (base32 (fluidplug-plugin-hash record))))) + +(define (fluidplug-plugin->local-path record) + (string-append "./" (fluidplug-plugin-name record) ".lv2/" + (basename (fluidplug-plugin-path record)))) + +(define airfont320 + (fluidplug-plugin + (name "AirFont320") + (path "airfont_a340u.tar.7z") + (hash "1x4xzm4khq823i4p18ydbkjza2nv3hzwyxp7vf3gzqs374jdcqbw") + (license license:gpl2))) + +(define avl-drumkits-perc + (fluidplug-plugin + (name "AVL_Drumkits_Perc") + (path "AVL-Drumkits-1.1-SF2-splitted/AVL_Drumkits_Perc_1.1.tar.7z") + (hash "0l1zvzw9dg922wf9llcl9zlw5ybjmayg7yqacp253xcr2jz1hn7m") + (license license:cc-by-sa3.0))) + +(define black-pearl-4a + (fluidplug-plugin + (name "Black_Pearl_4A") + (path "AVL-Drumkits-1.1-SF2-splitted/Black_Pearl_4A-1.1.tar.7z") + (hash "0flzlg5m2r3df8dchydzg3xllcv7ignr7hx6qxzy51s6gzrlbzli") + (license license:cc-by-sa3.0))) + +(define black-pearl-4b + (fluidplug-plugin + (name "Black_Pearl_4B") + (path "AVL-Drumkits-1.1-SF2-splitted/Black_Pearl_4B-1.1.tar.7z") + (hash "1z5q8z4k81xnbcv0gpc2xgrzqm9fg4n2yly1kaw82q7sm29vi0z9") + (license license:cc-by-sa3.0))) + +(define black-pearl-5 + (fluidplug-plugin + (name "Black_Pearl_5") + (path "AVL-Drumkits-1.1-SF2-splitted/Black_Pearl_5-1.1.tar.7z") + (hash "0mg41wc912sfj2mydn86ychwk21l3ngbn7k3qsm6jgf1ipmsip9y") + (license license:cc-by-sa3.0))) + +(define red-zeppelin-4 + (fluidplug-plugin + (name "Red_Zeppelin_4") + (path "AVL-Drumkits-1.1-SF2-splitted/Red_Zeppelin_4-1.1.tar.7z") + (hash "0pcswg4hlyn8j6nghbwvxa71ibp6r0wxcbxjzxs4iim43vpxc659") + (license license:cc-by-sa3.0))) + +(define red-zeppelin-5 + (fluidplug-plugin + (name "Red_Zeppelin_5") + (path "AVL-Drumkits-1.1-SF2-splitted/Red_Zeppelin_5-1.1.tar.7z") + (hash "18hhmi1d1i7gr2rp4wn28pnfwl825rmhmjnvxvvcwdmis6nad4gm") + (license license:cc-by-sa3.0))) + +(define fluidgm + (fluidplug-plugin + (name "FluidGM") + (path "fluidr3.tar.7z") + (hash "00ka1b2pxn0g2g0hm7kdg5w785pfx8f9585238d183wjdkc3a8m6") + (license license:expat))) + +(define fluidbass + (fluidplug-plugin + (name "FluidBass") + (path "fluidr3-splitted/fluidr3gm_bass.sf2.tar.7z") + (hash "1zhixrxkwvmn6xkpy9f8zkrwxmaqwdcx0jz7zg8lc2amqkx9wqan"))) + +(define fluidbrass + (fluidplug-plugin + (name "FluidBrass") + (path "fluidr3-splitted/fluidr3gm_brass.sf2.tar.7z") + (hash "027l3q4q9011xzbzsrsp5nj3h05w9dj7d8b943xzck7q4sp9alkp"))) + +(define fluidchromperc + (fluidplug-plugin + (name "FluidChromPerc") + (path "fluidr3-splitted/fluidr3gm_chromaticpercussion.sf2.tar.7z") + (hash "1233fh36wlifrawh57v8vycxc0g4pbvy3qr9f596g9n7mm4h51f7"))) + +(define fluiddrums + (fluidplug-plugin + (name "FluidDrums") + (path "fluidr3-splitted/fluidr3gm_drums.sf2.tar.7z") + (hash "01pv3aj52pz8xy29acprwkb69jxhrn64kx7w29ch5bl091lccqgr"))) + +(define fluidensemble + (fluidplug-plugin + (name "FluidEnsemble") + (path "fluidr3-splitted/fluidr3gm_ensemble.sf2.tar.7z") + (hash "0rswcgzapcjmwddh2hgicym27hqz3p43r2s8j7hy1s40hzk3nbax"))) + +(define fluidethnic + (fluidplug-plugin + (name "FluidEthnic") + (path "fluidr3-splitted/fluidr3gm_ethnic.sf2.tar.7z") + (hash "0z1z37wn6lw1n919bkpfirachg5wwddi7f0g4l9vimazv34ds1b1"))) + +(define fluidguitars + (fluidplug-plugin + (name "FluidGuitars") + (path "fluidr3-splitted/fluidr3gm_guitar.sf2.tar.7z") + (hash "1d5jxx4sgbyh9sqmfksggcsri9hal7mw83a6h1vqb9xf59gnmx1i"))) + +(define fluidorgans + (fluidplug-plugin + (name "FluidOrgans") + (path "fluidr3-splitted/fluidr3gm_organ.sf2.tar.7z") + (hash "12zlq28cmr2hsgn1319hidzcm8yifx6vsqsqk544z3qkhc8cg4fr"))) + +(define fluidpercussion + (fluidplug-plugin + (name "FluidPercussion") + (path "fluidr3-splitted/fluidr3gm_percussive.sf2.tar.7z") + (hash "1gql0g1zk09n6r90mav47khdc406jhmg5iql6i2zjmg9l7yg65n3"))) + +(define fluidpianos + (fluidplug-plugin + (name "FluidPianos") + (path "fluidr3-splitted/fluidr3gm_piano.sf2.tar.7z") + (hash "06a817xvx7qj8plr1vhpanbdr97cbmzky0pp6xhff916s5k0jg2r"))) + +(define fluidpipes + (fluidplug-plugin + (name "FluidPipes") + (path "fluidr3-splitted/fluidr3gm_pipe.sf2.tar.7z") + (hash "09wzvsabcif27687g71g4m75zz08zpwpm2dzwh8a7xsfi5qdynf2"))) + +(define fluidreeds + (fluidplug-plugin + (name "FluidReeds") + (path "fluidr3-splitted/fluidr3gm_reed.sf2.tar.7z") + (hash "1yb0whi67wz7ag6hcfdns69m1ic3fq6firvbb893ilnx8h17yjak"))) + +(define fluidsoundfx + (fluidplug-plugin + (name "FluidSoundFX") + (path "fluidr3-splitted/fluidr3gm_soundeffects.sf2.tar.7z") + (hash "0sg8gca9735gy0pna63vgsfnabk54dl30n1lnhcf976n7y0npzfx"))) + +(define fluidstrings + (fluidplug-plugin + (name "FluidStrings") + (path "fluidr3-splitted/fluidr3gm_strings.sf2.tar.7z") + (hash "1nnxr62i3p3hhdpwlly62c4cvf7f3dzq818fmlnlxp25215h17bs"))) + +(define fluidsynthfx + (fluidplug-plugin + (name "FluidSynthFX") + (path "fluidr3-splitted/fluidr3gm_syntheffects.sf2.tar.7z") + (hash "0rlq58v9m6wjk45kxmza54y8fkj1b8y1zg00r80nwyqz6rylgjh4"))) + +(define fluidsynthleads + (fluidplug-plugin + (name "FluidSynthLeads") + (path "fluidr3-splitted/fluidr3gm_synthlead.sf2.tar.7z") + (hash "0axi5dyqf8zh1gn82qq0jpzr0cgbsjn4xm0yrlqld4k6h9ggj475"))) + +(define fluidsynthpads + (fluidplug-plugin + (name "FluidSynthPads") + (path "fluidr3-splitted/fluidr3gm_synthpad.sf2.tar.7z") + (hash "1q4pd6ymb08yc6rz68wlidjp5kp7pygc2aw45djw9wr8id6pnadi"))) + +(define fluidplug-plugins + (list airfont320 + avl-drumkits-perc + black-pearl-4a + black-pearl-4b + black-pearl-5 + red-zeppelin-4 + red-zeppelin-5 + fluidgm + fluidbass + fluidbrass + fluidchromperc + fluiddrums + fluidensemble + fluidethnic + fluidguitars + fluidorgans + fluidpercussion + fluidpianos + fluidpipes + fluidreeds + fluidsoundfx + fluidstrings + fluidsynthfx + fluidsynthleads + fluidsynthpads)) + +(define fluidplug-lv2 + (let ((version "0.0.5") + (revision "0") + ;; Latest commit from the default brach. + (commit "1cf494cb3a5b1f7f2a95f872768a1eef141c3e0a")) + (package + (name "fluidplug-lv2") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/falkTX/FluidPlug") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rqy4xzswkvmqa4mwyy5nz6r8w4bxjfg2rafbid4lb0izjnhma8q")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;there are no tests. + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + "PREFIX=") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'conditionally-enable-amd64-optimizations + (lambda _ + (let ((system #$(or (%current-target-system) + (%current-system)))) + (unless (string-prefix? "x86_64" system) + (substitute* "Makefile.mk" + (("-msse -msse2 -mfpmath=sse") "")))))) + (add-after 'conditionally-enable-amd64-optimizations + 'disable-plugin-download + (lambda _ + ;; SoundFonts can't be downloaded at build time + ;; in Guix, so it is disabled. + (substitute* "Makefile" + (("wget") "# wget")))) + (add-after 'disable-plugin-download 'unpack-plugins + (lambda _ + (use-modules (srfi srfi-1)) + (for-each + (lambda (p) + (define source (first p)) + (define target (second p)) + (symlink source target)) + '(#$@(map + (lambda (p) + (list (fluidplug-plugin->origin p) + (fluidplug-plugin->local-path p))) + fluidplug-plugins))))) + (delete 'configure)))) + (native-inputs + (list gnu-make p7zip pkg-config)) + (inputs (list fluidsynth lv2)) + (native-search-paths + (list (search-path-specification + (variable "LV2_PATH") + (files '("lib/lv2"))))) + (synopsis + "SoundFonts as LV2 plugins via FluidSynth") + (description + "@code{FluidPlug} provides SoundFonts as LV2 plugins via FluidSynth.") + (home-page "https://github.com/falkTX/FluidPlug") + (license + (delete-duplicates + (map fluidplug-plugin-license fluidplug-plugins)))))) + +(define (fluidplug-plugin->package record) + (package + (inherit fluidplug-lv2) + (name (fluidplug-plugin->package-name record)) + (arguments + (substitute-keyword-arguments (package-arguments fluidplug-lv2) + ((#:make-flags make-flags) + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + "PREFIX=")) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'unpack-plugins + (lambda _ + (symlink #$(fluidplug-plugin->origin record) + #$(fluidplug-plugin->local-path record)))) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke `("make" ,@make-flags + #$(fluidplug-plugin-name record))))) + (replace 'install + (lambda _ + (let* ((plugin-directory + (string-append #$(fluidplug-plugin-name record) + ".lv2")) + (lib (string-append #$output "/lib/lv2")) + (share/doc (string-append #$output "/share/doc")) + (plugin-lib (string-append lib "/" plugin-directory))) + + ;; Install plugin + (for-each + (lambda (f) + (install-file f plugin-lib)) + (find-files plugin-directory + "^.*\\.(sf2|so|ttl)$")) + + ;; Install license + (for-each + (lambda (f) + (install-file f share/doc)) + (find-files plugin-directory "(README|License\\.pdf)")) + + ;; Install UI + (copy-recursively (string-append plugin-directory "/modgui") + (string-append plugin-lib "/modgui"))))))))) + (description + (string-append (package-description fluidplug-lv2) " + +This package provides the @code{" (fluidplug-plugin-name record) + "} LV2 plugin.")) + (license (fluidplug-plugin-license record)))) + +(define fluidplug-airfont320-lv2 + (fluidplug-plugin->package airfont320)) + +(define fluidplug-avl-drumkits-perc-lv2 + (fluidplug-plugin->package avl-drumkits-perc)) + +(define fluidplug-black-pearl-4a-lv2 + (fluidplug-plugin->package black-pearl-4a)) + +(define fluidplug-black-pearl-4b-lv2 + (fluidplug-plugin->package black-pearl-4b)) + +(define fluidplug-black-pearl-5-lv2 + (fluidplug-plugin->package black-pearl-5)) + +(define fluidplug-red-zeppelin-4-lv2 + (fluidplug-plugin->package red-zeppelin-4)) + +(define fluidplug-red-zeppelin-5-lv2 + (fluidplug-plugin->package red-zeppelin-5)) + +(define fluidplug-fluidgm-lv2 + (fluidplug-plugin->package fluidgm)) + +(define fluidplug-fluidbass-lv2 + (fluidplug-plugin->package fluidbass)) + +(define fluidplug-fluidbrass-lv2 + (fluidplug-plugin->package fluidbrass)) + +(define fluidplug-fluidchromperc-lv2 + (fluidplug-plugin->package fluidchromperc)) + +(define fluidplug-fluiddrums-lv2 + (fluidplug-plugin->package fluiddrums)) + +(define fluidplug-fluidensemble-lv2 + (fluidplug-plugin->package fluidensemble)) + +(define fluidplug-fluidethnic-lv2 + (fluidplug-plugin->package fluidethnic)) + +(define fluidplug-fluidguitars-lv2 + (fluidplug-plugin->package fluidguitars)) + +(define fluidplug-fluidorgans-lv2 + (fluidplug-plugin->package fluidorgans)) + +(define fluidplug-fluidpercussion-lv2 + (fluidplug-plugin->package fluidpercussion)) + +(define fluidplug-fluidpianos-lv2 + (fluidplug-plugin->package fluidpianos)) + +(define fluidplug-fluidpipes-lv2 + (fluidplug-plugin->package fluidpipes)) + +(define fluidplug-fluidreeds-lv2 + (fluidplug-plugin->package fluidreeds)) + +(define fluidplug-fluidsoundfx-lv2 + (fluidplug-plugin->package fluidsoundfx)) + +(define fluidplug-fluidstrings-lv2 + (fluidplug-plugin->package fluidstrings)) + +(define fluidplug-fluidsynthfx-lv2 + (fluidplug-plugin->package fluidsynthfx)) + +(define fluidplug-fluidsynthleads-lv2 + (fluidplug-plugin->package fluidsynthleads)) + +(define fluidplug-fluidsynthpads-lv2 + (fluidplug-plugin->package fluidsynthpads)) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 9b0dfa9479..294a2f2c38 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1536,22 +1536,7 @@ translated keywords and acts.") (list freetype)) (arguments (if (system-hurd?) - (list - #:phases - #~(modify-phases %standard-phases - (replace 'check - ;; cmake-build-system ignores #:make-flags for make check - (lambda* (#:key test-target tests? parallel-tests? - #:allow-other-keys) - (if tests? - (let ((jobs (if parallel-tests? - (number->string (parallel-job-count)) - "1"))) - (invoke "make" - (string-append - "ARGS=-j " jobs " --exclude-regex ^awamicmp3$") - test-target)) - (format #t "test suite not run~%")))))) + (list #:test-exclude "awamicmp3") '())) (synopsis "Reimplementation of the SIL Graphite text processing engine") (description @@ -1731,69 +1716,54 @@ definitions.") python zlib)) (arguments - (list - #:configure-flags #~`(;; TODO: Provide GTK+ for the Wayland-friendly GDK - ;; backend, instead of the legacy X11 backend. - ;; Currently it introduces a circular dependency. - "-DENABLE_X11=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'do-not-override-RPATH - (lambda _ - ;; Do not attempt to set a default RPATH, as our ld-wrapper - ;; already does the right thing. - (substitute* "CMakeLists.txt" - (("^set_default_rpath\\(\\)") - "")))) - (add-after 'unpack 'do-not-use-msgfmt--check - (lambda _ - ;; msgfmt --check from gettext-0.23 fails on fr.po: - ;; 'msgstr' is not a valid C format string - (substitute* "po/CMakeLists.txt" - ((" --check") "")))) - #$@(if (target-hurd?) - #~((add-after 'unpack 'apply-hurd-patch - (lambda _ - (let ((patch-file - #$(local-file - (search-patch "fontforge-hurd.patch")))) - (invoke "patch" "--force" "-p1" "-i" patch-file))))) - #~()) - #$@(if (system-hurd?) - #~((replace 'check - ;; cmake-build-system ignores #:make-flags for make check - (lambda* (#:key test-target tests? parallel-tests? - #:allow-other-keys) - (let ((skip '("test0001_py" "test0001_pyhook"))) - (if tests? - (let ((jobs - (if parallel-tests? - (number->string (parallel-job-count)) - "1"))) - (invoke "make" - (string-append "ARGS=-j " jobs - " --exclude-regex ^" - (string-join skip "\\|") - "$") - test-target)) - (format #t "test suite not run~%")))))) - #~()) - (add-after 'install 'set-library-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (potrace (dirname - (search-input-file inputs "bin/potrace")))) - (wrap-program (string-append out "/bin/fontforge") - ;; Fontforge dynamically opens libraries. - `("LD_LIBRARY_PATH" ":" prefix - ,(map (lambda (input) - (string-append (assoc-ref inputs input) - "/lib")) - '("libtiff" "libjpeg-turbo" "libpng" "libungif" - "libxml2" "zlib" "libspiro" "freetype" - "pango" "cairo" "fontconfig-minimal"))) - ;; Checks for potrace program at runtime - `("PATH" ":" prefix (,potrace))))))))) + (append + (if (system-hurd?) + (list #:test-exclude "test0001_py|test0001_pyhook") + '()) + (list + #:configure-flags #~`(;; TODO: Provide GTK+ for the Wayland-friendly GDK + ;; backend, instead of the legacy X11 backend. + ;; Currently it introduces a circular dependency. + "-DENABLE_X11=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-override-RPATH + (lambda _ + ;; Do not attempt to set a default RPATH, as our ld-wrapper + ;; already does the right thing. + (substitute* "CMakeLists.txt" + (("^set_default_rpath\\(\\)") + "")))) + (add-after 'unpack 'do-not-use-msgfmt--check + (lambda _ + ;; msgfmt --check from gettext-0.23 fails on fr.po: + ;; 'msgstr' is not a valid C format string + (substitute* "po/CMakeLists.txt" + ((" --check") "")))) + #$@(if (target-hurd?) + #~((add-after 'unpack 'apply-hurd-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "fontforge-hurd.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch-file))))) + #~()) + (add-after 'install 'set-library-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (potrace (dirname + (search-input-file inputs "bin/potrace")))) + (wrap-program (string-append out "/bin/fontforge") + ;; Fontforge dynamically opens libraries. + `("LD_LIBRARY_PATH" ":" prefix + ,(map (lambda (input) + (string-append (assoc-ref inputs input) + "/lib")) + '("libtiff" "libjpeg-turbo" "libpng" "libungif" + "libxml2" "zlib" "libspiro" "freetype" + "pango" "cairo" "fontconfig-minimal"))) + ;; Checks for potrace program at runtime + `("PATH" ":" prefix (,potrace)))))))))) (synopsis "Outline font editor") (description "FontForge allows you to create and modify postscript, truetype and diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 805983f6c7..7451082232 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -715,7 +715,14 @@ automated testing of HDL code.") (base32 "1v5fg3h9ffdzq9f6zplvr9all00ssc1gpdvbg129xahkrbl53kvw")))) (native-inputs (list perl)) (build-system cmake-build-system) - (arguments '(#:test-target "check")) + (arguments + (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check (assoc-ref gnu:%standard-phases 'check))))) (home-page "https://accellera.org/community/systemc") (synopsis "Library for event-driven simulation") (description diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 7f50cb0acd..55ece1d96f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3678,7 +3678,7 @@ supporting behavior like @samp{ssh -X}.") (base32 "05rxchwzhnkm91kcr30mavizkp25wgjlhb6lcraa456pw7vgb04q")))) (build-system meson-build-system) - (native-inputs (list cmake pkg-config)) + (native-inputs (list cmake-minimal pkg-config)) (inputs (list cairo dbus egl-wayland diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index d82af433d8..4d60ff60d1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -3244,7 +3244,6 @@ is designed to be used in interactive 3D graphics applications.") (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_DOCUMENTATION=ON" - "-DBUILD_TESTING=ON" "-DENABLE_DOUBLE_PRECISION=ON"))) (native-inputs (list python-sphinx)) @@ -3357,9 +3356,19 @@ rigid body physics library written in C.") "include <doctest/doctest.h>")))))) (build-system cmake-build-system) (arguments - `(#:test-target "unit_test" - #:configure-flags '("-DBUILD_SHARED_LIBS=ON" - "-DBOX2D_BUILD_TESTBED=OFF"))) + (list #:configure-flags #~'("-DBUILD_SHARED_LIBS=ON" + "-DBOX2D_BUILD_TESTBED=OFF") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys #:rest args) + (when tests? + (apply (assoc-ref gnu:%standard-phases 'check) + #:tests? tests? #:test-target "unit_test" args) + (invoke "bin/unit_test"))))))) (native-inputs (list doctest)) ;for tests (inputs @@ -3390,11 +3399,13 @@ physics engine is just a system for procedural animation.") (arguments (substitute-keyword-arguments (package-arguments box2d) - ((#:test-target _) "") ; no check ((#:configure-flags original-flags) - `(cons* "-DBOX2D_UNIT_TESTS=OFF" ; enkiTS need for all test apps - "-DBOX2D_SAMPLES=OFF" - (delete "-DBOX2D_BUILD_TESTBED=OFF" ,original-flags))))))) + #~(cons* "-DBOX2D_UNIT_TESTS=OFF" ; enkiTS need for all test apps + "-DBOX2D_SAMPLES=OFF" + (delete "-DBOX2D_BUILD_TESTBED=OFF" #$original-flags))) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'check))))))) ; no check (define-public libtcod (package diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2128a06d30..12d4efff4a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1554,6 +1554,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 @@ -1563,6 +1566,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" @@ -7183,6 +7188,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 @@ -7198,7 +7206,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 @@ -7603,22 +7613,31 @@ screensaver."))) (native-inputs (list cppunit pkg-config)) (arguments - `(#:configure-flags - (list "-DCMAKE_CXX_FLAGS=-fcommon" - "-DCMAKE_C_FLAGS=-fcommon" - (string-append "-DCUSTOM_DATA_INSTALL_PATH=" - (search-input-directory %build-inputs - "share/megaglest")) - "-DBUILD_MEGAGLEST_TESTS=ON") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-ini-search-path - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "source/glest_game/global/config.cpp" - (("/usr/share/megaglest/") - (string-append (assoc-ref outputs "out") - "/share/megaglest/")))))) - #:test-target "megaglest_tests")) + (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:configure-flags + #~(list "-DCMAKE_CXX_FLAGS=-fcommon" + "-DCMAKE_C_FLAGS=-fcommon" + (string-append "-DCUSTOM_DATA_INSTALL_PATH=" + (search-input-directory %build-inputs + "share/megaglest")) + "-DBUILD_MEGAGLEST_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-ini-search-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "source/glest_game/global/config.cpp" + (("/usr/share/megaglest/") + (string-append (assoc-ref outputs "out") + "/share/megaglest/"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys #:rest args) + (when tests? + (apply (assoc-ref gnu:%standard-phases 'check) + #:tests? tests? #:test-target "megaglest_tests" args) + (invoke "source/tests/megaglest_tests"))))))) (home-page "https://megaglest.org/") (synopsis "3D real-time strategy (RTS) game") (description "MegaGlest is a cross-platform 3D real-time strategy (RTS) @@ -7844,26 +7863,31 @@ small robot living in the nano world, repair its maker.") #t)))) (build-system cmake-build-system) (arguments - `(#:test-target "run_tests" + (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key outputs #:allow-other-keys) - ;; Embed path to assets. - (substitute* "src/engine/shared/storage.cpp" - (("#define DATA_DIR.*") - (string-append "#define DATA_DIR \"" - (assoc-ref outputs "out") - "/share/teeworlds/data" - "\""))) - #t)) - (add-after 'unpack 'replace-font - (lambda* (#:key inputs #:allow-other-keys) - (delete-file "datasrc/fonts/DejaVuSans.ttf") - (symlink (string-append (assoc-ref inputs "font-dejavu") - "/share/fonts/truetype/DejaVuSans.ttf") - "datasrc/fonts/DejaVuSans.ttf") - #t))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key outputs #:allow-other-keys) + ;; Embed path to assets. + (substitute* "src/engine/shared/storage.cpp" + (("#define DATA_DIR.*") + (string-append "#define DATA_DIR \"" + (assoc-ref outputs "out") + "/share/teeworlds/data" + "\""))))) + (add-after 'unpack 'replace-font + (lambda* (#:key inputs #:allow-other-keys) + (delete-file "datasrc/fonts/DejaVuSans.ttf") + (symlink (string-append (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype/DejaVuSans.ttf") + "datasrc/fonts/DejaVuSans.ttf"))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "run_tests" args)))))) (inputs (list freetype font-dejavu @@ -10808,7 +10832,9 @@ a fortress beyond the forbidden swamp.") (list #:configure-flags #~(list "-DAudio_TK=OpenAL") - #:test-target "tests" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'prepare-gmock @@ -10839,7 +10865,13 @@ a fortress beyond the forbidden swamp.") (substitute* "CMakeLists.txt" (("share/games/openclonk") "share/openclonk") (("TARGETS openclonk DESTINATION games") - "TARGETS openclonk DESTINATION bin"))))))) + "TARGETS openclonk DESTINATION bin")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys #:rest args) + (when tests? + (apply (assoc-ref gnu:%standard-phases 'check) + #:tests? tests? #:test-target "tests" args) + (invoke "tests/tests"))))))) (native-inputs (list (package-source googletest) googletest @@ -11134,13 +11166,7 @@ levels to unlock.") (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DSYSTEM_EXPAT=ON") - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Skip tests that require internet access. - (invoke "ctest" "-E" "(http|dns)"))))))) + #:test-exclude "(http|dns)")) (inputs `(("boost" ,boost) ("curl" ,curl) @@ -11292,7 +11318,10 @@ attached joysticks and displays which buttons and axis are pressed.") (base32 "1x5m6xvd1r9dhgzh6hp4vrszczbbxr04v7lyh4wjxxzrj3ahbmcq")))) (build-system cmake-build-system) - (arguments (list #:configure-flags #~(list "-DBUILD_TESTS=ON"))) + (arguments + (list #:tests? #f + #:configure-flags + #~(list "-DBUILD_TESTS=ON"))) (native-inputs (list pkg-config)) (inputs (list gtkmm-3 libsigc++-2)) (home-page "https://github.com/Grumbel/jstest-gtk/") @@ -11812,12 +11841,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") @@ -12004,35 +12038,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 @@ -12406,6 +12441,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 @@ -12428,7 +12466,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 @@ -13482,7 +13522,6 @@ virtual reality devices.") (build-system cmake-build-system) (arguments (list - #:cmake cmake-next #:configure-flags #~(list "-DUSE_TESTS=ON" "-DOPENGL_BACKEND=OpenGL"))) (native-inputs (list python-3.10 glibc-locales googletest)) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9ac28d998b..35700b2382 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1446,14 +1446,8 @@ development.") (arguments (list #:configure-flags #~(list "-DUSE_EXTERNAL_GTEST=ON") - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" - ;; This tests needs network . - "pdal_io_(stac|copc)_reader_test"))))))) + #:parallel-tests? #f + #:test-exclude "pdal_io_(stac|copc)_reader_test")) (native-inputs (list python googletest)) (inputs (list gdal h3 @@ -2298,6 +2292,7 @@ volunteers.") (sha256 (base32 "02n5vjcyk04w0djidyp21hfbxfpbbara8ifd9nml6158rwqr8lja")))) + (arguments (list #:tests? #f)) (build-system cmake-build-system) (home-page "https://libspatialindex.org") (synopsis "Spatial indexing library") @@ -4149,7 +4144,6 @@ and 2D images (photos taken using a 3D imaging system).") #:configure-flags #~(list ;; Options "-DOPTION_BUILD_CCVIEWER=NO" - "-DBUILD_TESTING=ON" "-DOPTION_USE_SHAPE_LIB=YES" "-DOPTION_USE_DXF_LIB=YES" "-DOPTION_USE_GDAL=YES" diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2526e79a00..1efaa8b8ab 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1269,18 +1269,11 @@ programming language. It also provides the @command{dbusxx-xml2cpp} and (snippet '(delete-file-recursively "tools/libcppgenerate")))) (build-system cmake-build-system) (arguments - (list #:configure-flags #~(list "-DBUILD_TESTING=ON" - "-DENABLE_TOOLS=ON" + (list #:configure-flags #~(list "-DENABLE_TOOLS=ON" "-DENABLE_GLIB_SUPPORT=ON" "-DTOOLS_BUNDLED_CPPGENERATE=OFF") - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; There is no /etc/machine-id file in the build - ;; environment. - (invoke "ctest" "-E" "test-machine-uuid-method"))))))) + ;; There is no /etc/machine-id file in the build environment. + #:test-exclude "test-machine-uuid-method")) ;; These are propagated due to being referenced in headers and pkg-config ;; .pc files. (propagated-inputs (list glib libsigc++)) @@ -1318,18 +1311,24 @@ Some codes examples can be find at: (arguments (list ;; Avoid the integration test, which requires a system bus. - #:test-target "sdbus-c++-unit-tests" #:configure-flags #~(list "-DSDBUSCPP_BUILD_CODEGEN=ON" "-DSDBUSCPP_BUILD_TESTS=ON" ;; Do not install tests. "-DSDBUSCPP_TESTS_INSTALL_PATH=/tmp" "-DCMAKE_VERBOSE_MAKEFILE=ON") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'do-not-install-tests (lambda _ (substitute* "tests/CMakeLists.txt" - (("/etc/dbus-1/system.d") "/tmp"))))))) + (("/etc/dbus-1/system.d") "/tmp")))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "sdbus-c++-unit-tests" args)))))) (native-inputs (list googletest-1.17 pkg-config)) (inputs (list expat)) (propagated-inputs (list elogind)) ;required by sdbus-c++.pc @@ -1608,6 +1607,7 @@ that uses asynchronous and future-based APIs.") (build-system cmake-build-system) (arguments (list + #:tests? #f ; fail with GLib-CRITICAL errors #:configure-flags #~(list "-DINTERNAL_EXPECTED=OFF"))) (inputs (list boost fmt expected-lite)) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bf2bc90fbe..e2af4d567b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015-2020, 2023, 2024 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org> -;;; Copyright © 2015-2024 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015-2025 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018 Rene Saavedra <pacoon@protonmail.com> ;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net> ;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net> @@ -321,7 +321,9 @@ "brasero-" version ".tar.xz")) (sha256 (base32 - "05gabybkl7xfinwx97i4scp9hic0dlxj7gh03dyj0hd16fp9wx47")))) + "05gabybkl7xfinwx97i4scp9hic0dlxj7gh03dyj0hd16fp9wx47")) + (patches + (search-patches "brasero-fix-gcc-14-build-failure.patch")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags (list @@ -5049,6 +5051,23 @@ indicators etc).") (base32 "17zhkf2pjwrghdgk5nhfvzqakb2xwk2jj19316xjr0s9n3djv3z4")))) (build-system meson-build-system) + (arguments + (list + ;; Exclude flaky tests (see https://codeberg.org/guix/guix/issues/1377). + ;; Meson cannot exclude individual tests so the test suite is added in the + ;; phase below. + #:test-options #~(list "--no-suite" "connection") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'mark-tests-for-exclusion + (lambda _ + ;; The test names are programmatically generated in the meson + ;; build file. The two failing tests are "connection-gnutls" and + ;; "connection-gnutls-tls1.2" and share program[0] == "common", + ;; so use that as the suite name. + (substitute* "tls/tests/meson.build" + (("test\\(([^)]*)\\)" _ args) + (string-append "test(" args ", suite: program[0])")))))))) (native-inputs (list `(,glib "bin") ; for gio-querymodules pkg-config gettext-minimal)) @@ -5097,7 +5116,7 @@ from the GSettings schemas in gsettings-desktop-schemas.") (native-inputs (list gettext-minimal pkg-config - cmake + cmake-minimal `(,glib "bin") desktop-file-utils itstool @@ -8408,6 +8427,7 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (build-system cmake-build-system) (arguments (list + #:parallel-tests? #f #:configure-flags #~(let* ((lib (string-append #$output "/lib")) (runpaths (map (lambda (s) @@ -9849,7 +9869,8 @@ easy, safe, and automatic.") (arguments (list #:glib-or-gtk? #t - #:test-options `(list ,@(if (target-riscv64?) + #:test-options `(list ,@(if (or (target-riscv64?) + (target-aarch64?)) `("--timeout-multiplier" "10") '("--timeout-multiplier" "2"))) #:configure-flags @@ -12354,6 +12375,7 @@ generic enough to work for everyone.") (build-system cmake-build-system) (arguments (list + #:tests? #f #:imported-modules `(,@%cmake-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build cmake-build-system) @@ -14289,7 +14311,7 @@ historical battery usage and related statistics.") ;; This is done so we can override. (("`set.PREFIX_BIN") "set(QPREFIX_BIN"))))))) (native-inputs - (list cmake pkg-config intltool gettext-minimal)) + (list cmake-minimal pkg-config intltool gettext-minimal)) (inputs (list glib gtk+ libx11 libsm libxv libxaw libxcb libxkbfile shared-mime-info)) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 9f2f677968..ee9fe5a366 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -78,13 +78,13 @@ (build-system cmake-build-system) (arguments (list - #:test-target "check" #:configure-flags #~(list "-DWITH_PYTHON=ON") #:make-flags #~(list "GUILE_AUTO_COMPILE=0") #:imported-modules `(,@%default-gnu-imported-modules (guix build cmake-build-system) (guix build glib-or-gtk-build-system)) #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) #:phases @@ -114,6 +114,7 @@ (invoke "localedef" "-i" "en_US" "-f" "UTF-8" "./en_US.UTF-8") (invoke "localedef" "-i" "en_GB" "-f" "UTF-8" "./en_GB.UTF-8") (invoke "localedef" "-i" "fr_FR" "-f" "UTF-8" "./fr_FR.UTF-8"))) + (replace 'check (assoc-ref gnu:%standard-phases 'check)) ;; There is about 100 MiB of documentation. (add-after 'install 'install-docs (lambda _ diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 6a3676be04..42aa985ac2 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -21799,7 +21799,7 @@ recognizers) at run time.") (list #:import-path "mvdan.cc/editorconfig")) (native-inputs - (list cmake)) + (list cmake-minimal)) (home-page "https://github.com/mvdan/editorconfig") (synopsis "EditorConfig support in Go") (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/graph.scm b/gnu/packages/graph.scm index 2549889a11..239910ad1a 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -146,7 +146,9 @@ distributions in empirical data. SIAM Review 51, 661-703 (2009)}).") ;; Use the same integer width as suitesparse-cxsparse, which ;; uses int64_t in SuiteSparse v6.0.0 and later. "-DIGRAPH_INTEGER_SIZE=64") - #:test-target "check" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'version-file @@ -178,6 +180,7 @@ distributions in empirical data. SIAM Review 51, 661-703 (2009)}).") (add-after 'build 'build-doc (lambda _ (invoke "cmake" "--build" "." "--target" "html"))) + (replace 'check (assoc-ref gnu:%standard-phases 'check)) (add-after 'install 'install-doc (lambda _ (copy-recursively @@ -536,8 +539,7 @@ intuitive way.") (arguments (list #:configure-flags #~'("-DFAISS_ENABLE_GPU=OFF" ; thanks, but no thanks, CUDA. - "-DFAISS_ENABLE_PYTHON=OFF" - "-DBUILD_TESTING=ON"))) + "-DFAISS_ENABLE_PYTHON=OFF"))) (inputs (list openblas)) (native-inputs diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 09b69091ff..37eb060a8f 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -205,7 +205,8 @@ framebuffer graphics, audio output and input event.") (base32 "0bs3yzb7hy3mgydrj8ycg7pllrd2b6j0gxj596inyr7ihssr3i0y")))) (build-system gnu-build-system) (arguments - `(#:configure-flags + `(#:parallel-build? #f + #:configure-flags '("CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types") #:phases (modify-phases %standard-phases @@ -634,7 +635,8 @@ Please note that this version requires a processor with SSE2 support.")))) "0r6q7bl8513ggrvx3n73j1s3f7n5x1rxy5xi471qyrya95gy6c60")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:tests? #f + #:configure-flags (list (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")))) (inputs @@ -802,6 +804,18 @@ and export to various formats including the format used by Magicavoxel.") (sha256 (base32 "097fxq0frb2nl6bp8wz7kjx6vq4i4117wwq9fnxzkiij9xwv3cq9")))) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'enable-testing + (lambda _ + (substitute* "CMakeLists.txt" + (("IF \\( ASSIMP_BUILD_TESTS \\)" all) + (string-append all "\n enable_testing()"))) + (substitute* "test/CMakeLists.txt" + ;; Leave the test binary where ctest will look for it. + (("TARGET_USE_COMMON_OUTPUT_DIRECTORY\\(unit\\)") + ""))))))) (build-system cmake-build-system) (inputs (list zlib)) @@ -2787,11 +2801,15 @@ Some feature highlights: (url "https://github.com/KhronosGroup/OpenXR-SDK") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete bundled jsoncpp. - (delete-file-recursively "src/external/jsoncpp"))) + ;; When compiling against jsoncpp 1.9.6 the build fails with + ;; 'Unknown CMake command "check_required_components"' + ;; (see https://github.com/open-source-parsers/jsoncpp/issues/1568). + ;; When fixed uncomment the snippet and re-add jsoncpp as an input. + ;(modules '((guix build utils))) + ;(snippet + ; '(begin + ; ;; Delete bundled jsoncpp. + ; (delete-file-recursively "src/external/jsoncpp"))) (sha256 (base32 "0s66xgwkdj5vn05l493hqydrxfpxxidd6mcb8l7l5awhn88cy16f")))) (build-system cmake-build-system) @@ -2800,7 +2818,7 @@ Some feature highlights: (native-inputs (list pkg-config python shaderc vulkan-headers)) (inputs - (list jsoncpp mesa vulkan-loader wayland)) + (list mesa vulkan-loader wayland)) (home-page "https://www.khronos.org/openxr/") (synopsis "Generated headers and sources for OpenXR loader") (description "This package contains OpenXR headers, as well as source code @@ -3067,7 +3085,6 @@ generated discrete signed distance field using the cubic spline kernel. (string-append "-DCMAKE_INSTALL_MANDIR=" #$output "/share/man") "-DBUILD_SHARED_LIBS=ON" "-DBUILD_DOC=ON" - "-DBUILD_TESTING=ON" ;; The longer tests are for continuous integration and ;; depend on input data which must be downloaded. "-DONLY_VERY_SHORT_TESTS=ON" @@ -3293,7 +3310,6 @@ desired local properties.") #:configure-flags #~(list (string-append "-DCMAKE_INSTALL_DOCDIR=" #$output "/share/doc/" #$name "-" #$version) - "-DBUILD_TESTING=OFF" "-DF3D_LINUX_GENERATE_MAN=ON" "-DF3D_USE_EXTERNAL_CXXOPTS=ON" "-DF3D_USE_EXTERNAL_NLOHMANN_JSON=ON" diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index ed386371ce..9de7f7d63d 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 @@ -1467,6 +1472,9 @@ management, attestation, encryption, and signing.") (arguments (list #:configure-flags #~(list "-DLIBCPUID_ENABLE_TESTS=ON") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'absolutize @@ -1481,7 +1489,11 @@ management, attestation, encryption, and signing.") (when (and #$(target-linux?) #$(target-arm?)) (substitute* "drivers/arm/linux/CMakeLists.txt" - (("/usr/src/") (string-append #$output "/src/"))))))))) + (("/usr/src/") (string-append #$output "/src/")))))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "test" args)))))) (inputs (append (if (target-linux?) @@ -1519,7 +1531,7 @@ confused with the @code{cpuid} command line utility from package @code{cpuid}.") (base32 "1cc95ggs64jqq9lk5c8fm4nk6fdnv1x7lr3k4znamj0vv6w22bcd")))) (build-system meson-build-system) (native-inputs - (list cmake pkg-config)) + (list cmake-minimal pkg-config)) (inputs (list avahi libtirpc libxml2)) (home-page "https://lxi-tools.github.io/") @@ -1559,7 +1571,7 @@ your network, send SCPI commands, and receive responses.") (("update-desktop-database") (which "true")))))))) (native-inputs (list bash-completion - cmake + cmake-minimal (list glib "bin") pkg-config python diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index 49955f0121..91e9493ea9 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -172,9 +172,8 @@ link-time. New implementations can be added as well.") '("-DTESTING=OFF" ; The tests fail to link correctly to googletest. ;; Don't install the shared libraries of the dependencies: "-DENABLE_LIBS_PACKAGING=OFF") - #:tests? #f ;; https://iroha.readthedocs.io/en/latest/build/index.html#running-tests-optional - #:test-target ".")) + #:tests? #f)) ;; https://github.com/hyperledger/iroha/blob/master/vcpkg/VCPKG_DEPS_LIST (native-inputs (list fmt-8 diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm index b4f0c8d639..bb5fa5fce8 100644 --- a/gnu/packages/i2p.scm +++ b/gnu/packages/i2p.scm @@ -54,8 +54,7 @@ #:configure-flags #~(list (string-append "-S" #$source "/build") "-DWITH_UPNP=ON" - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON"))) + "-DBUILD_SHARED_LIBS=ON"))) (home-page "https://i2pd.website/") (synopsis "Router for an end-to-end encrypted and anonymous internet") (description "i2pd is a client for the anonymous I2P network, upon which diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 3b43038b05..22ad2308a5 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -50,6 +50,7 @@ #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system copy) #:use-module (guix build-system qt) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -171,6 +172,58 @@ The tools in this software implement various reconstruction algorithms for Magnetic Resonance Imaging.") (license license:bsd-3))) +(define-public cimg + (package + (name "cimg") + (version "3.5.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/GreycLab/CImg") + (commit (string-append "v." version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01myf3bjbc46f977r7lvr9g1hcnpfygcv2xnqvhrl2nj7955sm5x")))) + (build-system copy-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "examples" + ;; This is from upstream CI but parallelized. + (invoke "make" "-j" + (number->string (parallel-job-count)) "mlinux") + (invoke "./image2ascii") + (invoke "./generate_loop_macros") + ;; Build an example that requires an external library. + ;; Running it requires a display. + (invoke "make" "use_jpeg_buffer" + (string-append "CONF_CFLAGS=" + (string-join '("-Dcimg_display=0" + "-O3" + "-mtune=generic" + "-Dcimg_use_jpeg") + " ")) + "CONF_LIBS=-ljpeg")))))) + #:install-plan + #~'(("CImg.h" "include/") + ("plugins" "include/CImg/plugins")))) + (native-inputs (list libjpeg-turbo)) ;for 'check + (home-page "https://cimg.eu") + (synopsis "Small C++ image processing library") + (description + "The @acronym{CImg, Cool Image} Library is a small C++ toolkit for +image processing. It is made of a single header file @code{CImg.h} +that can be compiled using a minimal set of standard C++ and system +libraries. It includes a plugin mechanism to extend its functionality +with external tools and libraries.") + ;; Dual-licensed, either license applies. + (license (list license:cecill-c license:cecill)))) + (define-public dcmtk (package (name "dcmtk") @@ -239,16 +292,14 @@ licences similar to the Modified BSD licence.")))) (substitute* "tests/cpu/fileformats/FileFormatCTF_tests.cpp" (("OCIO_CHECK_NE.*ErrorOutputs.*") "")))) - (add-after 'install 'fix-OpenColorIOConfig + (add-after 'unpack 'fix-broken-test (lambda _ - ;; Work around a CMake Zlib-detection bug: - ;; https://gitlab.kitware.com/cmake/cmake/-/issues/25200 - ;; make OpenColorIOConfig.cmake is a normal cmake file - (substitute* - (string-append #$output - "/lib/cmake/OpenColorIO/OpenColorIOConfig.cmake") - (("\\.#define ZLIB_VERSION \"1\\.3\"") - ""))))))) + ;; Replace the invalid multi-line list. It is unclear why + ;; this is now failing after only build system updates. + ;; (see https://github.com/AcademySoftwareFoundation/OpenColorIO/blob/v2.4.2/tests/cpu/Config_tests.cpp#L6227) + (substitute* "tests/cpu/Config_tests.cpp" + (("cs1\\\\t\\\\n \\\\n, \\\\ncs2") + "cs1, cs2"))))))) (native-inputs ;; XXX: OCIO has unit tests for OpenShadingLanguage, but they fail. ;; They also require OIIO, but OCIO is an optional dependency to it. @@ -313,8 +364,7 @@ many popular formats.") (arguments (list #:build-type "Release" ;Build without '-g' to save space. #:configure-flags - #~'( ;;"-DBUILD_TESTING:BOOL=TRUE" ;not honored - "-DVTK_USE_EXTERNAL=OFF" ;default + #~'("-DVTK_USE_EXTERNAL=OFF" ;default "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON" @@ -488,7 +538,8 @@ different data arrays similar to those available in the numdiff software.") "1ha0230yw9ihybmg2b3mkk9vbnlgzlwx597v2hm14y403047zvgb")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:parallel-tests? #f + #:configure-flags (list "-DWITH_ADE=OFF" ;we don't have a package for ade yet "-DWITH_IPP=OFF" "-DWITH_ITT=OFF" @@ -1187,6 +1238,9 @@ programmatically.") "")) #t)))) (build-system cmake-build-system) + (arguments + ;; Not an actual test, but is incorrectly generated by the build system. + (list #:test-exclude "vul_vul_test_driver")) (inputs (list libgeotiff libtiff libjpeg-turbo libpng zlib)) (home-page "https://github.com/vxl/vxl/") @@ -1221,10 +1275,12 @@ libraries designed for computer vision research and implementation.") (("add_subdirectory\\((tiff|png|jpeg|zlib|bzlib|geotiff)\\)") "")))))) (arguments - `(#:configure-flags - ;; Needed for itk-snap - (list "-DVNL_CONFIG_LEGACY_METHODS=ON" - "-DCMAKE_CXX_STANDARD=14"))))) + (substitute-keyword-arguments (package-arguments vxl) + ((#:configure-flags flags) + #~(cons* ;; Needed for itk-snap + "-DVNL_CONFIG_LEGACY_METHODS=ON" + "-DCMAKE_CXX_STANDARD=14" + #$flags)))))) (define-public insight-toolkit ;; For information about ITK remote modules, see: diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8101977f2d..3e1c30b8d7 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 @@ -1292,7 +1297,6 @@ any user may run. Everything is free and privacy is the first concern.") (build-system cmake-build-system) (arguments (list #:tests? #f ; no tests. - #:cmake cmake-next #:configure-flags #~ (list "-DMARCH_NATIVE=OFF" "-DCMAKE_BUILD_TYPE=Release" diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 1598d33046..33e8b32c10 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1036,7 +1036,6 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (list "-DBUILD_STATIC_LIBS=OFF" "-DBUILD_UNIT_TESTS=ON" - "-DBUILD_TESTING=ON" (string-append "-DOPJ_DATA_ROOT=" (assoc-ref %build-inputs "openjpeg-data"))) #:phases @@ -1461,7 +1460,6 @@ from Lisp and S-expressions, building pixel perfect badges.") (native-inputs (list doxygen python-nose python-sphinx)) (arguments (list - #:test-target "check" #:configure-flags #~(list "-Wno-dev" ;suppress developer mode with lots of warnings (string-append @@ -1477,7 +1475,11 @@ from Lisp and S-expressions, building pixel perfect badges.") ;; needs to be set. (string-append "-DCMAKE_CXX_FLAGS=-I" (assoc-ref %build-inputs "ilmbase") - "/include/OpenEXR" " -ffloat-store")))) + "/include/OpenEXR" " -ffloat-store") + ;; Tests are not built by default. + "-DAUTOBUILD_TESTS=ON" + ;; Disable running tests during the build. + "-DAUTOEXEC_TESTS=OFF"))) (synopsis "Computer vision library") (description "VIGRA stands for Vision with Generic Algorithms. It is an image @@ -1614,38 +1616,46 @@ channels.") (base32 "1qm6bvj28l42km009nc60gffn1qhngc0m2wjlhf90si3mcc8d99m")))) (build-system cmake-build-system) (arguments - `(#:test-target "tests" - #:configure-flags (list "-DEXIV2_BUILD_UNIT_TESTS=ON" - ;; darktable needs BMFF to support - ;; CR3 files. - "-DEXIV2_ENABLE_BMFF=ON") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-gcc-reference - (lambda _ - ;; _GLIBCXX_ASSERTIONS brings reference to GCC. - (substitute* "cmake/compilerFlags.cmake" - (("add_compile_options[(]-Wp,-D_GLIBCXX_ASSERTIONS[)]") - "")))) - (add-after 'install 'delete-static-libraries - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib"))) - (for-each delete-file (find-files lib "\\.a$"))))) + (list + #:configure-flags + #~(list "-DEXIV2_BUILD_UNIT_TESTS=ON" + ;; darktable needs BMFF to support + ;; CR3 files. + "-DEXIV2_ENABLE_BMFF=ON") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-gcc-reference + (lambda _ + ;; _GLIBCXX_ASSERTIONS brings reference to GCC. + (substitute* "cmake/compilerFlags.cmake" + (("add_compile_options[(]-Wp,-D_GLIBCXX_ASSERTIONS[)]") + "")))) + (add-after 'install 'delete-static-libraries + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (for-each delete-file (find-files lib "\\.a$"))))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "tests" args))) - ,@(if (or (target-ppc64le?) - (target-aarch64?) - (target-riscv64?)) - '((add-after 'unpack 'adjust-tests - (lambda _ - ;; Adjust test on ppc64 and aarch64, where no exception - ;; is raised and thus the return value is different. See - ;; <https://github.com/Exiv2/exiv2/issues/365> and - ;; <https://github.com/Exiv2/exiv2/issues/933>. - (substitute* "tests/bugfixes/github/test_CVE_2018_12265.py" - (("\\$uncaught_exception \\$addition_overflow_message\n") "") - (("retval = \\[1\\]") "retval = [0]"))))) - '())))) + #$@(if (or (target-ppc64le?) + (target-aarch64?) + (target-riscv64?)) + '((add-after 'unpack 'adjust-tests + (lambda _ + ;; Adjust test on ppc64 and aarch64, where no exception + ;; is raised and thus the return value is different. See + ;; <https://github.com/Exiv2/exiv2/issues/365> and + ;; <https://github.com/Exiv2/exiv2/issues/933>. + (substitute* "tests/bugfixes/github/test_CVE_2018_12265.py" + (("\\$uncaught_exception \\$addition_overflow_message\n") "") + (("retval = \\[1\\]") "retval = [0]"))))) + '())))) (propagated-inputs (list expat zlib)) (native-inputs diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index c75c4822b3..e3acf3fd71 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -160,7 +160,6 @@ endif()~%~%" (build-system cmake-build-system) (arguments (list - #:test-target "check" ;otherwise some test binaries are missing #:disallowed-references (list imagemagick/stable) #:imported-modules `(,@%cmake-build-system-modules (guix build glib-or-gtk-build-system)) @@ -260,7 +259,7 @@ endif()~%~%" '())))) (invoke "make" "-j" job-count "tests") (invoke "ctest" "-j" job-count - "--output-on-error" + "--output-on-failure" "-E" (string-append "(" (string-join skipped-tests "|") ")")))))) (add-after 'install 'glib-or-gtk-compile-schemas @@ -358,6 +357,8 @@ as the native format.") (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments inkscape/pinned) + ((#:modules modules) + (append '(((guix build gnu-build-system) #:prefix gnu:)) modules)) ((#:configure-flags flags ''()) ;; Enable ImageMagick support. #~(delete "-DWITH_IMAGE_MAGICK=OFF" #$flags)) @@ -371,11 +372,9 @@ as the native format.") #$%inkscape-release-year))))) #$@(if (target-x86-32?) #~() ;XXX: there are remaining failures on i686 - #~((replace 'check - ;; Re-instate the tests disabled in inkscape/pinned, now that - ;; their ImageMagick requirement is satisfied. - (assoc-ref %standard-phases 'check)))) - + ;; Re-instate the tests disabled in inkscape/pinned, now that + ;; their ImageMagick requirement is satisfied. + #~((replace 'check (assoc-ref gnu:%standard-phases 'check)))) (replace 'wrap-program ;; Ensure Python is available at runtime. (lambda _ diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 81bbd5118e..be6373225e 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -698,7 +698,14 @@ bundled with python-3 and luajit that you can delete in a package variant.") (base32 "1p4nqsq689hr2srdvg59v9yfig2aaq9psdy6fhwnya0vszssyvn5")))) (build-system cmake-build-system) - (arguments `(#:test-target "check")) + (arguments + (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check (assoc-ref gnu:%standard-phases 'check))))) (native-inputs (list boost python-pytest)) (home-page "https://github.com/eepp/yactfr") (synopsis "CTF reading library offering a C++14 API") diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 1ff8eb1cff..17e397f86b 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -292,8 +292,7 @@ setting @env{LUA_PATH} and @env{LUA_CPATH} in glirc's run-time environment.") (arguments ;; The three binaries are not mutually exlusive, and are all built ;; by default. - '(#:configure-flags '("-DBUILD_TESTING=ON" - ;;"-DWANT_QTCLIENT=OFF" + '(#:configure-flags '(;;"-DWANT_QTCLIENT=OFF" ;;"-DWANT_CORE=OFF" ;;"-DWANT_MONO=OFF" "-DWITH_KDE=OFF" diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 327272170c..989477c263 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -251,7 +251,6 @@ QSortFilterProxyModel conveniently exposed for QML.") #:qtbase qtbase #:configure-flags #~(list "-DWITH_DAEMON_SUBMODULE=OFF" - "-DBUILD_TESTING=ON" (string-append "-DBUILD_VERSION=" #$version) ;; Disable the webengine since it grows the closure size by ;; about 450 MiB and requires more resources. diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 5450a4fd9a..975366598f 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -515,9 +515,9 @@ extensions.") (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:configure-flags '("-DBUILD_STATIC_LIBS=OFF" - "-DDISABLE_ARCH_NATIVE=ON" ;no '-march=native' - "-DBUILD_TESTING=ON"))) + '(#:tests? #f + #:configure-flags '("-DBUILD_STATIC_LIBS=OFF" + "-DDISABLE_ARCH_NATIVE=ON"))) ;no '-march=native' (native-inputs (list pkg-config ;; The following inputs are used by the test suite. diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 72d97c4bcb..f8e80851f2 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -257,7 +257,8 @@ continuous display of high-volume data.") (base32 "0acv6cis7gjpnzpnlxfrf6rzhwyqdm234p6r7vx7gl7ad3rp30ph")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase)) + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules)) (inputs @@ -317,7 +318,8 @@ image editing capabilities.") gst-plugins-base libxml2)) (arguments - `(#:configure-flags + `(#:tests? #f + #:configure-flags '( "-DPHONON_BUILD_PHONON4QT5=ON"))) (home-page "https://community.kde.org/Phonon") (synopsis "Phonon backend which uses GStreamer") @@ -341,7 +343,8 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") "19f9wzff4nr36ryq18i6qvsq5kqxfkpqsmsvrarr8jqy8pf7k11k")))) (build-system cmake-build-system) (arguments - (list #:configure-flags + (list #:tests? #f + #:configure-flags #~(list "-DPHONON_BUILD_QT5=OFF" "-DPHONON_BUILD_QT6=ON"))) (native-inputs @@ -827,15 +830,15 @@ propagate their changes to their respective configuration files.") (list qtdeclarative-5)) (propagated-inputs '()) (arguments - (list #:phases + (list #:test-exclude "(kconfigcore-kconfigtest|\ +kconfiggui-kstandardshortcutwatchertest)" + #:phases #~(modify-phases %standard-phases - (replace 'check + (add-before 'check 'pre-check (lambda* (#:key tests? #:allow-other-keys) (when tests? ;; kconfigcore-kconfigtest fails inconsistently!! (setenv "HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" "(kconfigcore-kconfigtest|\ -kconfiggui-kstandardshortcutwatchertest)"))))))))) + (setenv "QT_QPA_PLATFORM" "offscreen"))))))))) (define-public kcoreaddons (package @@ -1023,6 +1026,7 @@ as well as an API to create KDED modules.") (inputs (list avahi ; alternatively dnssd could be used qtbase)) + (arguments (list #:tests? #f)) (home-page "https://community.kde.org/Frameworks") (synopsis "Network service discovery using Zeroconf") (description "KDNSSD is a library for handling the DNS-based Service @@ -1074,6 +1078,7 @@ infrastructure.") qt5compat)) (native-inputs (list pkg-config extra-cmake-modules kdoctools)) + (arguments (list #:tests? #f)) (home-page "https://apps.kde.org/kgraphviewer/") (synopsis "Graphviz dot graph viewer for KDE") (description "KGraphViewer is a Graphviz DOT graph file viewer, aimed to @@ -1230,6 +1235,7 @@ translation scripting.") (sha256 (base32 "1p766vi3xg07691dpac5wc4a1ynwnyb6iacv1q73j1ymrpvx65zf")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules pkg-config ;; for wayland-scanner @@ -1283,6 +1289,13 @@ or user activity.") (base32 "0ac3k26xbl6kvchr9j8dmk51valwrbvim19729rypi7vp2ss2nnx")))) (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-offscreen-display + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (native-inputs (list extra-cmake-modules qttools)) (inputs @@ -1313,6 +1326,9 @@ of applications that follow the Kirigami Human Interface Guidelines.") (sha256 (base32 "1q69b1qd2qs9hpwgw0y0ig93ag41l50dghribsnqhi0c9aklsn4b")))) + (arguments + ;; Tests require an OpenGL context + (list #:tests? #f)) (native-inputs (list extra-cmake-modules qttools-5)) (inputs @@ -1611,7 +1627,8 @@ protocols used in KDE Plasma.") wayland wayland-protocols)) (arguments - (list #:qtbase qtbase)) + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://invent.kde.org/plasma/kwayland") (synopsis "Qt-style API to interact with the wayland client and server") (description "As the names suggest they implement a Client respectively a @@ -2186,7 +2203,8 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (list pkg-config extra-cmake-modules)) (inputs (list libraw qtbase)) - (arguments (list #:configure-flags + (arguments (list #:tests? #f + #:configure-flags #~(list #$(string-append "-DQT_MAJOR_VERSION=" (version-major @@ -2244,6 +2262,7 @@ decode RAW picture files.") kxmlgui-5 qtdeclarative-5 solid-5)) + (arguments (list #:tests? #f)) (home-page "https://community.kde.org/Frameworks") (synopsis "Core components for the KDE Activity concept") (description "KActivities provides the infrastructure needed to manage a @@ -2785,6 +2804,7 @@ formats.") (list extra-cmake-modules qttools)) (inputs (list libxkbcommon kcoreaddons knotifications kwidgetsaddons qtbase)) + (arguments (list #:tests? #f)) (home-page "https://community.kde.org/Frameworks") (synopsis "Widgets for showing progress of asynchronous jobs") (description "KJobWIdgets provides widgets for showing progress of @@ -2824,6 +2844,7 @@ asynchronous jobs.") (base32 "1pgrd42wgd6ffy52mfs9ii1l87lvx772w4blr05p03z898fjzcfj")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules pkg-config qttools)) (propagated-inputs (list qtdeclarative)) @@ -3166,7 +3187,10 @@ maintaining an index of the contents of your files.") kwindowsystem qtdeclarative solid)) - (arguments (list #:qtbase qtbase)) + (arguments + (list + #:tests? #f + #:qtbase qtbase)) (home-page "https://invent.kde.org/plasma/plasma-activities") (synopsis "Core components for the KDE Activity System") (description "KActivities provides the infrastructure needed to manage a @@ -3190,6 +3214,7 @@ with other frameworks.") (base32 "0kcbnajlmn6rf298x493sv8bjqh5966jzl1fyl7y3j1xk3mx6jq1")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules)) (inputs @@ -3494,6 +3519,7 @@ their settings.") kwidgetsaddons qtshadertools qtbase)) + (arguments (list #:tests? #f)) (home-page "https://community.kde.org/Frameworks") (synopsis "Integration of QML and KDE work spaces") (description "KDeclarative provides integration of QML and KDE work spaces. @@ -3572,6 +3598,7 @@ that offer bindings to some of the Frameworks.") (base32 "1f0zjd0gigfd6rqlvnyg6yz5fjdkcvkh3srw7044nhhc0wns8xbh")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -3704,7 +3731,10 @@ emoticons coming from different providers.") kwindowsystem libxkbcommon qtdeclarative)) - (arguments (list #:qtbase qtbase)) + (arguments + (list + #:tests? #f + #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Global desktop keyboard shortcuts") (description "KGlobalAccel allows you to have global accelerators that are @@ -3774,6 +3804,11 @@ window does not need focus for them to be activated.") (arguments (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'enable-testing + (lambda _ + (substitute* "CMakeLists.txt" + (("if \\(BUILD_TESTING\\)" all) + (string-append all "\n enable_testing()"))))) (add-before 'check 'check-setup (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" (getcwd)) @@ -3847,6 +3882,7 @@ in applications using the KDE Frameworks.") (build-system cmake-build-system) (arguments (list + #:tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths @@ -4148,7 +4184,10 @@ KIO enabled infrastructure.") qtdeclarative syndication)) (arguments - (list #:phases + (list ;; This failing test is run by the cmake-build-system phases but not + ;; by the gnu-build-system phases. + #:test-exclude "knewstuff-atticaprovidertest" + #:phases #~(modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ ; XDG_DATA_DIRS isn't set @@ -4216,6 +4255,7 @@ specification.") (base32 "1d1rz0p270fwx84870kj7nih40kkxnpl3963mf52zs0xzkmkk6xb")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules)) (inputs @@ -4525,6 +4565,7 @@ typed.") (list kcrash kdbusaddons kdoctools ki18n qtbase qtdeclarative)) (arguments (list + #:parallel-tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -4618,7 +4659,10 @@ types or handled by application specific code.") (base32 "16nynk0b1bmbi4fjyppfavnw1m6jkfwnpvsnm4zvrdfwwgg7yf7d")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list + #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules qttools)) (inputs (list kwindowsystem libxkbcommon)) (home-page "https://community.kde.org/Frameworks") @@ -5211,8 +5255,7 @@ script engines.") qtdeclarative prison)) (arguments - (list #:tests? #f ;; seem to require network; don't find QTQuick components - #:configure-flags #~'("-DBUILD_TESTING=OFF"))) ; not run anyway + (list #:tests? #f)) ;; seem to require network; don't find QTQuick components (home-page "https://community.kde.org/Frameworks") (synopsis "Offers available actions for a specific purpose") (description "This framework offers the possibility to create integrate @@ -5250,9 +5293,7 @@ need.") qtbase-5 qtdeclarative-5)) (arguments - (list #:tests? #f ;; seem to require network; don't find QTQuick components - ;; not run anyway - #:configure-flags #~'("-DBUILD_TESTING=OFF"))))) + (list #:tests? #f)))) ;; seem to require network; don't find QTQuick components (define-public ktextaddons (package diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index 4d1e659198..b645538a8d 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -56,7 +56,9 @@ (sha256 (base32 "0hdn2rvi1v6jzvidqq6db38axiah7cg1jsmj0bdlpfjzbffi8mjl")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools perl)) (inputs @@ -142,7 +144,9 @@ This package is part of the KDE games module.") (sha256 (base32 "0pbq1v84j8jl64p4lv60x1gss28181594vlhcpqyjadxwgy5n37m")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -193,6 +197,7 @@ This package is part of the KDE games module.") (arguments (list #:qtbase qtbase + #:tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-tileset-dir @@ -252,7 +257,9 @@ other Mah Jongg like games.") libkmahjongg qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kmahjongg/") (synopsis "Tile laying patience") (description "In KMahjongg the tiles are scrambled and staked on top of @@ -318,6 +325,7 @@ This package is part of the KDE games module.") (arguments (list #:qtbase qtbase + #:tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-paths @@ -387,7 +395,9 @@ This package is part of the KDE games module.") (sha256 (base32 "00qbyv7awf70dxid2m71izsl39mfvjgzrfqdpfgkgisfvrwwnw90")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -425,7 +435,9 @@ This package is part of the KDE games module.") (sha256 (base32 "0qw460yp5g1ca21dl72mkdl7fidcbzs8ajvdsqyylrslh4aafxjq")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -463,7 +475,9 @@ This package is part of the KDE games module.") (sha256 (base32 "1ks4x320q6di0f8w8r9bnayhmn11cnfqw86jx63a74vgkn4878w6")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -503,7 +517,9 @@ This package is part of the KDE games module.") (sha256 (base32 "1kdrwn4i24kn9r3ardz92m2c2lfh2fla6x62g8wd8j30sd4q2i8j")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -583,7 +599,9 @@ This package is part of the KDE games module.") (sha256 (base32 "0mhc56s59l2hqdb27jypdgd82l2li2lil9a7kb4zg8x245c42jhk")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -644,7 +662,9 @@ This package is part of the KDE games module.") (sha256 (base32 "0xqddz0xzyn2j578v2clqsnqmqbf83787wkv54kpzdz3v6nbdswk")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -688,7 +708,9 @@ This package is part of the KDE games module.") (sha256 (base32 "07mz92k9ggdfrl3hnpwg6xl70mjaklwrp26a282n1j66arawmkjv")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -730,7 +752,9 @@ This package is part of the KDE games module.") (sha256 (base32 "1a2fgdfckmsz3ycrlbiddfd2vfhlhx8zn47zg5f2ic00jpp8wch4")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -769,7 +793,9 @@ This package is part of the KDE games module.") (sha256 (base32 "05cddjavbhdn4bwmg6ik2q0y0vjl1pn2nrlpkivsn97m1aka57hl")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -809,7 +835,9 @@ This package is part of the KDE games module.") (sha256 (base32 "1bj181is31hci056qxvf0wcqzggxxlszn65npm16038wa3bh95lw")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -904,7 +932,9 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtdeclarative)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/bomber/") (synopsis "Arcade bombing game") (description "Bomber is a single player arcade game. @@ -950,7 +980,9 @@ This package is part of the KDE games module.") libkdegames qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/granatier/") (synopsis "Bomberman clone") (description "Granatier is a clone of the classic Bomberman game, @@ -990,7 +1022,9 @@ This package is part of the KDE games module.") qtmultimedia qtsvg zlib)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/ksirk/") (synopsis "Computerized version of the well known strategy board game 'Risk'") @@ -1051,7 +1085,9 @@ This package is part of the KDE games module.") qtdeclarative qtsvg shared-mime-info)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/palapeli/") (synopsis "Jigsaw puzzle game") (description "Palapeli is a jigsaw puzzle game. Unlike other games in @@ -1090,7 +1126,9 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtdeclarative)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kiriki/") (synopsis "Yahtzee dice game") (description "Kiriki is an addictive and fun dice game, designed to be @@ -1117,6 +1155,7 @@ This package is part of the KDE games module.") (arguments (list #:qtbase qtbase + #:tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-gnugo-command (lambda* (#:key inputs #:allow-other-keys) @@ -1186,7 +1225,9 @@ This package is part of the KDE games module.") qtbase qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kubrick/") (synopsis "Game based on Rubik's Cube") (description "Kubrick is a game based on the Rubik's Cube puzzle. @@ -1228,7 +1269,9 @@ This package is part of the KDE games module.") libkdegames qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/lskat/") (synopsis "Lieutnant Skat card game") (description "Lieutnant Skat (from German \"Offiziersskat\") is a fun and @@ -1267,7 +1310,9 @@ This package is part of the KDE games module.") libkdegames qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kapman/") (synopsis "Pac-Man clone") (description "Kapman is a clone of the well known game Pac-Man. @@ -1306,7 +1351,9 @@ This package is part of the KDE games module.") libkdegames qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kspaceduel/") (synopsis "Two player game with shooting spaceships flying around a sun") (description "KSpaceduel is a space battle game for one or two players, @@ -1340,7 +1387,9 @@ This package is part of the KDE games module.") libkdegames qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/bovo/") (synopsis "Classic pen and paper game: five in a line") (description "Bovo is a Gomoku (from Japanese 五目並べ - lit. \"five @@ -1364,7 +1413,9 @@ This package is part of the KDE games module.") (sha256 (base32 "1h1j3n2wy641gp53m2rb8zbsn93ciprivfi718bcvwvr2k41ncga")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1406,7 +1457,9 @@ This package is part of the KDE games module.") (sha256 (base32 "0v7rh6zlf742gz6y8w440ap9zirv2yvmdybhz3qiwbxag5qvr5r0")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1445,7 +1498,9 @@ This package is part of the KDE games module.") (sha256 (base32 "0hh85zl2wid190bgp542msigjyvdwfgvzvfcl22sx15ydnp6v6ma")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1483,7 +1538,9 @@ This package is part of the KDE games module.") (sha256 (base32 "0dammn0a2z5valmbr3c85y6rsxh2isixl72wvfj6zvvp2s5lvsi1")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1523,7 +1580,9 @@ This package is part of the KDE games module.") (sha256 (base32 "01chrif9f73nxx4fdmipi3yl2r8dzi5wsgksrc6kqj12j6gpdpjy")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1565,7 +1624,9 @@ This package is part of the KDE games module.") (sha256 (base32 "0p1nc34n93mzdxih6799j25fic95mha311rifnghk9mlc6fw416n")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1601,7 +1662,9 @@ This package is part of the KDE games module.") (sha256 (base32 "058sbbx73kbm2ils6ay0g3n9q05lid8aixl81i0246cgi2kvwvwy")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1640,7 +1703,8 @@ This package is part of the KDE games module.") (base32 "0yrrbmiv9blpafwpa24w4farv76rqghqnrr6r01kkxrikcav9j0y")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase)) + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 7d42ed5f3f..b39bd77f6b 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -74,6 +74,8 @@ (sha256 (base32 "0zm4nkpmvd181xlkis7ydzx54p3vn0zgpdzgh54f1hsjy6ahsq16")))) (build-system qt-build-system) + (arguments + (list #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs @@ -332,6 +334,7 @@ Features are: gnutls)) (arguments (list #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:tests? #f #:qtbase qtbase)) (home-page "https://apps.kde.org/krdc/") (synopsis "Remote desktop client") diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 600a868238..1c3db87d95 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -87,7 +87,9 @@ libkcompactdisc libvorbis phonon)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kio_audiocd/") (synopsis "Transparent audio CD integration for applications using the KDE Platform") @@ -134,7 +136,9 @@ This package is part of the KDE multimedia module.") phonon phonon-backend-vlc solid)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/dragonplayer/") (synopsis "Simple video player") (description "Dragon Player is a multimedia player where the focus is on @@ -160,6 +164,7 @@ This package is part of the KDE multimedia module.") (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-yt-dlp-path @@ -249,10 +254,10 @@ This package is part of the KDE multimedia module.") (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1"))) (replace 'check - (lambda* (#:key tests? test-target #:allow-other-keys) + (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (invoke "dbus-launch" "make" test-target))))))) + (invoke "dbus-launch" "make" "test"))))))) (home-page "https://apps.kde.org/elisa/") (synopsis "Powerful music player for Plasma 5") (description "Elisa is a simple music player aiming to provide a nice @@ -280,6 +285,7 @@ its own database. You can build and play your own playlist.") (inputs (list ffmpeg kconfig ki18n kio taglib)) (arguments (list #:qtbase qtbase + #:tests? #f #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (home-page "https://apps.kde.org/ffmpegthumbs/") (synopsis "Video thumbnail generator for KDE using ffmpeg") @@ -541,7 +547,8 @@ the available CD drives.") v4l-utils ; libdvbv5 vlc)) (arguments - (list #:phases + (list #:tests? #f + #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-code (lambda _ @@ -647,7 +654,8 @@ camera. Use it to take pictures and make videos to share.") vulkan-loader)) (arguments (list - #:qtbase qtbase)) + #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kasts/") (synopsis "Convergent podcast client") (description @@ -847,6 +855,7 @@ Its features include: solid)) (arguments (list #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:tests? #f #:qtbase qtbase)) (home-page "https://invent.kde.org/multimedia/libkcompactdisc") (synopsis "KDE library for playing & ripping CDs") diff --git a/gnu/packages/kde-office.scm b/gnu/packages/kde-office.scm index ca0d6849cc..dc3241d7ec 100644 --- a/gnu/packages/kde-office.scm +++ b/gnu/packages/kde-office.scm @@ -67,8 +67,6 @@ (arguments (list #:qtbase qtbase ;; XXX: 26/164 tests fail. - #:configure-flags - #~(list "-DBUILD_TESTING=OFF") #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools perl pkg-config)) @@ -166,8 +164,7 @@ Advanced plugins: (arguments (list #:qtbase qtbase #:configure-flags - #~(list "-DQT_MAJOR_VERSION=6" - "-DBUILD_TESTING=ON"))) + #~(list "-DQT_MAJOR_VERSION=6"))) (native-inputs (list extra-cmake-modules kdoctools pkg-config qttools)) (inputs diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 3f713bb7c2..dcb1e8a4a3 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -395,7 +395,9 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") (sha256 (base32 "1gv2jxy1xc6b70jax320rvk68qmgz1wpnrbx6wlxg1dmrafhby4d")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -616,7 +618,9 @@ information.") breeze-icons ; default icon set, required for tests prison qgpgme-qt6)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://kontact.kde.org/components/kaddressbook/") (synopsis "Address Book application to manage your contacts") (description "KAddressBook stores all the personal details of your family, @@ -648,7 +652,9 @@ CalDAV server.") libaccounts-qt6 qcoro-qt6 signond-qt6)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://invent.kde.org/network/kaccounts-integration") (synopsis "Online account management system") (description "The Kaccounts Integration library provides online account @@ -678,7 +684,9 @@ management system and its Plasma integration components.") qtwebengine qcoro-qt6 signond-qt6)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://invent.kde.org/network/kaccounts-providers") (synopsis "Online account providers for the KAccounts system") (description "This package provides online account providers for the @@ -1873,7 +1881,9 @@ Features: kwindowsystem kxmlgui libxkbcommon)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://api.kde.org/kdepim/kontactinterface/html/index.html") (synopsis "Kontact interface library") (description "This library provides the glue necessary for diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 7742a3ffbf..d1926c3426 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -112,7 +112,8 @@ (base32 "1fhgqxrqbm20liap57h35qq6wvh7x5r980r2ibv3k0k7naqp16sm")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules pkg-config qttools)) (inputs (list kcoreaddons kcmutils @@ -167,6 +168,7 @@ kcolorscheme qtsvg)) (arguments (list #:qtbase qtbase + #:tests? #f #:configure-flags #~(list "-DBUILD_QT5=OFF"))) (home-page "https://invent.kde.org/plasma/breeze") (synopsis "Default KDE Plasma theme") @@ -188,7 +190,10 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") kiconthemes-5 kpackage-5 kwindowsystem-5)) - (arguments (list #:configure-flags #~(list "-DBUILD_QT6=OFF"))))) + (arguments + (list #:tests? #f + #:configure-flags + #~(list "-DBUILD_QT6=OFF"))))) (define-public breeze-gtk (package @@ -239,7 +244,8 @@ Breeze is the default theme for the KDE Plasma desktop.") kpeople qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (home-page "https://invent.kde.org/plasma-mobile/calindori") (synopsis "Calendar for Plasma Mobile") (description @@ -413,7 +419,8 @@ games, and tools.") (base32 "00kmx5zdfvg0w18hcc4wi1xqfi3n8x46664khf48mcl3gzjval2g")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules)) (inputs (list boost kcompletion @@ -443,6 +450,7 @@ concept.") "1g4c4p2ydm2xvfy8li8zk8ldy45xqaxbf47hmwx2w5ysidkg1g44")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'hardcode-openssl @@ -496,6 +504,7 @@ RDP server.") (arguments (list #:qtbase qtbase + #:tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-gsettings-schemas-path @@ -662,7 +671,9 @@ KDE Frameworks 5 to better interact with the system.") (base32 "1nsdkqnrhl20g6giaglk22vzh2zs1v5qjkhy8zq7z050xsqn2g7w")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list kauth kcoreaddons @@ -841,7 +852,8 @@ computer's hardware.") (base32 "0plvzwp7p0l9sp6ga7xbszh6hm3bzdb1wyd3vbidlpjwkigd37by")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list kcrash ki18n @@ -890,7 +902,9 @@ computer's hardware.") kiconthemes qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kongress/") (synopsis "Companion application for conferences") (description "This application provides list of upcoming conferences with @@ -989,7 +1003,9 @@ KDE Plasma Workspaces.") (base32 "15ar4lx46y92hy3cirls17jya6w7hnvbpk4qx7nfqf6g2bdl2cvr")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1098,7 +1114,9 @@ an elegant and intuitive experience for your tasks and plasmoids.") (base32 "0ik3l9lqqh9s2574swv045zj1kk8fg33zsacd3bfzayk90zrh37q")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules pkg-config)) (inputs @@ -1596,7 +1614,9 @@ conjunction with the KDE Plasma Desktop.") (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons ki18n kpty knotifications)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://invent.kde.org/plasma/kwrited") (synopsis "System notification daemon") (description @@ -1627,7 +1647,8 @@ conjunction with the KDE Plasma Desktop.") krunner ksvg qtdeclarative)) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (synopsis "Dedicated search application built on top of Baloo") (description "This package provides a dedicated search application built on top of Baloo.") @@ -1648,7 +1669,8 @@ on top of Baloo.") "1ipra7srk3xdq8b1jls46jkhbn1dcyadbl5gjm0lxqlivr49j87f")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase)) + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules)) (inputs (list qtdeclarative @@ -1672,6 +1694,7 @@ on top of Baloo.") (base32 "0r90hrwib31wfv0mj42vf19c13642vb79m152rgps590i89yrkj9")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules)) (home-page "https://community.kde.org/Frameworks") (synopsis "Sounds for the KDE desktop") @@ -1691,6 +1714,7 @@ on top of Baloo.") (base32 "1v51qhcr0swbajc0skwscp2h3m4qr337l8s145nmiv2scsn7sc86")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules)) (inputs (list qtbase)) (home-page "https://invent.kde.org/plasma/ocean-sound-theme") @@ -1856,7 +1880,8 @@ KF5/Qt5 to KF6/Qt6") (propagated-inputs (list mpv)) (arguments - (list #:qtbase qtbase)) + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://invent.kde.org/libraries/mpvqt") (synopsis "libmpv wrapper for QtQuick2 and QML") (description "This package provides a libmpv wrapper for QtQuick2 and QML.") @@ -2242,6 +2267,7 @@ integration of Qt applications when running on a KDE Plasma workspace.") kwindowsystem kwayland ki18n)) + (arguments (list #:tests? #f)) (home-page "https://plasma-mobile.org/") (synopsis "Minimal Plasma Shell package") (description @@ -2356,6 +2382,7 @@ customizable platform for mobile devices.") (base32 "1br6kzicrr45vgg0ciqczxlcid21n5lfjm6zc06rw86ys7fx7bpi")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules pkg-config)) (home-page "https://plasma-mobile.org/") (synopsis "Sounds for Plasma Mobile devices") @@ -2430,6 +2457,7 @@ PulseAudio.") ;; $QML_IMPORT_PATH. (list kirigami libplasma qtdeclarative)) (arguments (list #:qtbase qtbase + #:tests? #f #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (home-page "https://invent.kde.org/plasma/plasma-pass") (synopsis "Plasma applet for the Pass password manager") @@ -2450,7 +2478,8 @@ PulseAudio.") (base32 "1f2z3djq8q2z90vrn18k5qbiw8crhs69c5qvdnzxmp3s3f63bk4l")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list kpeople kirigami @@ -2498,6 +2527,7 @@ adding, modifying and removing contacts.") (arguments (list #:qtbase qtbase + #:tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -2558,7 +2588,9 @@ vaults.") libksysguard qqc2-desktop-style qtdeclarative)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (synopsis "System sensors, process information and other system resources monitor") (description "This package provides an interface for monitoring system @@ -2605,7 +2637,9 @@ sensors, process information and other system resources.") libplasma qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (synopsis "Plasma welcome screen") (description "This package provides a wizard for Plasma to configure settings.") @@ -2809,6 +2843,11 @@ deviceerrormonitor_p.cpp" "shelltest" "tasksmodeltest" "tasktoolstest" + + ;; Failure in TestDesktop::testRename: + ;; 'spyFileRenamed.count() >= 1' returned FALSE. + "testdesktop" + "testimagebackend" "testimagefinder" "testimagefrontend" @@ -2850,6 +2889,7 @@ hardware management, and a high degree of customizability.") (base32 "0jccrbpg0qdfys2gj789zfn0yilkwckd81d9nvpkppljv94p0gfa")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules)) (home-page "https://community.kde.org/Frameworks") (synopsis "Oxygen wallpapers for the KDE desktop") @@ -2887,7 +2927,9 @@ hardware management, and a high degree of customizability.") kwindowsystem libplasma qtdeclarative)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://invent.kde.org/plasma/print-manager") (synopsis "Manage print jobs and printers") (description @@ -2906,7 +2948,8 @@ hardware management, and a high degree of customizability.") (base32 "1ky4k1z24r6rbx3bg69w609nbdcnwzjpajm1xmhgr8li4khgd5x7")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules)) (inputs (list ki18n kwindowsystem diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 32c02874a9..f1b0001f0f 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -134,7 +134,9 @@ The main features of Dolphin are: kxmlgui breeze-icons ;; default icon set qt5compat)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://www.kde.org/") (synopsis "VCS-Plugins for Dolphin") (description "This package contains plugins that offer integration in @@ -253,6 +255,7 @@ This package is part of the KDE base applications module.") (base32 "1m3f4lpzwbrbdmp9237186x4p0w2rk1cz4a7nin38c8ll9sgrfb2")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:tests? #f #:configure-flags #~(list (string-append "-DQtWaylandScanner_EXECUTABLE=" #$(this-package-native-input "qtwayland") @@ -373,7 +376,9 @@ This package is part of the KDE administration module.") kwallet kwindowsystem kxmlgui)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kwalletmanager5/") (synopsis "Tool to manage passwords on KWallet") (description @@ -397,11 +402,15 @@ This package is part of the KDE administration module.") (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 (replace 'configure (lambda _ (invoke "qmake" (string-append "PREFIX=" #$output)))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) (replace 'install (lambda _ (install-file "spectacle-ocr-screenshot" @@ -455,7 +464,9 @@ as well as QR codes.") kwindowsystem libxkbcommon qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/yakuake/") (synopsis "Quad-style terminal emulator for KDE") (description "Yakuake is a drop-down terminal emulator based on KDE Konsole diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index bc79975bef..4b1d067c28 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -150,6 +150,7 @@ well as CD-ROM images.") (base32 "00jccpwvksyp2vr3fjxajs8d9d30rspg4zj6rnj8dai96alp303k")))) (build-system qt-build-system) + (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list ki18n-5 kxmlgui-5 @@ -254,7 +255,8 @@ well as CD-ROM images.") ksyntaxhighlighting qtdeclarative qtsvg)) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (home-page "https://invent.kde.org/utilities/fielding") (synopsis "REST API testing tool") (description @@ -344,7 +346,8 @@ your computer.") kcrash solid kwidgetsaddons)) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (home-page "https://invent.kde.org/utilities/isoimagewriter") (synopsis "Write hybrid ISO files onto USB disks") (description @@ -364,7 +367,8 @@ your computer.") "1448kiykab4lm2xkimapj11m7iqj6x7y2ly5mrw3c1092p56kvs2")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase)) + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -512,7 +516,8 @@ Kate's features include: libarchive shared-mime-info qt5compat)) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kbackup/") (synopsis "Backup program with an easy-to-use interface") (description @@ -570,7 +575,9 @@ drive, USB stick, etc (base32 "195lr8ik6w03kc6ma9zfz7ksg296rn48d1vryin087i9k783rrad")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules)) (inputs (list kbookmarks kcoreaddons kcrash ki18n kwidgetsaddons kxmlgui)) (home-page "https://apps.kde.org/kcharselect/") @@ -594,7 +601,8 @@ characters.") (base32 "0ffnw3hc2xngxryiyanaid7nh51fymahg4jbqf3w684wrn1v6gan")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list ktextwidgets knotifications @@ -633,7 +641,8 @@ shell scripts.") kio kwidgetsaddons kxmlgui)) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (home-page "https://invent.kde.org/utilities/keurocalc") (synopsis "Currency conversion tool") (description "This package provides a utility to handle currency @@ -682,7 +691,8 @@ with support for QR scanning.") (base32 "01dxajpx2959m3gk23cvjra1w7i70f49lvys3h034205dyi3qgnm")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list karchive kcoreaddons @@ -716,7 +726,8 @@ with support for QR scanning.") "1gncfnwadh11ipynfcrsh1vnk2g02c7scd5wanphi8i95jzak9jd")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:tests? #f + #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-gstreamer (lambda* _ (substitute* "CMakeLists.txt" @@ -763,7 +774,8 @@ with support for QR scanning.") (base32 "031jsvk060y9w0mh1ylq7cz9nzmikz7vm098nrb10m9bx2x4h13d")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools python-minimal)) (inputs (list kcrash kirigami @@ -799,6 +811,7 @@ combinations are distinct enough to be readable and accessible.") (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list qtcharts-5 qtdeclarative-5 qtserialport-5)) + (arguments (list #:tests? #f)) (home-page "https://invent.kde.org/libraries/atcore") (synopsis "Library for connection and management of 3D printers") (description @@ -818,7 +831,9 @@ the computer and 3D Printers.") (sha256 (base32 "0565x812jbq0j56750q03hmfai4fgdqjrxzw6k94c37ck0nvlfl5")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -867,7 +882,9 @@ artists to web-designers to people with low vision.") libxt phonon qtmultimedia)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kmousetool/") (synopsis "Automatic mouse click and mouse manipulation tool for the disabled") @@ -903,7 +920,9 @@ whom pressing buttons hurts.") kxmlgui breeze-icons ;; default icon set qtspeech)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kmouth/") (synopsis "Type-and-say frontend for speech synthesizers") (description "KMouth is a program which enables persons that cannot speak @@ -1027,7 +1046,8 @@ to save the times and resume them later.") (base32 "012f75afp7vjpp7wps4lzvcszj6a5y9yzv21wgh9zikcvvx9pdy9")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase)) + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1089,6 +1109,7 @@ great on your desktop.") (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs (list ktexteditor-5 imagemagick qtbase-5 qtx11extras)) + (arguments (list #:tests? #f)) (home-page "https://apps.kde.org/kxstitch/") (synopsis "Create and print cross stitch patterns") (description @@ -1210,6 +1231,7 @@ remind you to take a break now and then.") (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:tests? #f #:configure-flags #~(list "-DSMB4K_WITH_WS_DISCOVERY=ON"))) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1287,7 +1309,9 @@ Features: (sha256 (base32 "0v7hwz6xnp52fysbmqwrhjjcsr96bmw0a70n2kr2bq1hhh0zvf3h")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 3e96f343db..4fccab09ef 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -379,8 +379,7 @@ annotating features.") ;; fails with an unexpected exception. (list #:qtbase qtbase - #:configure-flags #~(list "-DBUILD_TESTING=off" - "-DFETCH_OTIO=off") + #:configure-flags #~(list "-DFETCH_OTIO=off") #:tests? #f #:phases #~(modify-phases %standard-phases @@ -486,6 +485,7 @@ expressions and let you evaluate and draw them.") (build-system qt-build-system) (arguments (list + #:tests? #f #:phases #~(modify-phases %standard-phases (add-after 'install 'wrap-qt-process-path @@ -535,9 +535,7 @@ such as addition, trigonometric functions or derivatives.") (base32 "1wiv509y80m6gf891yw55d9429a35axngi922k119zvxfk5641as")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase - #:configure-flags - #~(list "-DBUILD_TESTING=ON"))) + (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -891,7 +889,8 @@ and desktop experiences.") (base32 "888q3kkv2wq426w000iq14wy3a45rrnn0bmsdks6caz4vq04ccay")))) (build-system qt-build-system) (arguments - `(#:configure-flags (list "-DBUILD_TESTS=ON"))) ; disabled by default + `(#:tests? #f + #:configure-flags (list "-DBUILD_TESTS=ON"))) ; disabled by default (native-inputs (list bison doxygen extra-cmake-modules flex googletest)) (inputs @@ -921,7 +920,9 @@ expression library, that is used in Krita.") (list kcoreaddons ki18n kxmlgui)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/de/kcolorchooser/") (synopsis "Color selector utility") (description "KColorChooser is a utility to select a color.") @@ -950,7 +951,9 @@ expression library, that is used in Krita.") ktextwidgets kwidgetsaddons kxmlgui)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "http://kolourpaint.org/") (synopsis "Paint program for KDE") (description "KolourPaint is a paint program for KDE. It is useful for @@ -974,7 +977,7 @@ painting, image manipulating and icon editing.") (build-system qt-build-system) (arguments `(#:tests? #f - #:configure-flags (list "-DBUILD_TESTING=OFF -DCMAKE_CXX_FLAGS=-fPIC") + #:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIC") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-raqm (lambda _ @@ -1290,7 +1293,9 @@ submoduletest|cachetest|switchtest)"))))))) (base32 "1ajr7qaf4dcccl5pc09ywfa4mgrfpa3qq1w7x4lfmv82gvp7ld64")))) (build-system qt-build-system) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1464,7 +1469,8 @@ multi-floor indoor maps.") (base32 "17p63a9igpbcv0xdziaf3d30n88rj9474w9yx2cpvh0m2nrv3582")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase)) + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1543,7 +1549,8 @@ transport data and for performing public transport journey queries.") (base32 "06g43b1l72aghkhcn59ss8kjc4sammn5ii5x5sql34kmvgiwamwk")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase)) + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules)) (inputs @@ -1569,7 +1576,8 @@ for scanner hardware.") (base32 "1b0cbf4cq0ajl5xlpy75wj4p1zsri2igh23pswj8ysnrrk0pxg5w")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase)) + (list #:qtbase qtbase + #:tests? #f)) (native-inputs (list extra-cmake-modules)) (inputs @@ -1628,8 +1636,7 @@ different notification systems.") (arguments (list #:qtbase qtbase #:configure-flags - #~(list "-DBUILD_TESTING=ON" - (string-append "-DQtWaylandScanner_EXECUTABLE=" + #~(list (string-append "-DQtWaylandScanner_EXECUTABLE=" #$(this-package-native-input "qtwayland") "/lib/qt6/libexec/qtwaylandscanner") "-DKDE_INSTALL_LIBEXECDIR=libexec" @@ -1805,7 +1812,9 @@ to perform data analysis.") kstatusnotifieritem kxmlgui qt5compat)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://kde.org/applications/system/kdk") (synopsis "View Disk Usage") (description "KDiskFree displays the available file devices (hard drive @@ -1838,7 +1847,9 @@ unmount drives and view them in a file manager.") kconfigwidgets kstatusnotifieritem qt5compat)) - (arguments (list #:qtbase qtbase)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://kde.org/applications/utilities/ktimer") (synopsis "Countdown Launcher") (description "KTimer is a little tool to execute programs after some time. @@ -1862,6 +1873,7 @@ timers for each task can be started, stopped, changed, or looped.") (list extra-cmake-modules perl python qttools kdoctools)) (inputs (list qtbase karchive ki18n kio kxmlgui kdbusaddons)) + (arguments (list #:tests? #f)) ;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on ;; Python and PHP, respectively. These are optional and we ignore them ;; for now. @@ -2112,7 +2124,9 @@ PO template files.") (sha256 (base32 "0rpam31s5cvky4w3bb2qp1pjv0gm9f63a2jv6bcim7qnz050bvvn")))) (build-system cmake-build-system) - (arguments (list #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) + (arguments + (list #:tests? #f + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (native-inputs (list extra-cmake-modules)) (inputs @@ -2135,7 +2149,10 @@ Mobipocket e-books in Dolphin and other KDE apps.") (sha256 (base32 "073px490jvp5f2979ipzbjlw6qg55cfzisj1g3a1f9wwqshm3q5q")))) (build-system cmake-build-system) - (arguments (list #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) + (arguments + (list + #:tests? #f + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (native-inputs (list extra-cmake-modules)) (inputs @@ -2163,6 +2180,7 @@ picture metadata as EXIF/IPTC and XMP.") (inputs (list kdbusaddons kdnssd ki18n kio)) (arguments (list #:qtbase qtbase + #:tests? #f #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (home-page "https://apps.kde.org/kio_zeroconf/") diff --git a/gnu/packages/libftdi.scm b/gnu/packages/libftdi.scm index 02efcbbbc0..25db26793d 100644 --- a/gnu/packages/libftdi.scm +++ b/gnu/packages/libftdi.scm @@ -87,7 +87,6 @@ (string-append share "/doc/" #$name "-" #$version "/html")))))) - #:test-target "check" #:tests? #f)) ; tests fail without access to USB (native-inputs (list doxygen graphviz pkg-config python swig)) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index eb6dc9a844..61c43ceccb 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © 2024 hapster <o.rojon@posteo.net> ;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2025 Evgeny Pisemsky <mail@pisemsky.site> ;;; ;;; This file is part of GNU Guix. ;;; @@ -809,3 +810,39 @@ HID-Class devices.") (license:non-copyleft "https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt" "You are free to use cython-hidapi code for any purpose."))))) + +(define-public hidapitester + (package + (name "hidapitester") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/todbot/hidapitester") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pilnq01yd4974xicy6as330f5b74pnj9mn5gvg1s21f78lxx4is")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda _ + (install-file "hidapitester" + (string-append #$output "/bin"))))) + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "GIT_TAG=v" #$version)))) + (native-inputs (list pkg-config)) + (inputs (list hidapi eudev)) + (home-page "https://github.com/todbot/hidapitester") + (synopsis "Command-line program to exercise hidapi") + (description + "The hidapitester program is a simple, low-dependency command-line tool to test +out every API call in hidapi.") + (license license:gpl3))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4aa1684866..8dc546ad69 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -164,7 +164,6 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages netpbm) #:use-module (gnu packages networking) - #:use-module (gnu packages ninja) #:use-module (gnu packages nss) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) @@ -7900,9 +7899,8 @@ from the ntfs-3g package. It is meant to be used in initrds.") ;; Upstream uses the "ninja" build system and encourage distros ;; to do the same for consistency. - #:configure-flags (list "-GNinja" - - ,@(if (%current-target-system) + #:generator "Ninja" + #:configure-flags (list ,@(if (%current-target-system) `((string-append "-DPKG_CONFIG_EXECUTABLE=" (search-input-file @@ -7912,18 +7910,9 @@ from the ntfs-3g package. It is meant to be used in initrds.") '()) (string-append "-DRST2MAN_EXECUTABLE=" (search-input-file - %build-inputs "/bin/rst2man.py"))) - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (invoke "ninja" - "-j" (number->string (parallel-job-count))))) - (replace 'install - (lambda _ - (invoke "ninja" "install")))))) + %build-inputs "/bin/rst2man.py"))))) (native-inputs - (list ninja pkg-config python-wrapper python-docutils)) ;for 'rst2man' + (list pkg-config python-wrapper python-docutils)) ;for 'rst2man' (inputs (list libnl eudev)) (home-page "https://github.com/linux-rdma/rdma-core") @@ -8172,6 +8161,24 @@ not as a replacement for it.") #:configure-flags #~(list "-DINSTALL_KAUTH_HELPER=OFF" "-DQT6_BUILD=ON") #:qtbase qtbase + ;; The 'tst_models' and 'tst_callgraphgenerator' fail, with + ;; the later seemingly requiring sudo or access to the kernel + ;; trace points. + #:test-exclude + (string-append + "(" + (string-join + ;; The 'tst_models' expected output doesn't exactly + ;; match. + '("tst_models" + ;; The 'tst_callgraphgenerator' perf invocation + ;; fails when run in the build container. + "tst_callgraphgenerator" + ;; The 'tst_perfparser' test requires sudo/access + ;; to the kernel scheduler trace points. + "tst_perfparser") + "|") + ")") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-perfparser @@ -8207,28 +8214,7 @@ not as a replacement for it.") (substitute* "src/perfrecord.cpp" (("\"perf( )?\"" _ space) (string-append "\"" (search-input-file inputs "bin/perf") - (or space "") "\""))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; The 'tst_models' and 'tst_callgraphgenerator' fail, with - ;; the later seemingly requiring sudo or access to the kernel - ;; trace points. - (invoke "ctest" "-E" - (string-append - "(" - (string-join - ;; The 'tst_models' expected output doesn't exactly - ;; match. - '("tst_models" - ;; The 'tst_callgraphgenerator' perf invocation - ;; fails when run in the build container. - "tst_callgraphgenerator" - ;; The 'tst_perfparser' test requires sudo/access - ;; to the kernel scheduler trace points. - "tst_perfparser") - "|") - ")")))))))) + (or space "") "\"")))))))) (native-inputs (list extra-cmake-modules vulkan-headers)) @@ -10771,7 +10757,9 @@ set as @code{LD_PRELOAD} to override the C library file system functions.") #$(string-append "-DFALCOSECURITY_LIBS_VERSION=" version)) ;; Only the libsinsp test suite is run, as the one for libscap requires ;; elevated privileges. - #:test-target "run-unit-test-libsinsp" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-problematic-tests @@ -10781,6 +10769,10 @@ set as @code{LD_PRELOAD} to override the C library file system functions.") ;; exists in the build environment. (("TEST_F\\(usergroup_manager_test, system_lookup)") "TEST_F(usergroup_manager_test, DISABLED_system_lookup)")))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "run-unit-test-libsinsp" args))) (add-after 'install 'delete-src (lambda _ (delete-file-recursively @@ -11310,11 +11302,7 @@ modification of BPF objects on the system.") (build-system cmake-build-system) (arguments (list - #:configure-flags #~(list "-DBUILD_TESTING=ON") - ;; Only run the unit tests suite, as the other ones - ;; (runtime_tests, tools-parsing-test) require to run as - ;; 'root'. - #:test-target "bpftrace_test" + #:test-exclude "(runtime_tests|tools-parsing-test)" #:phases #~(modify-phases %standard-phases ;; This patch also fixes broken compilation due to improper detection @@ -11336,8 +11324,28 @@ modification of BPF objects on the system.") "runtime/call" "procmon.cpp") (("/bin/ls") - (which "ls"))))))))) - (native-inputs (list bison dwarves flex googletest xxd)) + (which "ls")))))) + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* '("tests/child.cpp") + (("/bin/sleep") + (search-input-file inputs "bin/sleep"))))) + (add-before 'check 'set-test-filter + (lambda _ + (setenv "GTEST_FILTER" + (string-join + (list ; "-" disables all following tests + "-ast.probe_name_uprobe" + "bpftrace.add_probes_uprobe_wildcard_file" + "bpftrace.add_probes_uprobe_wildcard_file_uprobe_multi" + "bpftrace.add_probes_usdt_wildcard" + "Parser.multiple_attach_points_kprobe" + "Parser.uretprobe_offset" + "semantic_analyser.builtin_functions" + "semantic_analyser.call_func" + "semantic_analyser.call_uaddr") + ":"))))))) + (native-inputs (list bison coreutils dwarves flex googletest xxd)) (inputs (list bcc clang-15 elfutils libbpf libiberty cereal)) (home-page "https://github.com/bpftrace/bpftrace") (synopsis "High-level tracing language for Linux eBPF") diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 0accbd4503..dd4f0ef791 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net> ;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022, 2024 Greg Hogan <code@greghogan.com> -;;; Copyright © 2022, 2024 John Kehayias <john.kehayias@protonmail.com> +;;; Copyright © 2022, 2024, 2025 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> @@ -277,7 +277,10 @@ until LLVM/Clang 14." (propagated-inputs (list llvm clang-runtime)) (arguments - `(#:configure-flags + `(;; TODO: enable tests. + #:tests? #f + + #:configure-flags (list "-DCLANG_INCLUDE_TESTS=True" ;; TODO: Use --gcc-install-dir when GCC_INSTALL_PREFIX is @@ -618,6 +621,7 @@ output), and Binutils.") (outputs '("out" "opt-viewer")) (arguments (list + #:tests? (not (target-x86-32?)) #:configure-flags #~(list ;; These options are required for cross-compiling LLVM according @@ -659,11 +663,19 @@ output), and Binutils.") "-DLLVM_PARALLEL_LINK_JOBS=1") ;cater to smaller build machines ;; Don't use '-g' during the build, to save space. #:build-type "Release" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ (chdir "llvm"))) + (replace 'check + (lambda* (#:rest args) + (setenv "HOME" "/tmp") + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "check-llvm" args))) (add-after 'install 'install-opt-viewer (lambda* (#:key outputs #:allow-other-keys) (let* ((opt-viewer-share (string-append #$output:opt-viewer @@ -701,6 +713,10 @@ of programming tools as well as libraries with equivalent functionality.") (source (llvm-monorepo version)) (arguments (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:tests? (not (target-x86-32?)) #:configure-flags #~(list ;; These options are required for cross-compiling LLVM according @@ -739,6 +755,11 @@ of programming tools as well as libraries with equivalent functionality.") (add-after 'unpack 'change-directory (lambda _ (chdir "llvm"))) + (replace 'check + (lambda* (#:rest args) + (setenv "HOME" "/tmp") + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "check-llvm" args))) (add-after 'install 'install-opt-viewer (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -749,9 +770,7 @@ of programming tools as well as libraries with equivalent functionality.") (rename-file (string-append out "/share/opt-viewer") opt-viewer-dir))))))) - (native-inputs - `(("python" ,python-wrapper) - ("perl" ,perl))))) + (native-inputs (list perl python-wrapper which)))) (define-public clang-runtime-15 (clang-runtime-from-llvm llvm-15)) @@ -798,14 +817,20 @@ of programming tools as well as libraries with equivalent functionality.") #~(list "-DLIBOMP_USE_HWLOC=ON" "-DOPENMP_TEST_C_COMPILER=clang" "-DOPENMP_TEST_CXX_COMPILER=clang++") - #:test-target "check-libomp" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'chdir-to-source-and-install-license (lambda _ (chdir "openmp") (install-file "LICENSE.TXT" - (string-append #$output "/share/doc"))))))) + (string-append #$output "/share/doc")))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "check-libomp" args)))))) (native-inputs (list clang-15 llvm-15 perl pkg-config python)) (inputs (list `(,hwloc "lib"))) (home-page "https://openmp.llvm.org") @@ -902,14 +927,14 @@ Library.") "0kvbr4j6ldpssiv7chgqra5y77n7jwbyxlwcl7z32v31f49jcybb")) (file-name (string-append "libomp-" version ".tar.xz")))) (arguments - '(#:configure-flags '("-DLIBOMP_USE_HWLOC=ON" - "-DOPENMP_TEST_C_COMPILER=clang" - "-DOPENMP_TEST_CXX_COMPILER=clang++" - - ;; Work around faulty target detection, fixed in 14: - ;; https://github.com/llvm/llvm-project/issues/52910 - "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF") - #:test-target "check-libomp")) + (substitute-keyword-arguments (package-arguments libomp-14) + ((#:configure-flags flags) + ;; Work around faulty target detection, fixed in 14: + ;; https://github.com/llvm/llvm-project/issues/52910 + #~(cons* "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" #$flags)) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'chdir-to-source-and-install-license))))) (native-inputs (modify-inputs (package-native-inputs libomp-14) (replace "clang" clang-13) @@ -932,6 +957,8 @@ Library.") (patches (search-patches "llvm-13-gcc-14.patch")))) (arguments (substitute-keyword-arguments (package-arguments llvm-13) + ;; Disable tests for old releases now compiled with newer GCC. + ((#:tests? _ #false) #false) ((#:phases phases) #~(modify-phases #$phases #$@(if (assoc "config" (package-native-inputs this-package)) @@ -942,6 +969,9 @@ Library.") "/bin/config.guess"))) (copy-file config.guess "cmake/config.guess"))))) #~()) + (add-after 'unpack 'delete-failing-tests + (lambda _ + (delete-file "test/DebugInfo/X86/vla-multi.ll"))) (add-before 'build 'shared-lib-workaround ;; Even with CMAKE_SKIP_BUILD_RPATH=FALSE, llvm-tblgen ;; doesn't seem to get the correct rpath to be able to run @@ -983,10 +1013,9 @@ Library.") "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0")) (file-name (string-append "libomp-" version ".tar.xz")))) (arguments - '(#:configure-flags '("-DLIBOMP_USE_HWLOC=ON" - "-DOPENMP_TEST_C_COMPILER=clang" - "-DOPENMP_TEST_CXX_COMPILER=clang++") - #:test-target "check-libomp")) + (substitute-keyword-arguments (package-arguments libomp-13) + ((#:configure-flags flags) + #~`(,@(delete "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" #$flags))))) (native-inputs (modify-inputs (package-native-inputs libomp-13) (replace "clang" clang-12) @@ -1271,7 +1300,12 @@ Library.") (uri (llvm-uri "llvm" version)) (sha256 (base32 - "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn")))))) + "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn")))) + (arguments + (substitute-keyword-arguments (package-arguments llvm-7) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'delete-failing-tests))))))) (define-public clang-runtime-6 (clang-runtime-from-llvm @@ -1320,7 +1354,7 @@ Library.") "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z")))) (outputs '("out")) (arguments - (substitute-keyword-arguments (package-arguments llvm) + (substitute-keyword-arguments (package-arguments llvm-6) ((#:phases phases) #~(modify-phases #$phases (add-before 'build 'shared-lib-workaround @@ -1661,30 +1695,30 @@ Library.") (define-public llvm-for-rocm (package - ;; Based on LLVM 14 as of v5.0.0 - (inherit llvm-14) + ;; Currently based on LLVM 19. + (inherit llvm-19) (name "llvm-for-rocm") - (version "5.6.0") ;this must match '%rocm-version' + (version "6.4.2") ;this must match '%rocm-version' (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/RadeonOpenCompute/llvm-project.git") + (url "https://github.com/ROCm/llvm-project.git") (commit (string-append "rocm-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1kg6q6aqijjrwaznj0gr3nd01gykrnqqnk8vz8wyfifr18l9jrgx")))) + "1j2cr362k7snsh5c1z38ikyihmjvy0088rj0f0dhng6cjwgysryp")))) (arguments - (substitute-keyword-arguments (package-arguments llvm-14) + (substitute-keyword-arguments (package-arguments llvm-19) ((#:configure-flags flags) - #~(list"-DLLVM_ENABLE_PROJECTS=llvm;clang;lld" - "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86" - "-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" - "-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DLLVM_VERSION_SUFFIX=")))) + #~(list "-DLLVM_ENABLE_PROJECTS=llvm;clang;lld" + "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86" + "-DCMAKE_SKIP_BUILD_RPATH=FALSE" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" + "-DBUILD_SHARED_LIBS:BOOL=TRUE" + "-DLLVM_VERSION_SUFFIX=")))) (properties `((hidden? . #t) - ,@(package-properties llvm-14))))) + ,@(package-properties llvm-19))))) @@ -1887,6 +1921,8 @@ misuse of libraries outside of the store."))) (build-system cmake-build-system) (arguments (list + ;; No access to a compiled llvm-lit since compiled separately from llvm. + #:tests? #f #:configure-flags #~(list "-DOPENMP_TEST_CXX_COMPILER=clang++") #:phases #~(modify-phases %standard-phases @@ -1921,7 +1957,6 @@ which highly leverage existing libraries in the larger LLVM project.") (build-system cmake-build-system) (arguments (list - #:test-target "check-cxx" #:tests? #f ;prohibitively expensive to run #:implicit-inputs? #f ;to avoid conflicting GCC headers #:configure-flags @@ -1934,11 +1969,18 @@ which highly leverage existing libraries in the larger LLVM project.") ;; as RUNPATH and don't attempt to patch it. ;; See also: https://gitlab.kitware.com/cmake/cmake/-/issues/22963 "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'enter-subdirectory (lambda _ - (chdir "runtimes")))))) + (chdir "runtimes"))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "check-cxx" args)))))) (native-inputs (modify-inputs (standard-packages) ;; Remove GCC from the build environment, to avoid its C++ @@ -2480,7 +2522,6 @@ LLVM bitcode files.") ;; FIXME: 79 tests fail, out of ~200 (see: ;; https://github.com/root-project/cling/issues/534) #:tests? #f - #:test-target "check-cling" #:configure-flags #~(list (string-append "-DCLING_CXX_PATH=" (search-input-file %build-inputs "bin/g++")) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 59598f20c5..7ebd79e6f6 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -984,7 +984,6 @@ spirit of the Lua C API and thus degrade performance.") `(#:configure-flags ;; lua pc file in CMakeLists.txt is lua5.3.pc '("-DLUA_PC_CFG=lua;lua-5.3;lua-5.1") - #:test-target "all" #:phases ;; This is a header only library (modify-phases %standard-phases diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 3d29913703..4d8ff4b5e3 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -683,7 +683,7 @@ Performance is achieved by using the LLVM JIT compiler.") (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((tag "b5013")) + (let ((tag "b6056")) (package (name "llama-cpp") (version (string-append "0.0.0-" tag)) @@ -695,7 +695,7 @@ Performance is achieved by using the LLVM JIT compiler.") (commit tag))) (file-name (git-file-name name tag)) (sha256 - (base32 "0s73dz871x53dr366lkzq19f677bwgma2ri8m5vhbfa9p8yp4p3r")))) + (base32 "1y9blrd7c8snazjmjkzj0148v328pigncvf1l9g1ih735b67zpd0")))) (build-system cmake-build-system) (arguments (list @@ -730,11 +730,23 @@ Performance is achieved by using the LLVM JIT compiler.") #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) - (substitute* "ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp" - (("\"/bin/sh\"") - (string-append "\"" (search-input-file inputs "/bin/sh") "\""))))) + (substitute* (format #f "~a~a" + "ggml/src/ggml-vulkan/vulkan-shaders/" + "vulkan-shaders-gen.cpp") + (("\"/bin/sh\"") + (string-append "\"" (search-input-file inputs "/bin/sh") + "\""))))) (add-after 'unpack 'fix-tests (lambda _ + ;; test-thread-safety downloads ML model from network, + ;; cannot run in Guix build environment + (substitute* '("tests/CMakeLists.txt") + (("llama_build_and_test\\(test-thread-safety.cpp.*") + "") + ;; error while handling argument "-m": expected value for + ;; argument + (("llama_build_and_test\\(test-arg-parser.cpp.*") + "")) ;; test-eval-callback downloads ML model from network, cannot ;; run in Guix build environment (substitute* '("examples/eval-callback/CMakeLists.txt") @@ -800,9 +812,15 @@ independently to be able to run a LLaMA model.") "-DGGML_AVX2=OFF" "-DGGML_AVX512=OFF" "-DGGML_AVX512_VBMI=OFF" - "-DGGML_AVX512_VNNI=OFF") + "-DGGML_AVX512_VNNI=OFF" + "-DGGML_VULKAN=ON") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp" + (("\"/bin/sh\"") + (string-append "\"" (search-input-file inputs "/bin/sh") "\""))))) #$@(if (not (target-64bit?)) '((add-after 'unpack 'skip-failing-tests (lambda _ @@ -823,9 +841,10 @@ independently to be able to run a LLaMA model.") (("\\$\\{VAD_TARGET\\} PROPERTIES LABELS \"base;en\"") "${VAD_TEST} PROPERTIES DISABLED true"))))))) (native-inputs - (list pkg-config)) + (list pkg-config shaderc)) (inputs - (list openblas sdl2 git)) + (list openblas sdl2 git spirv-headers spirv-tools + vulkan-headers vulkan-loader)) (synopsis "OpenAI's Whisper model in C/C++") (description "This package is a high-performance inference of OpenAI's @@ -843,7 +862,7 @@ without dependencies, with @item C-style API @end itemize") (properties '((tunable? . #true))) ;use AVX512, FMA, etc. when available - (home-page "https://github.com/ggerganov/whisper.cpp") + (home-page "https://github.com/ggml-org/whisper.cpp/") (license license:expat))) (define-public mcl @@ -4800,7 +4819,6 @@ TensorFlow.js, PyTorch, and MediaPipe.") (build-system cmake-build-system) (arguments (list - #:cmake cmake-next #:configure-flags ''("-DFBGEMM_LIBRARY_TYPE=shared") ;; Tests require AVX2 or AVX-512 instructions @@ -4869,7 +4887,6 @@ the tensors contained therein.") (build-system cmake-build-system) (arguments (list - #:test-target "cpptest" #:configure-flags #~(list "-DUSE_OPENCL=ON" "-DUSE_VULKAN=ON" @@ -4889,11 +4906,11 @@ the tensors contained therein.") #:phases #~(modify-phases %standard-phases (replace 'check - (lambda* (#:key source test-target tests? #:allow-other-keys) + (lambda* (#:key source tests? #:allow-other-keys) (when tests? (begin (invoke "make" "-j" - (number->string (parallel-job-count)) test-target) + (number->string (parallel-job-count)) "cpptest") ;; Disable below the actual run of the tests because ;; several fail due to platform variations (for example, ;; fp16 tests fail because not supported on CPUs). @@ -6365,7 +6382,6 @@ Jax, PyTorch and TensorFlow — with a seamless integration between them.") (build-system cmake-build-system) (arguments (list - #:test-target "ctranslate2_test" ;; XXX: mkl and openblas seem incompatible. #:configure-flags `(list "-DBUILD_TESTS=ON" "-DWITH_ACCELERATE=OFF" @@ -6374,7 +6390,16 @@ Jax, PyTorch and TensorFlow — with a seamless integration between them.") "-DWITH_CUDA=OFF" "-DWITH_CUDNN=OFF" "-DWITH_MKL=OFF" - "-DWITH_OPENBLAS=ON"))) + "-DWITH_OPENBLAS=ON") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "ctranslate2_test" args)))))) (native-inputs (list libomp cxxopts spdlog diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 68611d32f2..0627370086 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -149,7 +149,6 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) - #:use-module (gnu packages ninja) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages openldap) #:use-module (gnu packages pcre) @@ -1012,49 +1011,30 @@ mailpack. What can alterMIME do? (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "17m99llggkg7xg72k8xaf7iipax7sgfhqa2a1qnlylndwa42f57b")) - (modules '((guix build utils))) - (snippet - '(begin - ;; https://github.com/astroidmail/astroid/pull/685 - (substitute* "tests/test_composed_message.cc" - (("\\\\n\\.\\.\\.") "\\n...\\n")))))) + (base32 "17m99llggkg7xg72k8xaf7iipax7sgfhqa2a1qnlylndwa42f57b")))) (build-system cmake-build-system) (arguments - `(#:modules ((guix build cmake-build-system) + `(#:parallel-tests? #f + ;; This test relies on the plugins and the test suite + ;; cannot find the Astroid module. + ;; gi.require_version ('Astroid', '0.2') + ;; ValueError: Namespace Astroid not available + #:test-exclude "markdown" + #:modules ((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils) (ice-9 match)) #:imported-modules ((guix build glib-or-gtk-build-system) ,@%cmake-build-system-modules) - #:configure-flags (list "-GNinja") + #:generator "Ninja" #:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-markdown-test - ;; This test relies on the plugins and the test suite - ;; cannot find the Astroid module. - ;; gi.require_version ('Astroid', '0.2') - ;; ValueError: Namespace Astroid not available - (lambda _ - (substitute* "tests/CMakeLists.txt" - ((".*markdown.*") "")))) - (replace 'build - (lambda _ - (invoke "ninja" "-j" (number->string (parallel-job-count))))) (add-before 'check 'start-xserver (lambda* (#:key inputs #:allow-other-keys) (let ((xorg-server (assoc-ref inputs "xorg-server"))) (setenv "HOME" (getcwd)) (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) (setenv "DISPLAY" ":1")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (invoke "ctest" ".")))) - (replace 'install - (lambda _ - (invoke "ninja" "install"))) (add-after 'install 'wrap-with-GI_TYPELIB_PATH (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -1077,7 +1057,6 @@ mailpack. What can alterMIME do? (list glib-networking gsettings-desktop-schemas gnupg - ninja pkg-config ronn-ng w3m @@ -2808,7 +2787,8 @@ separation to safely deliver mail in multi-user setups.") ;; patch 24. (patches (search-patches "procmail-ambiguous-getline-debian.patch" "procmail-CVE-2014-3618.patch" - "procmail-CVE-2017-16844.patch")))) + "procmail-CVE-2017-16844.patch" + "procmail-gcc-14.patch")))) (arguments `(#:phases (modify-phases %standard-phases (replace 'configure diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 85a9db1a3c..a85b695883 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -485,8 +485,6 @@ convert HTML to Markdown.") (base32 "0llj68l9rxdhral0zyv0bz6yzqsxgq8d3730082sl3kx78lsq5qq")))) (build-system cmake-build-system) - (arguments - '(#:test-target "test")) (native-inputs (list python)) (synopsis "CommonMark Markdown reference implementation") (description @@ -543,8 +541,7 @@ CommonMark C library libcmark. It closely follows the original API.") (base32 "1apy9i76rgs0bmgdlpjszv0fpqhlap2s12m68wvnsv8j3fsqc90y")))) (arguments - (list #:test-target "test" - #:phases #~(modify-phases %standard-phases + (list #:phases #~(modify-phases %standard-phases (add-after 'install 'install-config (lambda _ ;; XXX: cmark-gfm-core-extensions.h includes this file. diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 3e4439c60d..dad9d4c4d5 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -481,9 +481,7 @@ enough to be used effectively as a scientific calculator.") "0csy4pjw1p8rp6g5qxi2h0ychhhp1fldv7gb761627fs2mclw9gv")))) (build-system cmake-build-system) (arguments - '(#:test-target "test" - #:configure-flags '("-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON"))) + '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) (synopsis "Conversion routines for IEEE doubles") (description "The double-conversion library provides binary-decimal and decimal-binary @@ -1200,8 +1198,7 @@ large scale eigenvalue problems.") "-DCBLAS=ON" "-DLAPACKE=ON" ;; Build the 'LAPACKE_clatms' functions. - "-DLAPACKE_WITH_TMG=ON" - "-DBUILD_TESTING=ON"))) + "-DLAPACKE_WITH_TMG=ON"))) (synopsis "Library for numerical linear algebra") (description "LAPACK is a Fortran 90 library for solving the most commonly occurring @@ -3253,8 +3250,6 @@ includes a complete LAPACK implementation.") (sha256 (base32 "0xxqjz4lba57vn65m2k5jxrz0v7y6jwnhxwg6njd4vrafv5w17yv")))) - (arguments - (list #:configure-flags #~(list "-DBUILD_TESTING=ON"))) (native-inputs (list catch2-3.8)) (build-system cmake-build-system) @@ -5454,7 +5449,8 @@ implemented in ANSI C, and MPI for communications.") (list flex bison gfortran)) (outputs '("out" "metis")) (arguments - (list #:configure-flags #~'("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64" + (list #:parallel-tests? #f + #:configure-flags #~'("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64" "-DBUILD_PTSCOTCH=OFF") #:phases #~(modify-phases %standard-phases @@ -5549,6 +5545,7 @@ bio-chemistry.") (build-system cmake-build-system) (arguments (list + #:tests? #f #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" #$@(if (target-x86?) @@ -8115,8 +8112,7 @@ supports compressed MAT files, as well as newer (version 7.3) MAT files.") (arguments (list #:configure-flags - #~(list "-DBUILD_TESTING=ON" - ;; By default, Vc will optimize for the CPU of the build machine. + #~(list ;; By default, Vc will optimize for the CPU of the build machine. ;; Setting this to "none" makes it create portable binaries. See ;; "cmake/OptimizeForArchitecture.cmake". "-DTARGET_ARCHITECTURE=none") @@ -8801,6 +8797,7 @@ reduction.") (inputs (list boost glu mesa qtbase-5)) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (synopsis "Toolset for the mCRL2 formal specification language") (description "@dfn{mCRL2} (micro Common Representation Language 2) is a formal @@ -8819,7 +8816,8 @@ analysed.") (inputs (list boost)) (arguments - '(#:configure-flags '("-DMCRL2_ENABLE_GUI_TOOLS=OFF"))))) + (list #:tests? #f + #:configure-flags #~(list "-DMCRL2_ENABLE_GUI_TOOLS=OFF"))))) (define-public tcalc (package @@ -10328,7 +10326,6 @@ community detection algorithm.") (arguments (list #:build-type "Release" - #:test-target "test" #:configure-flags #~(list "-DENABLE_TESTING=ON" "-DSTATS=ON") #:phases #~(modify-phases %standard-phases @@ -10644,16 +10641,23 @@ projects up to the certification of critical software.") (base32 "0c88gc72j3zggyk4yrrip6i0v7xkx97l140vpy3xhxs2i7xy1461")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_DOC=ON" - "-DBUILD_TESTING=ON") - ;; The default "check" target also includes examples and benchmarks. - #:test-target "check-testsuite" - #:phases - (modify-phases %standard-phases - (add-after 'build 'build-doc - (lambda _ - (invoke "make" "-j" (number->string (parallel-job-count)) - "blitz-doc")))))) + (list + #:configure-flags #~(list "-DBUILD_DOC=ON") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda _ + (invoke "make" "-j" (number->string (parallel-job-count)) + "blitz-doc"))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + ;; The default "check" target also includes examples and + ;; benchmarks. + #:test-target "check-testsuite" args)))))) (native-inputs (list python texinfo)) (synopsis "C++ template class library for multidimensional arrays") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a72596e17b..8a32f2a75a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -414,17 +414,12 @@ conferencing.") (arguments `(#:configure-flags (list "-DBUILD_EXAMPLES=false" "-DWITH_GSTREAMER=true") - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" - (string-join ;; These tests use the network. - (list "tst_qxmppiceconnection" - "tst_qxmppcallmanager" - "tst_qxmpptransfermanager") - "|")))))))) + #:test-exclude + (string-join ;; These tests use the network. + (list "tst_qxmppiceconnection" + "tst_qxmppcallmanager" + "tst_qxmpptransfermanager") + "|"))) (native-inputs (list pkg-config)) (inputs @@ -574,8 +569,8 @@ your private keys, no previous conversation is compromised.") (base32 "0z5p03vk15i6h870azfjgyfgxhv31q2vq6rfhnybrnkxq2wqzwhk")))) (arguments - `(;; Required for proper linking and for tests to run. - #:configure-flags '("-DBUILD_SHARED_LIBS=on" "-DBUILD_TESTING=1"))) + `(;; Required for proper linking. + #:configure-flags '("-DBUILD_SHARED_LIBS=on"))) (build-system cmake-build-system) (inputs (list ;; Required for tests: check openssl)) @@ -633,9 +628,10 @@ by Dino to provide OMEMO support."))) (git-file-name name version)) (sha256 (base32 "0b02b9flri374f8aw6xfz7mm9s57rb7393r8mdphv7kcsf76i7i5")))) - (build-system cmake-build-system) + (build-system gnu-build-system) (arguments - `(#:phases (modify-phases %standard-phases + `(#:test-target "test" + #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -665,15 +661,17 @@ It implements the necessary interfaces using @code{libgcrypt} and (git-file-name name version)) (sha256 (base32 "1q3vyj8zk3vm0a4v6w8qya5dhk2yw04bga8799a0zl6907nf122k")))) - (build-system cmake-build-system) + (build-system gnu-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "CC" "gcc") - (setenv "PREFIX" out))))) - #:parallel-tests? #f)) + (list + #:parallel-tests? #f + #:test-target "test" + #:phases #~(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CC" "gcc") + (setenv "PREFIX" out))))))) (native-inputs (list cmocka pkg-config)) (inputs (list glib libgcrypt minixml sqlite)) (synopsis "OMEMO C library") @@ -1149,7 +1147,8 @@ control of your private keys, no previous conversation is compromised.") "06bb6c2nciwbknfschxd2fjkpigd6i0zgwl6jiz5lm7gcadssrdy")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:tests? #f + #:configure-flags (list "-DWANT_CYRUS=ON" "-DWANT_I18N=ON" "-DWANT_PERL=ON" @@ -2406,7 +2405,6 @@ notifications, and Python scripting support.") (list olm openssl qtkeychain-qt6 qtmultimedia)) (arguments (list #:qtbase qtbase - #:cmake cmake-next #:configure-flags #~(list "-DBUILD_TESTING=ON" "-DBUILD_SHARED_LIBS=ON") @@ -2823,10 +2821,11 @@ support for high performance Telegram Bot creation.") (git-file-name name version)) (sha256 (base32 "1ipd9gwh04wbqv6c10yxi02lc2yjsr02hwjycgxhl4r9x8b33psd")))) - (build-system cmake-build-system) + (build-system gnu-build-system) (arguments (list #:parallel-tests? #f + #:test-target "test" #:phases #~(modify-phases %standard-phases (replace 'configure @@ -2879,11 +2878,18 @@ asynchronicity.") (base32 "06y3mh1d1mks6d0ynxp3980g712nkf8l5nyljpybsk326b246hg9")))) (arguments - `(#:test-target "tests" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ (chdir "cpp")))))) + (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ (chdir "cpp"))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "tests" args)))))) (build-system cmake-build-system) (native-inputs (list googletest pkg-config)) @@ -2977,6 +2983,7 @@ as well as on desktop platforms. It's based on libpurple and ModemManager.") (build-system cmake-build-system) (arguments (list + #:tests? #f #:configure-flags #~(list "-DWITH_WEBSOCKETS=ON"))) (inputs (list openssl libxslt libwebsockets-for-mosquitto)) diff --git a/gnu/packages/mold.scm b/gnu/packages/mold.scm index 47b577cef1..5650b075b4 100644 --- a/gnu/packages/mold.scm +++ b/gnu/packages/mold.scm @@ -61,8 +61,7 @@ #:configure-flags #~(list #$@(if (target-64bit?) '("-DMOLD_USE_SYSTEM_MIMALLOC=ON") '("-DMOLD_USE_MIMALLOC=OFF")) - "-DMOLD_USE_SYSTEM_TBB=ON" - "-DBUILD_TESTING=ON") + "-DMOLD_USE_SYSTEM_TBB=ON") #:phases #~(modify-phases %standard-phases (add-before 'configure 'force-system-xxhash diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index d2b97372d1..884ed86cce 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -668,8 +668,7 @@ command-line tool.") (arguments `(#:tests? #f ; tests require googletest *sources* ;;#:configure-flags '("-DBUILD_TESTS=ON") ; for building the tests - #:configure-flags '("-DBUILD_TOOLS=ON") ; for fpcalc - #:test-target "check")) + #:configure-flags '("-DBUILD_TOOLS=ON"))) ; for fpcalc (inputs ;; requires one of FFmpeg (prefered), FFTW3 or vDSP ;; use the same ffmpeg version as for acoustid-fingerprinter @@ -828,7 +827,7 @@ simple to use yet fully featured.") (,(string-append (assoc-ref inputs "gtk+") "/share/glib-2.0/schemas")))))))))) (native-inputs - (list pkg-config cmake)) + (list pkg-config cmake-minimal)) (inputs (list glib gtk+ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1706b0d649..8e7394946e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -537,27 +537,34 @@ enables iPod support in music players such as Clementine.") #:directories? #t)))))) (build-system cmake-build-system) (arguments - '(#:test-target "clementine_test" - #:configure-flags - (list ;; Requires unpackaged "projectm" - "-DENABLE_VISUALISATIONS=OFF" - ;; Otherwise it may try to download a non-free library at run-time. - ;; TODO In an origin snippet, remove the code that performs the - ;; download. - "-DHAVE_SPOTIFY_DOWNLOADER=FALSE" - ;; Clementine checks that the taglib version is higher than 1.11, - ;; because of https://github.com/taglib/taglib/issues/864. Remove - ;; this flag when 1.12 is released. - "-DUSE_SYSTEM_TAGLIB=TRUE") - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) - (wrap-program (string-append out "/bin/clementine") - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix - (,gst-plugin-path))))))))) + (list + #:configure-flags + #~(list ;; Requires unpackaged "projectm" + "-DENABLE_VISUALISATIONS=OFF" + ;; Otherwise it may try to download a non-free library at run-time. + ;; TODO In an origin snippet, remove the code that performs the + ;; download. + "-DHAVE_SPOTIFY_DOWNLOADER=FALSE" + ;; Clementine checks that the taglib version is higher than 1.11, + ;; because of https://github.com/taglib/taglib/issues/864. Remove + ;; this flag when 1.12 is released. + "-DUSE_SYSTEM_TAGLIB=TRUE") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "clementine_test" args))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/clementine") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix + (,gst-plugin-path))))))))) (native-inputs (list gettext-minimal googletest @@ -620,7 +627,6 @@ playing your music.") (build-system cmake-build-system) (arguments (list - #:cmake cmake ;needs 3.25 #:tests? #false ;there are none #:phases #~(modify-phases %standard-phases @@ -769,24 +775,31 @@ Winamp/XMMS skins.") #:directories? #t)))))) (build-system qt-build-system) (arguments - `(#:qtbase ,qtbase - #:test-target "run_strawberry_tests" - #:configure-flags - `("-DBUILD_WITH_QT6=ON") - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/strawberry") - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix - (,(getenv "GST_PLUGIN_SYSTEM_PATH")))))) - (add-before 'check 'pre-check - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (system (format #f "~a :1 &" - (search-input-file (or native-inputs inputs) - "bin/Xvfb"))) - (setenv "DISPLAY" ":1") - (setenv "HOME" (getcwd))))))) + (list + #:qtbase qtbase + #:configure-flags + #~(list "-DBUILD_WITH_QT6=ON") + #:modules '((guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (system (format #f "~a :1 &" + (search-input-file (or native-inputs inputs) + "bin/Xvfb"))) + (setenv "DISPLAY" ":1") + (setenv "HOME" (getcwd)))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "run_strawberry_tests" args))) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/strawberry") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix + (,(getenv "GST_PLUGIN_SYSTEM_PATH"))))))))) (native-inputs (list bash-minimal gettext-minimal @@ -1009,7 +1022,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") (base32 "1i5gz5zck8s0kskjgnx9c75gh7zx0kbjsqzl2765f99p9svprirq")))) (build-system qt-build-system) (arguments - `(#:test-target "tests" + `(#:tests? #f ; require audio subsystem #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-data-directory @@ -5992,10 +6005,7 @@ the electronic or dubstep genre.") "0zn9v4lxjpnpdlpnv2px8ch3z0xagmqlvff5pd39pss3mxfp32g0")))) (build-system cmake-build-system) (arguments - (list #:configure-flags - (if (%current-target-system) - #~(list "-DBUILD_TESTING=OFF") - #~(list "-DBUILD_TESTING=ON")))) + (list #:tests? (not (%current-target-system)))) ; run unless cross-compiling (native-inputs (list googletest)) (home-page "https://github.com/pedrolcl/sonivox") @@ -6083,7 +6093,14 @@ for the DSSI Soft Synth Interface. A brief list of features: version ".tar.gz")) (sha256 (base32 "10mj1hwv1598nsi7jw5di0pfcwk36g4rr6kl7gi45m7ak8f8ypnx")))) - (arguments `(#:test-target "check")) + (arguments + (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check (assoc-ref gnu:%standard-phases 'check))))) (build-system cmake-build-system) (home-page "https://musicbrainz.org/doc/libdiscid") (synopsis "Disc id reader library") @@ -7971,28 +7988,31 @@ midi devices to JACK midi devices.") (file-name (git-file-name name version)))) (arguments (list - #:test-target "check" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases - ;; This package does not use the perl-build-system, so we have to - ;; manually set up the Perl environment used by the test suite. - (add-before 'check 'setup-perl-environment - (lambda* (#:key inputs #:allow-other-keys) - (let* ((perl-list-moreutils-lib - (string-append #$(this-package-native-input "perl-list-moreutils") - "/lib/perl5/site_perl/" - #$(package-version perl))) - (perl-exporter-tiny-lib - (string-append #$(this-package-native-input "perl-exporter-tiny") - "/lib/perl5/site_perl/" - #$(package-version perl))) - (perl-test-deep-lib - (string-append #$(this-package-native-input "perl-test-deep") - "/lib/perl5/site_perl/" - #$(package-version perl)))) - (setenv "PERL5LIB" (string-append perl-list-moreutils-lib ":" - perl-exporter-tiny-lib ":" - perl-test-deep-lib)))))))) + ;; This package does not use the perl-build-system, so we have to + ;; manually set up the Perl environment used by the test suite. + (add-before 'check 'setup-perl-environment + (lambda* (#:key inputs #:allow-other-keys) + (let* ((perl-list-moreutils-lib + (string-append #$(this-package-native-input "perl-list-moreutils") + "/lib/perl5/site_perl/" + #$(package-version perl))) + (perl-exporter-tiny-lib + (string-append #$(this-package-native-input "perl-exporter-tiny") + "/lib/perl5/site_perl/" + #$(package-version perl))) + (perl-test-deep-lib + (string-append #$(this-package-native-input "perl-test-deep") + "/lib/perl5/site_perl/" + #$(package-version perl)))) + (setenv "PERL5LIB" (string-append perl-list-moreutils-lib ":" + perl-exporter-tiny-lib ":" + perl-test-deep-lib))))) + (replace 'check (assoc-ref gnu:%standard-phases 'check))))) (build-system cmake-build-system) (inputs (list libogg)) @@ -8226,13 +8246,19 @@ Renoise, VCV Rack, or SuperCollider.") (build-system qt-build-system) (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 (lambda _ (substitute* "samplebrain.pro" (("\\/usr") #$output)) - (invoke "qmake")))))) + (invoke "qmake"))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'check (assoc-ref gnu:%standard-phases 'check)) + (replace 'install (assoc-ref gnu:%standard-phases 'install))))) (inputs (list fftw liblo libsndfile portaudio)) (home-page "https://thentrythis.org/projects/samplebrain/") (synopsis "Sample mashing synthesizer designed by Aphex Twin") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 19d09cf603..1db090b1a3 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -726,7 +726,8 @@ from any network device in any of three ASCII graph formats.") (base32 "1zr1l9zkai7rpw9cn5j9h4zrv08hgpfmwscwyscf2j4cgwf0rxrr")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:parallel-tests? #f + #:configure-flags (list (string-append "-DCMAKE_INSTALL_BINDIR=" (assoc-ref %outputs "out") "/bin") @@ -3887,7 +3888,10 @@ never see any machines other than the one Dante is running on.") (inputs (list asio catch-framework openssl)) (arguments - `(#:configure-flags + `(;; Running parallel tests results in "bind: Address already in use" error + ;; in test service_status_feature_test_suite. + #:parallel-tests? #f + #:configure-flags '("-DBUILD_SSL=NO") #:phases (modify-phases %standard-phases @@ -3932,6 +3936,8 @@ communication over HTTP.") (build-system cmake-build-system) (arguments (list + ;; Error when tests are run in parallel: "bind: Address already in use". + #:parallel-tests? #f #:configure-flags #~(list "-DRESTINIO_INSTALL=ON" "-DRESTINIO_TEST=ON" @@ -4136,7 +4142,6 @@ A very simple IM client working over the DHT. (list #:configure-flags #~(list "-DBUILD_DEPENDENCIES=OFF" "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON" "-DDNC_SYSTEMD=OFF") #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index 398c4be10f..c4cd2fd55f 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -25,61 +25,72 @@ #:use-module ((guix licenses) #:select (asl2.0 expat)) #:use-module (guix gexp) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages bash) - #:use-module (gnu packages python)) + #:use-module (gnu packages python) + #:use-module (gnu packages re2c) + #:use-module (srfi srfi-1)) -(define-public ninja - (package - (name "ninja") - (version "1.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ninja-build/ninja") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14kshkxdn833nkz2qkzb3w531dcqj6haad90gxj70ic05lb7zx9f")))) - (build-system gnu-build-system) - (inputs (list python-wrapper)) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (substitute* "src/subprocess-posix.cc" - (("/bin/sh") (which "sh"))) - (substitute* "src/subprocess_test.cc" - (("/bin/echo") (which "echo"))))) - (replace 'build - (lambda _ - (invoke "./configure.py" "--bootstrap"))) - (replace 'check - (lambda _ - (invoke "./configure.py") - (invoke "./ninja" "ninja_test") - (invoke "./ninja_test"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (doc (string-append out "/share/doc/ninja"))) - (install-file "ninja" bin) - (install-file "doc/manual.asciidoc" doc))))))) - (home-page "https://ninja-build.org/") - (synopsis "Small build system") - (description - "Ninja is a small build system with a focus on speed. It differs from +(define-public ninja/pinned + (hidden-package + (package + (name "ninja") + (version "1.13.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ninja-build/ninja") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vil4mz0h1z39d2airzdi8cia8xhn3n5p94pv4sd3mqk0pkha40s")))) + (build-system gnu-build-system) + (inputs (list python-wrapper re2c)) + (arguments + '(; Tests now require googletest, which is a circular dependency. + #:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* "src/subprocess-posix.cc" + (("/bin/sh") (which "sh"))) + (substitute* "src/subprocess_test.cc" + (("/bin/echo") (which "echo"))))) + (replace 'build + (lambda _ + (invoke "./configure.py" "--bootstrap"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./configure.py") + (invoke "./ninja" "ninja_test") + (invoke "./ninja_test")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/ninja"))) + (install-file "ninja" bin) + (install-file "doc/manual.asciidoc" doc))))))) + (home-page "https://ninja-build.org/") + (synopsis "Small build system") + (description + "Ninja is a small build system with a focus on speed. It differs from other build systems in two major respects: it is designed to have its input files generated by a higher-level build system, and it is designed to run builds as fast as possible.") - (license asl2.0))) + (license asl2.0)))) + +(define-public ninja + (package/inherit ninja/pinned + (properties (alist-delete 'hidden? (package-properties ninja/pinned))))) (define-public samurai (package diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 9b8de13794..40fa5981fe 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -115,9 +115,7 @@ (arguments (list #:tests? #f ;The regression tests require a lot more dependencies. #:configure-flags - #~(list "-DBUILD_EXAMPLES=OFF" "-DBUILD_TESTS=OFF" - ;; CTest needs this to be turned off. - "-DBUILD_TESTING=OFF"))) + #~(list "-DBUILD_EXAMPLES=OFF" "-DBUILD_TESTS=OFF"))) (native-inputs (list python-wrapper)) (propagated-inputs (list opencl-headers)) (home-page "https://github.khronos.org/OpenCL-CLHPP/") diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index 998d9b47ae..722cc0ffb7 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages python) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix utils)) @@ -52,7 +53,21 @@ "1ymmcrinp0prlxsmxmwdjjl4kgaj7wzq39d5b1q2apgg94yfdhqb")))) (build-system cmake-build-system) (arguments - `(#:test-target "tests")) + (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys #:rest args) + (when tests? + (apply (assoc-ref gnu:%standard-phases 'check) + #:tests? tests? #:test-target "tests" args) + (for-each + (lambda (file) + (invoke file)) + (find-files "tests" "UTest$")))))))) (inputs (list boost)) (native-inputs @@ -84,14 +99,29 @@ utilities use for typical programming tasks in multiple OpenCog projects.") "0vxzhszb0z8081li38hid07a5axzxyflsmq1mcn4b1k4z1j8ggch")))) (build-system cmake-build-system) (arguments - `(#:test-target "tests" - #:configure-flags - (list (string-append "-DGUILE_INCLUDE_DIR=" - (assoc-ref %build-inputs "guile") - "/include/guile/2.2/") - (string-append "-DGUILE_SITE_DIR=" - (assoc-ref %outputs "out") - "/share/guile/site/2.2/")))) + (list + #:configure-flags + #~(list (string-append "-DGUILE_INCLUDE_DIR=" #$guile-2.2 + "/include/guile/2.2/") + (string-append "-DGUILE_SITE_DIR=" #$output + "/share/guile/site/2.2/")) + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys #:rest args) + (when tests? + (apply (assoc-ref gnu:%standard-phases 'check) + #:tests? tests? #:test-target "tests" args) + ;; Failing tests. + (for-each delete-file + '("tests/matrix/VectorAPIUTest" + "tests/scm/MultiAtomSpaceUTest")) + (setenv "GUILE_LOAD_PATH" ".:opencog/scm") + (for-each invoke + (find-files "tests" "UTest$")))))))) (inputs (list boost cogutil gmp guile-2.2 postgresql)) (native-inputs @@ -126,14 +156,26 @@ features not otherwise available.") "1h0vcxb6n5dc654xqinqcxc7dxwcs6bsywgir8rhrqiykk760mzl")))) (build-system cmake-build-system) (arguments - `(#:test-target "tests" - #:configure-flags - (list (string-append "-DGUILE_INCLUDE_DIR=" - (assoc-ref %build-inputs "guile") - "/include/guile/2.2/") - (string-append "-DGUILE_SITE_DIR=" - (assoc-ref %outputs "out") - "/share/guile/site/2.2/")))) + (list + #:configure-flags + #~(list (string-append "-DGUILE_INCLUDE_DIR=" #$guile-2.2 + "/include/guile/2.2/") + (string-append "-DGUILE_SITE_DIR=" #$output + "/share/guile/site/2.2/")) + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys #:rest args) + (when tests? + (apply (assoc-ref gnu:%standard-phases 'check) + #:tests? tests? #:test-target "tests" args) + ;; Failing test. + (delete-file "tests/shell/ShellUTest") + (for-each invoke + (find-files "tests" "UTest$")))))))) (inputs (list atomspace boost cogutil gmp guile-2.2)) (native-inputs @@ -164,15 +206,29 @@ OpenCog framework.") "0sndslphicv6w9qpag168rqkxq5sf71l5qbfx6zhsd5bzlf5fhwv")))) (build-system cmake-build-system) (arguments - `(#:test-target "tests" - #:configure-flags - (list - (string-append "-DGUILE_INCLUDE_DIR=" - (assoc-ref %build-inputs "guile") - "/include/guile/2.2/") - (string-append "-DGUILE_SITE_DIR=" - (assoc-ref %outputs "out") - "/share/guile/site/2.2/")))) + (list + #:configure-flags + #~(list (string-append "-DGUILE_INCLUDE_DIR=" #$guile-2.2 + "/include/guile/2.2/") + (string-append "-DGUILE_SITE_DIR=" #$output + "/share/guile/site/2.2/")) + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys #:rest args) + (when tests? + (apply (assoc-ref gnu:%standard-phases 'check) + #:tests? tests? #:test-target "tests" args) + ;; Failing tests. + (for-each delete-file + '("tests/attention/AttentionParamQueryUTest" + "tests/attention/HebbianCreationModuleUTest" + "tests/attention/ImportanceDiffusionUTest")) + (for-each invoke + (find-files "tests" "UTest$")))))))) (inputs (list atomspace boost @@ -209,15 +265,24 @@ tasks.") "1j8wv910fvrmph370wv5pv2f4bc2s9vl6i7bw3pkmwbdhxkhjbhm")))) (build-system cmake-build-system) (arguments - `(#:test-target "tests" - #:configure-flags - (list - (string-append "-DGUILE_INCLUDE_DIR=" - (assoc-ref %build-inputs "guile") - "/include/guile/2.2/") - (string-append "-DGUILE_SITE_DIR=" - (assoc-ref %outputs "out") - "/share/guile/site/2.2/")))) + (list + #:configure-flags + #~(list (string-append "-DGUILE_INCLUDE_DIR=" #$guile-2.2 + "/include/guile/2.2/") + (string-append "-DGUILE_SITE_DIR=" #$output + "/share/guile/site/2.2/")) + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys #:rest args) + (when tests? + (apply (assoc-ref gnu:%standard-phases 'check) + #:tests? tests? #:test-target "tests" args) + (for-each invoke + (find-files "tests" "UTest$")))))))) (inputs `(("attention" ,attention) ("atomspace" ,atomspace) diff --git a/gnu/packages/openpgp.scm b/gnu/packages/openpgp.scm index c98023566f..1aebfa6a68 100644 --- a/gnu/packages/openpgp.scm +++ b/gnu/packages/openpgp.scm @@ -121,7 +121,6 @@ environments.") ;; Lower the minimum tuning ratio from 6 to 4, as suggested ;; upstream to avoid the s2k_iteration_tuning failing. "-DS2K_MINIMUM_TUNING_RATIO=4" - "-DBUILD_TESTING=on" "-DDOWNLOAD_GTEST=off" "-DDOWNLOAD_RUBYRNP=off") #:phases diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0936c0a14d..d032002464 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1607,6 +1607,8 @@ tools_locations = { (native-inputs (list autoconf-wrapper automake + ;; If cmake is replaced with cmake-minimal then Guix errors when + ;; listing the dependents of rapidjson. cmake git-minimal libtool diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index 4b3ea8ac0b..2e4fa08d5a 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm @@ -127,7 +127,7 @@ in apps built for the Pantheon desktop.") libgee libhandy)) (native-inputs - (list cmake + (list cmake-minimal `(,glib "bin") ; for glib-compile-schemas gettext-minimal pkg-config @@ -186,7 +186,7 @@ desktop.") libical libportal)) (native-inputs - (list cmake + (list cmake-minimal `(,glib "bin") ; for glib-compile-schemas gettext-minimal pkg-config diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 7e5d6acbb7..051dc6a9ac 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1079,7 +1079,9 @@ key URIs using the standard otpauth:// scheme.") (build-system qt-build-system) (arguments (list - #:test-target "check" + #:modules '((guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (replace 'configure @@ -1088,9 +1090,12 @@ key URIs using the standard otpauth:// scheme.") "QMAKE_LRELEASE=lrelease" "QMAKE_LUPDATE=lupdate" (string-append "PREFIX=" #$output)))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'check (assoc-ref gnu:%standard-phases 'check)) (add-before 'check 'pre-check ;; Fontconfig needs a writable cache. (lambda _ (setenv "HOME" "/tmp"))) + (replace 'install (assoc-ref gnu:%standard-phases 'install)) (add-after 'install 'install-auxilliary ;; Install man-page, icon and .desktop file. (lambda _ diff --git a/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch b/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch deleted file mode 100644 index 7743863cf8..0000000000 --- a/gnu/packages/patches/bloomberg-bde-cmake-module-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -This package requires CMAKE_MODULE_PATH be set by the calling process. This -patch uses the CMAKE_PREFIX_PATH passed from Guix as the search path for -locating the bloomberg-bde-tools CMake modules. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -14,6 +14,7 @@ else() - if (NOT CMAKE_MODULE_PATH) - message(FATAL "Please specify path to BDE cmake modules.") - endif() -+ string(REPLACE ":" "cmake/;" CMAKE_MODULE_PATH "$ENV{CMAKE_PREFIX_PATH}cmake/") - - include(bde_workspace) - diff --git a/gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch b/gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch new file mode 100644 index 0000000000..7a4b63d93e --- /dev/null +++ b/gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch @@ -0,0 +1,76 @@ +From 5cdefa8c76ddb797bce8b67a3f5767678bd36a5a Mon Sep 17 00:00:00 2001 +From: sid <sidtosh4@gmail.com> +Date: Mon, 3 Jun 2024 18:51:08 +0100 +Subject: [PATCH] Fix gcc 14.x build failure (due to + -Wincompatible-pointer-types) + +The changes for 'brasero-drive-properties.c' are kept inline with +'brasero-burn-options.c' (public API) for the sake of consistency. + +Fixes: https://gitlab.gnome.org/GNOME/brasero/-/issues/370 +--- + libbrasero-burn/brasero-drive-properties.c | 10 +++------- + libbrasero-utils/brasero-metadata.c | 2 +- + libbrasero-utils/brasero-pk.c | 2 +- + 3 files changed, 5 insertions(+), 9 deletions(-) + +diff --git a/libbrasero-burn/brasero-drive-properties.c b/libbrasero-burn/brasero-drive-properties.c +index cfb2db147..22593cc16 100644 +--- a/libbrasero-burn/brasero-drive-properties.c ++++ b/libbrasero-burn/brasero-drive-properties.c +@@ -835,23 +835,19 @@ brasero_drive_properties_set_property (GObject *object, + GParamSpec *pspec) + { + BraseroDrivePropertiesPrivate *priv; +- BraseroBurnSession *session; + + priv = BRASERO_DRIVE_PROPERTIES_PRIVATE (object); + + switch (property_id) { + case PROP_SESSION: /* Readable and only writable at creation time */ +- /* NOTE: no need to unref a potential previous session since +- * it's only set at construct time */ +- session = g_value_get_object (value); +- priv->session = g_object_ref (session); ++ priv->session = g_object_ref (g_value_get_object (value)); + + brasero_drive_properties_update (BRASERO_DRIVE_PROPERTIES (object)); +- priv->valid_sig = g_signal_connect (session, ++ priv->valid_sig = g_signal_connect (priv->session, + "is-valid", + G_CALLBACK (brasero_drive_properties_is_valid_cb), + object); +- priv->output_sig = g_signal_connect (session, ++ priv->output_sig = g_signal_connect (priv->session, + "output-changed", + G_CALLBACK (brasero_drive_properties_output_changed_cb), + object); +diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c +index 194336899..ddfce8e7b 100644 +--- a/libbrasero-utils/brasero-metadata.c ++++ b/libbrasero-utils/brasero-metadata.c +@@ -665,7 +665,7 @@ brasero_metadata_install_missing_plugins (BraseroMetadata *self) + + context = gst_install_plugins_context_new (); + gst_install_plugins_context_set_xid (context, brasero_metadata_get_xid (self)); +- status = gst_install_plugins_async ((gchar **) details->pdata, ++ status = gst_install_plugins_async ((const gchar* const*) details->pdata, + context, + brasero_metadata_install_plugins_result, + downloads); +diff --git a/libbrasero-utils/brasero-pk.c b/libbrasero-utils/brasero-pk.c +index aa71901f9..5f5ba21aa 100644 +--- a/libbrasero-utils/brasero-pk.c ++++ b/libbrasero-utils/brasero-pk.c +@@ -230,7 +230,7 @@ brasero_pk_install_gstreamer_plugin (BraseroPK *package, + + context = gst_install_plugins_context_new (); + gst_install_plugins_context_set_xid (context, xid); +- status = gst_install_plugins_async ((gchar **) gst_plugins->pdata, ++ status = gst_install_plugins_async ((const gchar* const*) gst_plugins->pdata, + context, + brasero_pk_install_gst_plugin_result, + package); +-- +GitLab + diff --git a/gnu/packages/patches/busybox-no-cbq.patch b/gnu/packages/patches/busybox-no-cbq.patch new file mode 100644 index 0000000000..a887b42755 --- /dev/null +++ b/gnu/packages/patches/busybox-no-cbq.patch @@ -0,0 +1,56 @@ +Downloaded from Debian +https://sources.debian.org/data/main/b/busybox/1%3A1.37.0-6/debian/patches/busybox-1.36.1-no-cbq.patch +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1071648 +Origin: fedora +Date: Tue, 16 Jul 2024 07:46:38 +0000 +Forwarded: yes, https://bugs.busybox.net/show_bug.cgi?id=15931 + +diff -up busybox-1.36.1/networking/tc.c.no-cbq busybox-1.36.1/networking/tc.c +--- busybox-1.36.1/networking/tc.c.no-cbq 2024-01-29 10:24:09.135082923 -0500 ++++ busybox-1.36.1/networking/tc.c 2024-01-29 10:28:12.009502552 -0500 +@@ -31,7 +31,7 @@ + //usage: "qdisc [handle QHANDLE] [root|"IF_FEATURE_TC_INGRESS("ingress|")"parent CLASSID]\n" + /* //usage: "[estimator INTERVAL TIME_CONSTANT]\n" */ + //usage: " [[QDISC_KIND] [help|OPTIONS]]\n" +-//usage: " QDISC_KIND := [p|b]fifo|tbf|prio|cbq|red|etc.\n" ++//usage: " QDISC_KIND := [p|b]fifo|tbf|prio|red|etc.\n" + //usage: "qdisc show [dev STRING]"IF_FEATURE_TC_INGRESS(" [ingress]")"\n" + //usage: "class [classid CLASSID] [root|parent CLASSID]\n" + //usage: " [[QDISC_KIND] [help|OPTIONS] ]\n" +@@ -230,7 +230,7 @@ static int cbq_parse_opt(int argc, char + { + return 0; + } +-#endif ++ + static int cbq_print_opt(struct rtattr *opt) + { + struct rtattr *tb[TCA_CBQ_MAX+1]; +@@ -322,6 +322,7 @@ static int cbq_print_opt(struct rtattr * + done: + return 0; + } ++#endif + + static FAST_FUNC int print_qdisc( + const struct sockaddr_nl *who UNUSED_PARAM, +@@ -373,7 +374,8 @@ static FAST_FUNC int print_qdisc( + if (qqq == 0) { /* pfifo_fast aka prio */ + prio_print_opt(tb[TCA_OPTIONS]); + } else if (qqq == 1) { /* class based queuing */ +- cbq_print_opt(tb[TCA_OPTIONS]); ++ /* cbq_print_opt(tb[TCA_OPTIONS]); */ ++ printf("cbq not supported"); + } else { + /* don't know how to print options for this qdisc */ + printf("(options for %s)", name); +@@ -444,7 +446,8 @@ static FAST_FUNC int print_class( + /* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/ + } else if (qqq == 1) { /* class based queuing */ + /* cbq_print_copt() is identical to cbq_print_opt(). */ +- cbq_print_opt(tb[TCA_OPTIONS]); ++ /* cbq_print_opt(tb[TCA_OPTIONS]); */ ++ printf("cbq not supported"); + } else { + /* don't know how to print options for this class */ + printf("(options for %s)", name); diff --git a/gnu/packages/patches/cmake-curl-certificates-3.24.patch b/gnu/packages/patches/cmake-curl-certificates-3.24.patch deleted file mode 100644 index ca29c9001e..0000000000 --- a/gnu/packages/patches/cmake-curl-certificates-3.24.patch +++ /dev/null @@ -1,21 +0,0 @@ -Submitted upstream at https://gitlab.kitware.com/cmake/cmake/-/merge_requests/7670. - -diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx -index 28ee24dfe9..fc5405213a 100644 ---- a/Source/cmCurl.cxx -+++ b/Source/cmCurl.cxx -@@ -38,6 +38,14 @@ std::string cmCurlSetCAInfo(::CURL* curl, const std::string& cafile) - ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile.c_str()); - check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); - } -+ /* Honor the user-configurable OpenSSL environment variables. */ -+ else if (cmSystemTools::GetEnv("SSL_CERT_FILE", e)) { -+ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, e.c_str()); -+ check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); -+ } else if (cmSystemTools::GetEnv("SSL_CERT_DIR", e)) { -+ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAPATH, e.c_str()); -+ check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); -+ } - #ifdef CMAKE_FIND_CAFILE - # define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt" - else if (cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) { diff --git a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch b/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch deleted file mode 100644 index a5bee60ac2..0000000000 --- a/gnu/packages/patches/kiwix-desktop-newer-libkiwix.patch +++ /dev/null @@ -1,40 +0,0 @@ -Description: Fix building kiwix-desktop with libkiwix-12.1.0 -Bug: https://github.com/kiwix/kiwix-desktop/issues/964 -Origin: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 -Applied-Upstream: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65 ---- -From 1b322d8f01c787846546a6473f153cf1daa41e65 Mon Sep 17 00:00:00 2001 -From: Matthieu Gautier <mgautier@kymeria.fr> -Date: Thu, 9 Feb 2023 09:47:47 +0100 -Subject: [PATCH] With last version of libkiwix, Downloader now return - shared_ptr<Download>. - ---- - src/contentmanager.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp -index c2f4ff9..d4db50a 100644 ---- a/src/contentmanager.cpp -+++ b/src/contentmanager.cpp -@@ -173,7 +173,7 @@ QStringList ContentManager::updateDownloadInfos(QString id, const QStringList &k - return values; - } - auto& b = mp_library->getBookById(id); -- kiwix::Download* d; -+ std::shared_ptr<kiwix::Download> d; - try { - d = mp_downloader->getDownload(b.getDownloadId()); - } catch(...) { -@@ -270,7 +270,7 @@ QString ContentManager::downloadBook(const QString &id) - for (auto b : booksList) - if (b.toStdString() == book.getId()) - return ""; -- kiwix::Download *download; -+ std::shared_ptr<kiwix::Download> download; - try { - std::pair<std::string, std::string> downloadDir("dir", downloadPath.toStdString()); - const std::vector<std::pair<std::string, std::string>> options = { downloadDir }; --- -2.41.0 - diff --git a/gnu/packages/patches/llvm-13-gcc-14.patch b/gnu/packages/patches/llvm-13-gcc-14.patch index a7697b01d0..2625ad497c 100644 --- a/gnu/packages/patches/llvm-13-gcc-14.patch +++ b/gnu/packages/patches/llvm-13-gcc-14.patch @@ -10,3 +10,13 @@ See: https://github.com/smlnj/smlnj/issues/279 #include <string> namespace llvm { +--- llvm-13.0.1.src/include/llvm/Support/Base64.h 1970-01-01 00:00:01.000000000 +0000 ++++ llvm-13.0.1.src/include/llvm/Support/Base64.h 2025-07-18 23:45:19.568475987 +0000 +@@ -14,6 +14,7 @@ + #define LLVM_SUPPORT_BASE64_H + + #include <string> ++#include <cstdint> + + namespace llvm { + diff --git a/gnu/packages/patches/procmail-gcc-14.patch b/gnu/packages/patches/procmail-gcc-14.patch new file mode 100644 index 0000000000..b819bf4ad1 --- /dev/null +++ b/gnu/packages/patches/procmail-gcc-14.patch @@ -0,0 +1,268 @@ +See https://github.com/BuGlessRB/procmail/pull/7 + +diff --git a/initmake b/initmake +index 82d718d..e44ee67 100755 +--- a/initmake ++++ b/initmake +@@ -124,7 +124,7 @@ else + fi + + cat >_autotst.c <<HERE +-main() ++int main() + { return 0; + } + HERE +@@ -200,7 +200,7 @@ cat >_autotst.c <<HERE + #include <sys/types.h> + #include <stdio.h> + #include <sys/stat.h> +-main() ++int main() + { struct stat buf;return!&buf; + } + HERE +diff --git a/src/autoconf b/src/autoconf +index 1cb4c42..995d8bb 100755 +--- a/src/autoconf ++++ b/src/autoconf +@@ -363,6 +363,7 @@ cat >_autotst.c <<HERE + #include <unistd.h> /* getpid() getppid() */ + #endif + #include <stdio.h> ++#include <stdlib.h> + #include <time.h> + #include <fcntl.h> + #include <signal.h> /* SIGKILL */ +@@ -416,6 +417,16 @@ cat >_autotst.c <<HERE + int dolock,child[NR_of_forks],timeout,fdcollect; + char dirlocktest[]="_locktest"; + ++int killchildren() ++{ int i; ++ i=NR_of_forks; ++ do ++ if(child[--i]>0) ++ kill(child[i],SIGTERM),child[i]=0; ++ while(i); ++ return 0; ++} ++ + void stimeout() + { timeout=1;close(fdcollect);killchildren(); + } +@@ -437,7 +448,79 @@ unsigned sfork() + return pid; + } + +-int main(argc,argv)char*argv[]; ++static int oldfdlock; ++#ifdef F_SETLKW ++static struct flock flck; /* why can't it be a local variable? */ ++#endif ++#ifdef F_LOCK ++static off_t oldlockoffset; ++#endif ++ ++int fdlock(int fd) ++{ int i;unsigned gobble[GOBBLE>>2]; ++ for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */ ++ oldfdlock=fd;fd=0; ++ if(MSK_fcntl&dolock) ++#ifdef F_SETLKW ++ { static unsigned extra; ++ flck.l_type=F_WRLCK;flck.l_whence=SEEK_SET;flck.l_start=tell(oldfdlock); ++ if(!extra--) ++ extra=MIN_locks/4,flck.l_len=2,i|=fcntl(oldfdlock,F_SETLK,&flck); ++ flck.l_len=0;fd|=fcntl(oldfdlock,F_SETLKW,&flck); ++ } ++#else ++ fd=1; ++#endif ++ if(MSK_lockf&dolock) ++#ifdef F_LOCK ++ oldlockoffset=tell(oldfdlock),fd|=lockf(oldfdlock,F_LOCK,(off_t)0); ++#else ++ fd=1; ++#endif ++ if(MSK_flock&dolock) ++#ifdef LOCK_EX ++ fd|=flock(oldfdlock,LOCK_EX); ++#else ++ fd=1; ++#endif ++ return fd; ++} ++ ++int sfdlock(int fd) ++{ int i;unsigned gobble[GOBBLE>>2]; ++ for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */ ++ return fdlock(fd); ++} ++ ++int fdunlock() ++{ int i;unsigned gobble[GOBBLE]; ++ for(i=GOBBLE;i;gobble[--i]=~(unsigned)0); /* some SunOS libs mess this up */ ++ if(MSK_flock&dolock) ++#ifdef LOCK_EX ++ i|=flock(oldfdlock,LOCK_UN); ++#else ++ i=1; ++#endif ++ if(MSK_lockf&dolock) ++#ifdef F_LOCK ++ { lseek(oldfdlock,oldlockoffset,SEEK_SET); ++ i|=lockf(oldfdlock,F_LOCK,(off_t)2);i|=lockf(oldfdlock,F_ULOCK,(off_t)0); ++ } ++#else ++ i=1; ++#endif ++ if(MSK_fcntl&dolock) ++#ifdef F_SETLKW ++ flck.l_type=F_UNLCK,flck.l_len=0,i|=fcntl(oldfdlock,F_SETLK,&flck); ++#else ++ i=1; ++#endif ++ if(!i) ++ for(i=GOBBLE;i&&gobble[--i]==~(unsigned)0;); ++ return i; ++} ++ ++int main(argc,argv)int argc;char*argv[]; + { int goodlock,testlock,i,pip[2],pipw[2];time_t otimet;unsigned dtimet; + static char filename[]="_locktst.l0"; + close(0);goodlock=0;testlock=FIRST_lock;signal(SIGPIPE,SIG_DFL); +@@ -576,88 +659,6 @@ skip_tests: + puts("Kernel-locking tests completed.");fprintf(stderr,"\n"); + return EXIT_SUCCESS; + } +- +-int killchildren() +-{ int i; +- i=NR_of_forks; +- do +- if(child[--i]>0) +- kill(child[i],SIGTERM),child[i]=0; +- while(i); +- return 0; +-} +- +-int sfdlock(fd) +-{ int i;unsigned gobble[GOBBLE>>2]; +- for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */ +- return fdlock(fd); +-} +- +-static oldfdlock; +-#ifdef F_SETLKW +-static struct flock flck; /* why can't it be a local variable? */ +-#endif +-#ifdef F_LOCK +-static off_t oldlockoffset; +-#endif +- +-int fdlock(fd) +-{ int i;unsigned gobble[GOBBLE>>2]; +- for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */ +- oldfdlock=fd;fd=0; +- if(MSK_fcntl&dolock) +-#ifdef F_SETLKW +- { static unsigned extra; +- flck.l_type=F_WRLCK;flck.l_whence=SEEK_SET;flck.l_start=tell(oldfdlock); +- if(!extra--) +- extra=MIN_locks/4,flck.l_len=2,i|=fcntl(oldfdlock,F_SETLK,&flck); +- flck.l_len=0;fd|=fcntl(oldfdlock,F_SETLKW,&flck); +- } +-#else +- fd=1; +-#endif +- if(MSK_lockf&dolock) +-#ifdef F_LOCK +- oldlockoffset=tell(oldfdlock),fd|=lockf(oldfdlock,F_LOCK,(off_t)0); +-#else +- fd=1; +-#endif +- if(MSK_flock&dolock) +-#ifdef LOCK_EX +- fd|=flock(oldfdlock,LOCK_EX); +-#else +- fd=1; +-#endif +- return fd; +-} +- +-int fdunlock() +-{ int i;unsigned gobble[GOBBLE]; +- for(i=GOBBLE;i;gobble[--i]=~(unsigned)0); /* some SunOS libs mess this up */ +- if(MSK_flock&dolock) +-#ifdef LOCK_EX +- i|=flock(oldfdlock,LOCK_UN); +-#else +- i=1; +-#endif +- if(MSK_lockf&dolock) +-#ifdef F_LOCK +- { lseek(oldfdlock,oldlockoffset,SEEK_SET); +- i|=lockf(oldfdlock,F_LOCK,(off_t)2);i|=lockf(oldfdlock,F_ULOCK,(off_t)0); +- } +-#else +- i=1; +-#endif +- if(MSK_fcntl&dolock) +-#ifdef F_SETLKW +- flck.l_type=F_UNLCK,flck.l_len=0,i|=fcntl(oldfdlock,F_SETLK,&flck); +-#else +- i=1; +-#endif +- if(!i) +- for(i=GOBBLE;i&&gobble[--i]==~(unsigned)0;); +- return i; +-} + HERE + + if $MAKE _autotst >_autotst.rrr 2>&1 +@@ -1033,6 +1034,10 @@ cat >_autotst.c <<HERE + #ifndef NO_COMSAT + #include "network.h" + #endif ++#include <string.h> ++#include <unistd.h> ++int setrgid(); ++int setresgid(); + int main(){char a[2]; + endpwent();endgrent();memmove(a,"0",1);bcopy("0",a,1);strcspn(a,"0"); + strtol("0",(char**)0,10);strchr("0",'0');strpbrk(a,"0");rename(a,"0"); +@@ -1059,7 +1064,7 @@ echo 'Testing for memmove, strchr, strpbrk, strcspn, strtol, strstr,' + echo ' rename, setrgid, setegid, pow, opendir, mkdir, waitpid, fsync,' + echo ' ftruncate, strtod, strncasecmp, strerror, strlcat,' + echo ' memset, bzero, and _exit' +-if $MAKE _autotst.$O >$DEVNULL 2>&1 ++if $MAKE _autotst.$O >_autotst.rrr 2>&1 + then + : + else +diff --git a/src/foldinfo.c b/src/foldinfo.c +index 10fe406..33e7bff 100644 +--- a/src/foldinfo.c ++++ b/src/foldinfo.c +@@ -18,6 +18,7 @@ static /*const*/char rcsid[]= + #include "goodies.h" + #include "locking.h" + #include "foldinfo.h" ++#include "acommon.h" + + static const char + maildirtmp[]=MAILDIRtmp,maildircur[]=MAILDIRcur; +diff --git a/src/mailfold.c b/src/mailfold.c +index 917b502..9e3d386 100644 +--- a/src/mailfold.c ++++ b/src/mailfold.c +@@ -371,7 +371,7 @@ void concon(ch)const int ch; /* flip between concatenated and split fields */ + } + } + +-void readmail(rhead,tobesent)const long tobesent; ++void readmail(rhead,tobesent)const long tobesent; int rhead; + { char*chp,*pastend;static size_t contlengthoffset; + ;{ long dfilled; + if(rhead==2) /* already read, just examine what we have */ diff --git a/gnu/packages/patches/rocclr-5.6.0-enable-gfx800.patch b/gnu/packages/patches/rocclr-5.6.0-enable-gfx800.patch index 2948234029..21fd88b82e 100644 --- a/gnu/packages/patches/rocclr-5.6.0-enable-gfx800.patch +++ b/gnu/packages/patches/rocclr-5.6.0-enable-gfx800.patch @@ -1,16 +1,30 @@ -#From xuhuisheng -#at https://github.com/RadeonOpenCompute/ROCm/issues/1659#issuecomment-1041026624 +See <https://github.com/ROCm/clr/pull/97>. -diff --git a/utils/flags.hpp b/utils/flags.hpp -index 8f0228cc..2eaa47c5 100644 ---- a/utils/flags.hpp -+++ b/utils/flags.hpp -@@ -245,7 +245,7 @@ release(bool, ROC_SYSTEM_SCOPE_SIGNAL, true, \ - "Enable system scope for signals (uses interrupts).") \ - release(bool, ROC_SKIP_COPY_SYNC, false, \ - "Skips copy syncs if runtime can predict the same engine.") \ --release(bool, ROC_ENABLE_PRE_VEGA, false, \ -+release(bool, ROC_ENABLE_PRE_VEGA, true, \ - "Enable support of pre-vega ASICs in ROCm path") \ - release(bool, HIP_FORCE_QUEUE_PROFILING, false, \ - "Force command queue profiling by default") \ +From 909fa3dcb644f7ca422ed1a980a54ac426d831b1 Mon Sep 17 00:00:00 2001 +From: Jeremy Newton <Jeremy.Newton@amd.com> +Date: Fri, 27 Sep 2024 13:29:12 -0400 +Subject: [PATCH] Fix gfx8 opencl + +This condition was added when we supported PAL openCL on gfx8, but when +ROC_ENABLE_PRE_VEGA was dropped and PAL OpenCL on Linux was deprecated, +this logic should have been dropped completely. + +Change-Id: I0a68ef4723d9ebde7d958c58dbb0b6991f69d817 +Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com> +--- + rocclr/device/device.hpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/rocclr/device/device.hpp b/rocclr/device/device.hpp +index ef82630325..6409cebc90 100644 +--- a/rocclr/device/device.hpp ++++ b/rocclr/device/device.hpp +@@ -1431,8 +1431,5 @@ class Isa { + + /// @returns If the ROCm runtime supports the ISA. + bool runtimeRocSupported() const { +- if (!IS_HIP && (versionMajor_ == 8)) { +- return false; +- } + return runtimeRocSupported_; + } diff --git a/gnu/packages/patches/rocm-bandwidth-test-5.5.0-fix-includes.patch b/gnu/packages/patches/rocm-bandwidth-test-5.5.0-fix-includes.patch deleted file mode 100644 index a5404ad62c..0000000000 --- a/gnu/packages/patches/rocm-bandwidth-test-5.5.0-fix-includes.patch +++ /dev/null @@ -1,79 +0,0 @@ -See <https://github.com/RadeonOpenCompute/rocm_bandwidth_test/pull/90>. - -From a58f9fd4cb5d1120b9ce58c912ca87fa14720f73 Mon Sep 17 00:00:00 2001 -From: pppig236 <weikaik@umich.edu> -Date: Tue, 2 May 2023 15:19:52 -0400 -Subject: [PATCH] fix include for rocm 5.5.0 - ---- - base_test.hpp | 8 +------- - common.hpp | 11 ++--------- - rocm_bandwidth_test.hpp | 8 +------- - 3 files changed, 4 insertions(+), 23 deletions(-) - -diff --git a/base_test.hpp b/base_test.hpp -index 3e79de1..af99a85 100755 ---- a/base_test.hpp -+++ b/base_test.hpp -@@ -42,14 +42,8 @@ - - #ifndef ROC_BANDWIDTH_TEST_BASE_H_ - #define ROC_BANDWIDTH_TEST_BASE_H_ --#if(defined(RBT_HSA_VERSION_FLAT) && ((RBT_HSA_VERSION_FLAT) < RBT_HSA_VERSION_FILEREORG)) --// Hsa package with out file reorganization --// This is for backward compatibility and will be deprecated from future release --#include "hsa.h" --#else - // Hsa package with file reorganization --#include "hsa/hsa.h" --#endif -+#include <hsa/hsa.h> - #include <iostream> - #include <string> - #include <vector> -diff --git a/common.hpp b/common.hpp -index d2933a0..3c4858f 100755 ---- a/common.hpp -+++ b/common.hpp -@@ -48,16 +48,9 @@ - #include <vector> - #include <cmath> - #include <stdio.h> --#if(defined(RBT_HSA_VERSION_FLAT) && ((RBT_HSA_VERSION_FLAT) < RBT_HSA_VERSION_FILEREORG)) --// Hsa package with out file reorganization --// This is for backward compatibility and will be deprecated from future release --#include "hsa.h" --#include "hsa_ext_amd.h" --#else - // Hsa package with file reorganization --#include "hsa/hsa.h" --#include "hsa/hsa_ext_amd.h" --#endif -+#include <hsa/hsa.h> -+#include <hsa/hsa_ext_amd.h> - - using namespace std; - -diff --git a/rocm_bandwidth_test.hpp b/rocm_bandwidth_test.hpp -index f7eb338..b8550a7 100755 ---- a/rocm_bandwidth_test.hpp -+++ b/rocm_bandwidth_test.hpp -@@ -43,14 +43,8 @@ - #ifndef __ROC_BANDWIDTH_TEST_H__ - #define __ROC_BANDWIDTH_TEST_H__ - --#if(defined(RBT_HSA_VERSION_FLAT) && ((RBT_HSA_VERSION_FLAT) < RBT_HSA_VERSION_FILEREORG)) --// Hsa package with out file reorganization --// This is for backward compatibility and will be deprecated from future release --#include "hsa.h" --#else - // Hsa package with file reorganization --#include "hsa/hsa.h" --#endif -+#include <hsa/hsa.h> - #include "base_test.hpp" - #include "common.hpp" - --- -2.40.1 - diff --git a/gnu/packages/patches/rocm-comgr-3.1.0-dependencies.patch b/gnu/packages/patches/rocm-comgr-3.1.0-dependencies.patch deleted file mode 100644 index 6462b81eb9..0000000000 --- a/gnu/packages/patches/rocm-comgr-3.1.0-dependencies.patch +++ /dev/null @@ -1,56 +0,0 @@ -See https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/25 for -original patch. - -From c65cba2e73f9118e128b9ab7e655ee0f8a7798e7 Mon Sep 17 00:00:00 2001 -From: Craig Andrews <candrews@integralblue.com> -Date: Sun, 1 Mar 2020 19:24:22 -0500 -Subject: [PATCH] Link additional required LLVM libraries - -Without these additional required dependencies, linking fails with errors such as: -`undefined reference to llvm::errs()'` ---- - CMakeLists.txt | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt -index fd3ae4a..131e581 100644 ---- a/lib/comgr/CMakeLists.txt -+++ b/lib/comgr/CMakeLists.txt -@@ -322,7 +322,11 @@ install(FILES - - if(TARGET clangFrontendTool) - set(CLANG_LIBS -- clangFrontendTool) -+ clangFrontendTool -+ clangFrontend -+ clangBasic -+ clangDriver -+ clangSerialization) - else() - set(CLANG_LIBS - clang-cpp) -@@ -337,8 +341,23 @@ if (LLVM_LINK_LLVM_DYLIB) - else() - llvm_map_components_to_libnames(LLVM_LIBS - ${LLVM_TARGETS_TO_BUILD} -+ Option - DebugInfoDWARF -- Symbolize) -+ Symbolize -+ Support -+ Object -+ TargetParser -+ Bitreader -+ BitWriter -+ MC -+ MCParser -+ MCDisassembler -+ Core -+ IRReader -+ CodeGen -+ Linker -+ Demangle -+ BinaryFormat) - endif() - - target_link_options(amd_comgr diff --git a/gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch b/gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch index 65ad362307..da96b3ade8 100644 --- a/gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch +++ b/gnu/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch @@ -1,11 +1,11 @@ Do not build and install clinfo. -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0dc5bf4..95a12af 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,7 +27,7 @@ else() - find_package(OpenCL REQUIRED) +diff --git a/opencl/CMakeLists.txt b/opencl/CMakeLists.txt +index 7b97cfdef..23eec15b2 100644 +--- a/opencl/CMakeLists.txt ++++ b/opencl/CMakeLists.txt +@@ -33,7 +33,7 @@ if(BUILD_ICD) + add_subdirectory(khronos/icd) endif() add_subdirectory(amdocl) -add_subdirectory(tools/clinfo) @@ -13,15 +13,16 @@ index 0dc5bf4..95a12af 100644 add_subdirectory(tools/cltrace) if(BUILD_TESTS) add_subdirectory(tests/ocltst) -diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt -index a703f58..c07546a 100644 ---- a/packaging/CMakeLists.txt -+++ b/packaging/CMakeLists.txt -@@ -12,6 +12,6 @@ endif() +diff --git a/opencl/packaging/CMakeLists.txt b/opencl/packaging/CMakeLists.txt +index 7d9e6366f..f8d08e0fc 100644 +--- a/opencl/packaging/CMakeLists.txt ++++ b/opencl/packaging/CMakeLists.txt +@@ -16,7 +16,7 @@ endif() set(CPACK_DEB_COMPONENT_INSTALL ON) set(CPACK_RPM_COMPONENT_INSTALL ON) -install(TARGETS clinfo DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT binary) +#install(TARGETS clinfo DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT binary) install(TARGETS amdocl DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary) - install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary) + install(TARGETS amdocl DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT asan) + install(FILES ${opencl_SOURCE_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 58260fcf01..4c18dad6ed 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -841,6 +841,7 @@ interaction.") zlib)) (arguments (list + #:tests? #f #:configure-flags #~(list "-DPODOFO_BUILD_SHARED=ON") #:phases @@ -886,6 +887,8 @@ extracting content or merging files.") lua-5.1 openssl zlib)) + (arguments + (list #:tests? #f)) (home-page "https://github.com/podofo/podofo") (synopsis "Tools to work with the PDF file format") (description @@ -1063,13 +1066,18 @@ program capable of converting PDF into other formats.") qtsvg-5)) (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 (lambda _ (substitute* "qpdfview.pri" (("/usr") #$output)) - (invoke "qmake" "qpdfview.pro")))))) + (invoke "qmake" "qpdfview.pro"))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install))))) (home-page "https://launchpad.net/qpdfview") (synopsis "Tabbed document viewer") (description "@command{qpdfview} is a document viewer for PDF, PS and DJVU @@ -1850,9 +1858,12 @@ Keywords: html2pdf, htmltopdf") (build-system cmake-build-system) (arguments (list + #:tests? #f ; no tests #:configure-flags #~(list (string-append "PREFIX=" #$output)) - #:test-target "check" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths @@ -1865,7 +1876,9 @@ Keywords: html2pdf, htmltopdf") (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) (apply invoke "qmake" configure-flags))) - (add-after 'install 'instal-man-page + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install)) + (add-after 'install 'install-man-page (lambda _ (install-file "resources/sioyek.1" (string-append #$output "/share/man/man1"))))))) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 673979d1d8..33990bc2eb 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -559,7 +559,6 @@ photographic equipment.") (list #:configure-flags #~(list "-DBINARY_PACKAGE_BUILD=On" - "-DBUILD_TESTING=On" "-DDONT_USE_INTERNAL_LIBRAW=On") #:phases #~(modify-phases %standard-phases @@ -820,7 +819,7 @@ such as Batch image processing.") `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))) (native-inputs - (list cmake + (list cmake-minimal gettext-minimal `(,glib "bin") gobject-introspection diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 5276f96fea..67c3c93410 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -90,7 +90,7 @@ automake bison boost - cmake + cmake-minimal emacs-minimal flex ghostscript ;for tests diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index 8fa6ddb588..5ed1be87e5 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -135,8 +135,7 @@ similar to getopt(3), it contains a number of enhancements, including: (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON"))) + '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) (home-page "https://gflags.github.io/gflags/") (synopsis "C++ library for command-line argument parsing") (description diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index 9c6f42bdec..08120663f6 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -170,6 +170,7 @@ satisfiability checking (SAT).") (build-system cmake-build-system) (arguments (list + #:tests? #f #:configure-flags #~`("-DCLINGO_BUILD_TESTS=on" "-DCLINGO_INSTALL_LIB=on" "-DCLINGO_BUILD_STATIC=off" @@ -295,7 +296,8 @@ and goals over linear (in)equations.") "0050qp5gpznigpm743br8yhjg62gl739xmzkfr70hlqm1xrj0sa7")))) (build-system cmake-build-system) (arguments - (list #:phases + (list #:tests? #f + #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-cmake (lambda _ diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 683afae035..4361c0b65e 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -835,8 +835,7 @@ wrapper. It provides a backport of the @code{Path} object.") (lambda _ (setenv "LIBDEFLATE_PREFIX" #$(this-package-input "libdeflate"))))))) - ;; CMake >= 3.26 required. - (native-inputs (list cmake-next python-pytest python-scikit-build-core)) + (native-inputs (list cmake-minimal python-pytest python-scikit-build-core)) (inputs (list libdeflate)) (home-page "https://github.com/dcwatson/deflate") (synopsis "Python wrapper for @code{libdeflate}") diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm index 3d03ce93c3..a4b83c3ea8 100644 --- a/gnu/packages/python-graphics.scm +++ b/gnu/packages/python-graphics.scm @@ -375,7 +375,7 @@ Design spec without sacrificing ease of use or application performance.") (("\\$\\{SoQt_INCLUDE_DIRS}") "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}"))))))) (native-inputs - (list cmake swig)) + (list cmake-minimal swig)) (inputs (list python-wrapper qtbase-5 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9b9abeeea5..e24cd2288f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -165,6 +165,7 @@ ;;; Copyright © 2025 Nguyễn Gia Phong <mcsinyx@disroot.org> ;;; Copyright © 2025, Cayetano Santos <csantosb@inventati.org> ;;; Copyright © 2025 Jake Forster <jakecameron.forster@gmail.com> +;;; Copyright © 2025 Luis Felipe López Acevedo <sirgazil@zoho.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -458,7 +459,7 @@ compare against a vast section of other version formats.") (("^minimum-version =.*") ""))))))) (propagated-inputs (list python-numpy)) (native-inputs - (list cmake pybind11 python-pytest python-scikit-build-core)) + (list cmake-minimal pybind11 python-pytest python-scikit-build-core)) (home-page "https://github.com/scikit-hep/awkward-1.0") (synopsis "CPU kernels and compiled extensions for Awkward Array") (description "Awkward CPP provides precompiled routines for the awkward @@ -1175,6 +1176,37 @@ attribution. It uses similarity detection algorithms to compare code files and highlight matching sections.") (license license:agpl3+))) +(define-public python-wheel-filename + (package + (name "python-wheel-filename") + (version "1.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "wheel_filename" version)) + (sha256 + (base32 "1zcqq8mydjjrk8x5xlm53bavs51jm40nz42a7500pd6bbm31r2c7")))) + (build-system pyproject-build-system) + (native-inputs (list python-hatchling python-pytest python-pytest-cov)) + (home-page "https://github.com/wheelodex/wheel-filename") + (synopsis "Parse wheel filenames") + (description + "This software allows you to verify +@url{https://packaging.python.org/en/latest/specifications/binary-distribution-format/, wheel} +filenames and parse them into their component fields. + +This package adheres strictly to the standard, with the following +exceptions: + +@itemize @bullet +@item +Version components may be any sequence of the relevant set of +characters; they are not verified for PEP 440 compliance. +@item +The @file{.whl} file extension is matched case-insensitively. +@end itemize") + (license license:expat))) + (define-public python-xmldiff (package (name "python-xmldiff") @@ -17701,15 +17733,15 @@ printing of sub-tables by specifying a row range.") (define-public python-rtf-tokenize (package (name "python-rtf-tokenize") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (pypi-uri "rtf_tokenize" version)) (sha256 (base32 - "026njb9iwznycda83bln3gfivcnzdz6vy8y86xvbsy84s28g6gaw")))) - (build-system python-build-system) - (native-inputs (list python-pytest)) + "1ljs0dcg2p1iad4zrxgn1pbrrcjcrswhjxrbprhdxd822n0al84h")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-setuptools python-wheel)) (home-page "https://github.com/benoit-pierre/rtf_tokenize") (synopsis "Simple RTF tokenizer") (description "This package is a simple RTF tokenizer.") @@ -29459,23 +29491,28 @@ user-space file systems in Python.") ("catch" ,catch2-1) ("eigen" ,eigen))) (arguments - `(#:configure-flags - (list (string-append "-DCATCH_INCLUDE_DIR=" - (assoc-ref %build-inputs "catch") - "/include/catch")) - - #:phases (modify-phases %standard-phases - (add-after 'install 'install-python - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion "../source" - (setenv "PYBIND11_USE_CMAKE" "yes") - (invoke "python" "setup.py" "install" - "--single-version-externally-managed" - "--root=/" - (string-append "--prefix=" out))))))) - - #:test-target "check")) + (list + #:configure-flags + #~(list (string-append "-DCATCH_INCLUDE_DIR=" + (assoc-ref %build-inputs "catch") + "/include/catch")) + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) args))) + (add-after 'install 'install-python + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "../source" + (setenv "PYBIND11_USE_CMAKE" "yes") + (invoke "python" "setup.py" "install" + "--single-version-externally-managed" + "--root=/" + (string-append "--prefix=" out))))))))) (home-page "https://github.com/pybind/pybind11/") (synopsis "Seamless operability between C++11 and Python") (description @@ -31744,7 +31781,7 @@ Its algorithms are based on the kakasi library, which is written in C.") (list pkg-config python-meson-python meson - ninja + ninja/pinned patchelf python-setuptools python-sphinx @@ -35500,7 +35537,7 @@ and frame grabber interface.") (list cmake-minimal gfortran git-minimal/pinned ;for tests - ninja + ninja/pinned python-coverage python-cython python-hatchling diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9489ceadd8..67582c4a54 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -327,7 +327,8 @@ window managers, that don't provide Qt integration by themselves.") (base32 "0d0pxynlyfgavf6l1b1z7zpmbrzm96hkphnqnalr7mshm147450g")))) (build-system cmake-build-system) - (arguments (list #:configure-flags #~(list + (arguments (list #:tests? #f + #:configure-flags #~(list "-DKDDockWidgets_QT6=ON" "-DKDDockWidgets_TESTS=ON"))) (inputs @@ -1100,7 +1101,12 @@ tst_qt_cmake_create.cpp" "test_qt_add_ui_8" "test_qt_add_ui_9" ;; This test is susceptible to the 600 ms timeout used: - "tst_qpauseanimation") + "tst_qpauseanimation" + + ;; This test may fail non-deterministically as reported + ;; in Guix bug#73233 and upstream at + ;; https://bugreports.qt.io/browse/QTBUG-119321. + "tst_qsharedmemory") #$@(cond ((target-ppc64le?) #~((list @@ -2623,6 +2629,7 @@ that helps in Qt development."))) (build-system cmake-build-system) (arguments (list + #:tests? #f ;; The build system attempts to fetch online resources and fails when ;; building the test suite. #:configure-flags #~(list "-DQT_BUILD_TESTS=OFF") @@ -2824,6 +2831,9 @@ also contains functionality to support data models and executable content."))) (delete-file-recursively "tests/3rdparty"))))) (arguments (list + ;; This failing test is run by the cmake-build-system phases but not + ;; by the gnu-build-system phases. + #:test-exclude "tst_scion" #:phases #~(modify-phases %standard-phases (delete 'check) ;move after the install phase @@ -4130,6 +4140,9 @@ instances.") (arguments (list #:qtbase qtbase + #: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-installation-prefix @@ -4144,6 +4157,7 @@ instances.") (replace 'configure (lambda _ (invoke "qmake"))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -5078,6 +5092,7 @@ different kinds of sliders, and much more.") (base32 "13n2qb8q9jz4ihwlbs7y15lw90w9113gb1bgnb1dggpxkj64r953")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list qttools-5)) (inputs @@ -5118,6 +5133,7 @@ a binding language: (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:cmake cmake-3.25 #:tests? #f ;no tests #:configure-flags #~(list "-DBUILD_EXAMPLE=ON" @@ -5194,8 +5210,7 @@ window docking system.") "0nsh6v5k4kdrrhcd6adz947n0dka4rrbx8f8rvm1175545nbi67s")))) (build-system qt-build-system) (arguments - (list #:test-target "tests" - #:phases + (list #:phases #~(modify-phases %standard-phases (add-before 'install 'fix-include-path (lambda _ @@ -5239,6 +5254,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 @@ -5255,6 +5273,7 @@ programming paradigm.") (replace 'configure (lambda _ (invoke "qmake"))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) ;; No install rule exists. (replace 'install (lambda _ @@ -5805,7 +5824,7 @@ configurable also via HTTP.") (build-system cmake-build-system) (arguments '(#:tests? #f)) ; There are no tests (native-inputs - (list pkg-config cmake)) + (list pkg-config cmake-minimal)) (inputs (list qtbase-5 coin3d)) (home-page "https://github.com/coin3d/soqt") @@ -6117,6 +6136,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 @@ -6139,7 +6161,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 @@ -6189,6 +6213,9 @@ authentication on behalf of its clients.") (inputs (list signond)) (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 @@ -6200,7 +6227,9 @@ authentication on behalf of its clients.") (string-append "PREFIX=" #$output) (string-append "LIBDIR=" #$output "/lib") (string-append "SIGNON_PLUGINS_DIR=" #$output - "/lib/signon"))))))) + "/lib/signon")))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install))))) (synopsis "OAuth 2 plugin for signon") (description "This plugin for the Accounts-SSO SignOn daemon handles the OAuth diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index c73cae9882..7b989d38f9 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -147,8 +147,17 @@ (base32 "0i6jhrdswr1wglyb9h39idpz5v9z13yhidvlbj34vxpyngrkhlvs")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") - #:test-target "test_all")) + (list + #:configure-flags #~'("-DBUILD_SHARED_LIBS=ON") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "test_all" args)))))) (home-page "https://github.com/quiet/libfec") (synopsis "Forward error correction algorithms library") (description @@ -175,12 +184,15 @@ useful in modems implemented with @dfn{digital signal processing} (DSP).") (build-system cmake-build-system) (arguments (list - #:test-target "check" + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'build 'build-libfec-compatibility-layer (lambda _ (invoke "make" "shim"))) + (replace 'check (assoc-ref gnu:%standard-phases 'check)) (add-after 'install 'delete-static-libraries (lambda _ (delete-file (string-append #$output "/lib/libcorrect.a")) @@ -1097,7 +1109,8 @@ environment.") spdlog volk)) (arguments - (list #:modules '((guix build cmake-build-system) + (list #:tests? #f + #:modules '((guix build cmake-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) #:imported-modules `(,@%cmake-build-system-modules @@ -1230,6 +1243,7 @@ DMR, NXDN, P25, etc.") (sha256 (base32 "12p193ngcs65nd3lynry119nhv40mikamqkw37wdln7lawx3nw7p")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) (native-inputs (list doxygen pkg-config @@ -2274,13 +2288,19 @@ NanoVNA vector network analyzers.") qtbase-5 v4l-utils)) (arguments - `(#:tests? #f ; No test suite. - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (invoke "qmake" - (string-append "PREFIX=" (assoc-ref outputs "out")))))))) + (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 + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" + (string-append "PREFIX=" (assoc-ref outputs "out"))))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install))))) (home-page "http://users.telenet.be/on4qz/qsstv/") (synopsis "Program for receiving and transmitting SSTV and HAMDRM") (description @@ -2437,7 +2457,8 @@ intended for people who want to learn receiving and sending morse code.") (base32 "1lhsmyhljqa6apzbysqar56wpfcdvs3pq9ia1mshqd6d3hz74s78")))) (build-system cmake-build-system) (arguments - (list #:configure-flags #~(list "-DGGMORSE_SUPPORT_SDL2=OFF") + (list #:tests? #f + #:configure-flags #~(list "-DGGMORSE_SUPPORT_SDL2=OFF") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-imgui-build (lambda _ @@ -2635,34 +2656,40 @@ sinks and sources.") speexdsp zlib)) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "dream.pro" - (("target\\.path = /usr/bin") - (string-append "target.path = " - (assoc-ref outputs "out") "/bin")) - (("documentation\\.path = /usr/share/man/man1") - (string-append "documentation.path = " - (assoc-ref outputs "out") - "/share/man/man1")) - (("/usr/include/pulse") - (search-input-directory inputs "/include/pulse")) - (("/usr/include/sndfile\\.h") - (search-input-file inputs "/include/sndfile.h")) - (("/usr/include/opus") - (search-input-directory inputs "/include/opus")) - (("/usr/include/speex") - (search-input-directory inputs "/include/speex")) - (("/usr/include/qwt") - (search-input-directory inputs "/include/qwt")) - (("\\$\\$OUT_PWD/include/neaacdec\\.h") - (search-input-file inputs "/include/neaacdec.h"))))) - (replace 'configure - (lambda _ - (invoke "qmake")))))) + (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 outputs #:allow-other-keys) + (substitute* "dream.pro" + (("target\\.path = /usr/bin") + (string-append "target.path = " + (assoc-ref outputs "out") "/bin")) + (("documentation\\.path = /usr/share/man/man1") + (string-append "documentation.path = " + (assoc-ref outputs "out") + "/share/man/man1")) + (("/usr/include/pulse") + (search-input-directory inputs "/include/pulse")) + (("/usr/include/sndfile\\.h") + (search-input-file inputs "/include/sndfile.h")) + (("/usr/include/opus") + (search-input-directory inputs "/include/opus")) + (("/usr/include/speex") + (search-input-directory inputs "/include/speex")) + (("/usr/include/qwt") + (search-input-directory inputs "/include/qwt")) + (("\\$\\$OUT_PWD/include/neaacdec\\.h") + (search-input-file inputs "/include/neaacdec.h"))))) + (replace 'configure + (lambda _ + (invoke "qmake"))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install))))) (home-page "https://sourceforge.net/projects/drm/") (synopsis "Digital Radio Mondiale receiver") (description @@ -3122,6 +3149,7 @@ various hardware.") (sha256 (base32 "11v5idwvfi9w60qg4fgqgvm7ahmb0ys4j094qv4c93r92kd9d3f9")))) (build-system qt-build-system) + (arguments (list #:tests? #f)) (native-inputs (list pkg-config)) (inputs @@ -3150,6 +3178,9 @@ software-defined radio receivers.") (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 @@ -3174,7 +3205,9 @@ software-defined radio receivers.") (chdir "build") (invoke "qmake" (string-append "PREFIX=" #$output) - "../wfview.pro")))))) + "../wfview.pro"))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install))))) (inputs (list eigen eudev diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 9f79f895c3..2f89b29d85 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -163,7 +163,6 @@ to remotely control a user's Windows desktop.") #~()) "-DWITH_PULSE=ON" "-DWITH_CUPS=ON" - "-DBUILD_TESTING=ON" "-DWITH_SERVER=ON" ;build servers "-DWITH_SHADOW=ON" ;build shadow server "-DWITH_PROXY=ON"))) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 869b0fc81f..a9f7449043 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -116,8 +116,7 @@ HTML and JSON.") (list boost ; could also use bundled copy zlib)) (arguments - `(#:test-target "cl_test" - #:configure-flags '("-DBUILD_CONTRIBS_LIB=ON") + `(#:configure-flags '("-DBUILD_CONTRIBS_LIB=ON") #:tests? #f)) ; Tests do not compile, as TestIndexSearcher.cpp uses ; undeclared usleep. After fixing this, one needs to run ; "make test" in addition to "make cl_test", then diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index bf1ab703c0..f0d965f45e 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -81,12 +81,13 @@ Python. It is a C++ library.") (base32 "11q0kz8b3y5ysn58fr62yhib520f9l3grbn8gxr8x5s9k700vq11")))) (build-system cmake-build-system) - (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" + (arguments (list #:tests? (not (%current-target-system)) + #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" ;; "-DRE2_USE_ICU=ON" - #$@(if (%current-target-system) + #$@(if (not (%current-target-system)) #~("-DRE2_BUILD_TESTING=ON") #~())))) - (native-inputs (list googletest)) + (native-inputs (list googlebenchmark googletest)) (propagated-inputs (list abseil-cpp)))) (define-public tre diff --git a/gnu/packages/rocm.scm b/gnu/packages/rocm.scm index dca3d58387..cd320dcf81 100644 --- a/gnu/packages/rocm.scm +++ b/gnu/packages/rocm.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net> -;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com> +;;; Copyright © 2022, 2023, 2025 John Kehayias <john.kehayias@protonmail.com> ;;; ;;; This program is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by @@ -31,13 +31,27 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages opencl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages version-control) #:use-module (gnu packages vim) #:use-module (gnu packages xdisorg)) ;; The components are tightly integrated and can only be upgraded as a unit. If ;; you want to upgrade ROCm, bump this version number and update hashes below. -(define %rocm-version "5.6.0") +(define %rocm-version "6.4.2") + +;; As of version 6.1.0 several of the ROCm projects are contained within their +;; forked LLVM repository. This is the same as the source for llvm-for-rocm. +(define %rocm-llvm-origin + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/RadeonOpenCompute/llvm-project.git") + (commit (string-append "rocm-" %rocm-version)))) + (file-name (git-file-name "llvm-for-rocm" %rocm-version)) + (sha256 + (base32 + "1j2cr362k7snsh5c1z38ikyihmjvy0088rj0f0dhng6cjwgysryp")))) (define-public rocm-cmake (package @@ -51,11 +65,11 @@ (file-name (git-file-name name version)) (sha256 (base32 - "183s2ksn142r7nl7l56qvyrgvvkdgqfdzmgkfpp4a6g9mjp88ady")))) + "1af9z59bm8pj577x43q614v3ff039wijvcdpgw6sdsq1c0ssj260")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; Tests try to use git commit (native-inputs (list git)) - (home-page "https://github.com/RadeonOpenCompute/rocm-cmake") + (home-page "https://github.com/ROCm/rocm-cmake") (synopsis "ROCm cmake modules") (description "ROCm cmake modules provides cmake modules for common build tasks needed for the ROCM software stack.") @@ -65,22 +79,20 @@ tasks needed for the ROCM software stack.") (package (name "rocm-device-libs") (version %rocm-version) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/RadeonOpenCompute/ROCm-Device-Libs.git") - (commit (string-append "rocm-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jg96ycy99s9fis8sk1b7qx5p33anw16mqlm07zqbnhry2gqkcbh")))) + (source %rocm-llvm-origin) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:build-type "Release" + #:configure-flags (list "-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"))) + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "amd/device-libs")))))) (inputs (list llvm-for-rocm)) - (home-page "https://github.com/RadeonOpenCompute/ROCm-Device-Libs") + (home-page "https://github.com/ROCm/ROCm-Device-Libs") (synopsis "ROCm Device libraries") (description "AMD-specific device-side language runtime libraries, namely oclc, ocml, ockl, opencl, hip and hc.") @@ -90,49 +102,45 @@ oclc, ocml, ockl, opencl, hip and hc.") (package (name "rocm-comgr") (version %rocm-version) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport.git") - (commit (string-append "rocm-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15s2dx0pdvjv3xfccq5prkplcbwps8x9jas5qk93q7kv8wx57p3b")) - (patches - (search-patches "rocm-comgr-3.1.0-dependencies.patch")))) + (source %rocm-llvm-origin) (build-system cmake-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "lib/comgr")))))) - (inputs (list llvm-for-rocm rocm-device-libs)) - (home-page "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport") + (list + #:build-type "Release" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-to-build + (lambda _ + (chdir "amd/comgr") + (setenv "ROCM_PATH" + #$(this-package-input "rocm-device-libs"))))))) + (inputs (list rocm-device-libs)) + (native-inputs (list llvm-for-rocm python)) + (home-page "https://github.com/ROCm/ROCm-CompilerSupport") (synopsis "ROCm Code Object Manager") (description "The Comgr library provides APIs for compiling and inspecting AMDGPU code objects.") (license license:ncsa))) +;; This package is deprecated; this is the last version released. (define-public roct-thunk-interface (package (name "roct-thunk-interface") - (version %rocm-version) + (version "6.2.4") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface.git") + (url "https://github.com/ROCm/ROCT-Thunk-Interface.git") (commit (string-append "rocm-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0v8j4gkbb21gqqmz1b4nmampx5ywva99ipsx8lcjr5ckcg84fn9x")))) + "1y3mn4860z7ca71cv4hhag7racpc208acy8rws8ldw5k8yjc68m0")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; Not sure how to run tests. (inputs (list libdrm numactl)) (native-inputs (list `(,gcc "lib") pkg-config)) - (home-page "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface") + (home-page "https://github.com/ROCm/ROCT-Thunk-Interface") (synopsis "Radeon Open Compute Thunk Interface") (description "User-mode API interfaces used to interact with the ROCk driver.") @@ -145,62 +153,42 @@ driver.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/RadeonOpenCompute/ROCR-Runtime.git") + (url "https://github.com/ROCm/ROCR-Runtime.git") (commit (string-append "rocm-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "07wh7s1kgvpw8ydxmr2wvvn05fdqcmcc20qjbmnc3cbbhxviksyr")))) + "01gqbzqm5m28dw9b2calrbp9a23w2cc2gwi3pay8yl8qvk4jgkff")))) (build-system cmake-build-system) (arguments (list #:tests? #f ; No tests. + #:build-type "Release" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'add-rocm-device-lib-path (lambda _ - (substitute* "src/image/blit_src/CMakeLists.txt" - (("-O2") - (string-append - "-O2 --rocm-device-lib-path=" - #$(this-package-input "rocm-device-libs") - "/amdgcn/bitcode/"))))) - (add-after 'add-rocm-device-lib-path 'chdir - (lambda _ - (chdir "src")))))) + (setenv "ROCM_PATH" + #$(this-package-input "rocm-device-libs"))))))) (inputs (list libdrm - libelf + libelf-shared llvm-for-rocm numactl rocm-device-libs ; For bitcode. roct-thunk-interface)) (native-inputs (list pkg-config xxd)) - (home-page "https://github.com/RadeonOpenCompute/ROCR-Runtime") + (home-page "https://github.com/ROCm/ROCR-Runtime") (synopsis "ROCm Platform Runtime") (description "User-mode API interfaces and libraries necessary for host applications to launch compute kernels to available HSA ROCm kernel agents.") (license license:ncsa))) -;; This is the source only for ROCclr as from v4.5 it should only be built as -;; part of a client. A warning is output if attempting to build stand-alone -;; and there is no install. -(define rocclr-src - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ROCm-Developer-Tools/ROCclr.git") - (commit (string-append "rocm-" %rocm-version)))) - (sha256 - (base32 - "1fzvnngxcvxscn718cqfglm4izccx88zjdr3g5ldfqw7hyd034sk")) - (patches (search-patches "rocclr-5.6.0-enable-gfx800.patch")))) - (define-public rocm-opencl-runtime (package (name "rocm-opencl-runtime") (version %rocm-version) - (home-page "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime") + (home-page "https://github.com/ROCm/clr") (source (origin (method git-fetch) (uri (git-reference @@ -209,20 +197,21 @@ applications to launch compute kernels to available HSA ROCm kernel agents.") (file-name (git-file-name name version)) (sha256 (base32 - "1azfxf0ac3mnbyfgn30bz5glwlmaigzdz0cd29jzc4b05hks1yr3")) + "00zr1fw84nifn2b2zd4wxf00f1171hjmz1lypzzmydsk5yw01q0c")) (patches (search-patches + "rocclr-5.6.0-enable-gfx800.patch" ;; Guix includes a program clinfo already. "rocm-opencl-runtime-4.3-noclinfo.patch")))) (build-system cmake-build-system) (arguments (list #:tests? #f ; Not sure how to run them. + #:build-type "Release" #:configure-flags #~(list (string-append "-DAMD_OPENCL_PATH=" #$(package-source this-package)) - ;; The ROCclr source is needed to build the runtime. - (string-append "-DROCCLR_PATH=" #$rocclr-src) + "-DCLR_BUILD_OCL=ON" (string-append "-DROCM_PATH=" #$output) ;; Don't build the ICD loader as we have the opencl-icd-loader ;; package already. @@ -231,6 +220,11 @@ applications to launch compute kernels to available HSA ROCm kernel agents.") "-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'no-os-release + (lambda _ + (substitute* "opencl/packaging/CMakeLists.txt" + (("\"/etc/os-release\"") + "\"/dev/null\"")))) (add-after 'install 'create-icd ;; Manually install ICD, which simply consists of dumping ;; the path of the .so into the correct file. @@ -260,12 +254,12 @@ and in-process/in-memory compilation.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/RadeonOpenCompute/rocminfo.git") + (url "https://github.com/ROCm/rocminfo.git") (commit (string-append "rocm-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "150bvyxp9krq8f7jqd1g5b4l85rih4ch322y4sg1hnciqpabn6a6")))) + "15mzmxz011sg42jg0dbxz57f4fagmxzdjc6zhd0yab3cq7k1kiv2")))) (build-system cmake-build-system) (arguments (list @@ -280,7 +274,7 @@ and in-process/in-memory compilation.") (("grep") (search-input-file inputs "bin/grep")))))))) (inputs (list rocr-runtime kmod)) - (home-page "https://github.com/RadeonOpenCompute/rocminfo") + (home-page "https://github.com/ROCm/rocminfo") (synopsis "ROCm Application for Reporting System Info") (description "List @acronym{HSA,Heterogeneous System Architecture} Agents available to ROCm and show their properties.") @@ -293,17 +287,16 @@ available to ROCm and show their properties.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/RadeonOpenCompute/rocm_bandwidth_test.git") + (url "https://github.com/ROCm/rocm_bandwidth_test.git") (commit (string-append "rocm-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0ca6r8xijw3a3hrlgkqqsf3iqyia6sdmidgmjl12f5vypxzp5kmm")) - (patches (search-patches "rocm-bandwidth-test-5.5.0-fix-includes.patch")))) + "1afmyx0dkif7djdcm5rfhnsibbrkj4py6dvh0gw4x3v750ms69wv")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. (inputs (list rocr-runtime)) - (home-page "https://github.com/RadeonOpenCompute/rocm_bandwidth_test") + (home-page "https://github.com/ROCm/rocm_bandwidth_test") (synopsis "Bandwidth test for ROCm") (description "RocBandwidthTest is designed to capture the performance characteristics of buffer copying and kernel read/write operations. The help diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 054d2509a8..dd24b38c9e 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -810,7 +810,8 @@ mappings intended for the use with SDL2's game controller functionality.") (base32 "18g9qavk0wh1bvfh6gdi5q75fd57dk0gp5r20c80x7xnp2ywywih")))) (build-system cmake-build-system) - (arguments (list #:configure-flags + (arguments (list #:tests? #f + #:configure-flags #~(list "-DBUILD_TESTS=ON"))) (propagated-inputs (list sdl3)) (home-page "https://github.com/sabdul-khabir/SDL3_gfx") diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 660e170794..0f99a4ec64 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -888,6 +888,9 @@ an unprivileged user.") (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 'patch-paths @@ -898,6 +901,8 @@ an unprivileged user.") (replace 'configure (lambda _ (invoke "qmake"))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install)) (add-after 'install 'install-desktop-resources (lambda _ (let ((datadir (string-append #$output "/share"))) @@ -969,8 +974,6 @@ to the @code{python-yubikey-manager} package.") (base32 "0z39f8w0zvra874az0f67ck1al9kbpaidpilggbl8jnfs05010ck")))) (build-system cmake-build-system) - (arguments - '(#:configure-flags (list "-DBUILD_TESTING=on"))) (native-inputs (list pkg-config qttools-5)) (inputs (list catch2)) (home-page "https://github.com/tplgy/cppcodec") diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 3caf943957..5b2f023736 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -437,8 +437,17 @@ that implements both the msgpack and msgpack-rpc specifications.") "1c9i93kr7wvpr01i4wixi9mf991nd3k2adg5fy0vxwwlvvc7dgdw")))) (build-system qt-build-system) (arguments - (list #:qtbase qtbase - #:test-target "tests")) + (list #:modules '((guix build cmake-build-system) + (guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "tests" args)))))) (home-page "https://github.com/iamantony/qtcsv") (synopsis "Library for reading and writing CSV files in Qt") (description @@ -561,32 +570,39 @@ character limit for implicit keys.") (license license:expat))) (define-public yaml-cpp - (package - (name "yaml-cpp") - (version "0.8.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jbeder/yaml-cpp") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0whdn6pqa56532ml20h89p6rchcrrazdrvi5fz6zpmrkl15yiki7")))) - (build-system cmake-build-system) - (arguments - '(#:configure-flags '("-DYAML_BUILD_SHARED_LIBS=ON"))) - (native-inputs - (list python)) - (home-page "https://github.com/jbeder/yaml-cpp") - (synopsis "YAML parser and emitter in C++") - (description "YAML parser and emitter in C++ matching the YAML 1.2 spec.") - (license license:bsd-3))) + (let ((commit "2f86d13775d119edbb69af52e5f566fd65c6953b") + (revision "0")) + (package + (name "yaml-cpp") + (version (git-version "0.8.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jbeder/yaml-cpp") + (commit commit))) + (modules '((guix build utils))) + (snippet #~(delete-file-recursively "test/googletest-1.13.0")) + (file-name (git-file-name name version)) + (sha256 + (base32 "12ncx2hlsl5vp9yfja6myxalg85j0kgxwbargn37yiwi8rn17m8s")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags '("-DYAML_BUILD_SHARED_LIBS=ON" + "-DYAML_CPP_BUILD_TESTS=ON" + "-DYAML_USE_SYSTEM_GTEST=ON"))) + (native-inputs + (list python)) + (inputs (list googletest)) + (home-page "https://github.com/jbeder/yaml-cpp") + (synopsis "YAML parser and emitter in C++") + (description "YAML parser and emitter in C++ matching the YAML 1.2 spec.") + (license license:bsd-3)))) (define-public jsoncpp (package (name "jsoncpp") - (version "1.9.5") + (version "1.9.6") (home-page "https://github.com/open-source-parsers/jsoncpp") (source (origin (method git-fetch) @@ -594,7 +610,7 @@ character limit for implicit keys.") (file-name (git-file-name name version)) (sha256 (base32 - "06zss7z56ykzwcsfdxarmini63hkf8i8gx70q3yw9wb0bw7wj9rv")))) + "070xg4i52z3yv5b9bw5k95qskw0daivh0njka87mzj0d3zf1qsyy")))) (build-system meson-build-system) (synopsis "C++ library for interacting with JSON") (description "JsonCpp is a C++ library that allows manipulating JSON values, @@ -603,6 +619,20 @@ preserve existing comment in unserialization/serialization steps, making it a convenient format to store user input files.") (license license:expat))) +(define-public jsoncpp/pinned + (hidden-package + ;; Version that rarely changes, depended on by CMake. + (package/inherit jsoncpp + (version "1.9.6") + (source + (origin + (method git-fetch) + (uri (git-reference (url (package-home-page jsoncpp)) (commit version))) + (file-name (git-file-name (package-name jsoncpp) version)) + (sha256 + (base32 + "070xg4i52z3yv5b9bw5k95qskw0daivh0njka87mzj0d3zf1qsyy"))))))) + ;; Tensorflow does not build with jsoncpp 1.8.x. It is built with commit ;; 4356d9bba191e1e16ce7a92073cbf3e63564e973, which lies between version 1.7.2 ;; and 1.7.3. @@ -621,7 +651,8 @@ it a convenient format to store user input files.") "1180ln8blrb0mwzpcf78k49hlki6di65q77rsvglf83kfcyh4d7z")))) (build-system cmake-build-system) (arguments - (list #:configure-flags + (list #:tests? #f + #:configure-flags #~'("-DBUILD_SHARED_LIBS:BOOL=YES" #$@(if (%current-target-system) #~("-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF") diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 2bfa4e83af..0759a56385 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -143,8 +143,12 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") (list doxygen groff ; for 'fish --help' procps)) ; for the test suite (arguments - '(#:phases - (modify-phases %standard-phases + (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases (add-after 'unpack 'set-env (lambda _ ;; some tests write to $HOME @@ -244,6 +248,10 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") port) (close-port port)) #t)) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "test" args))) ;; Use fish-foreign-env to source /etc/profile. (add-before 'install 'source-etc-profile (lambda* (#:key inputs #:allow-other-keys) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index c7b1d2e2fd..567bea2c82 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages) @@ -84,14 +85,14 @@ (define-public ceph (package (name "ceph") - (version "17.2.7") + (version "17.2.9") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "1612424yrf39dz010ygz8k5x1vc8731549ckfj1r39dg00m62klp")) + "04m4zxp9hjvppl679ilnr90zr6ij08wr4ralr0whzldy0fskc8hp")) (patches (search-patches "ceph-disable-cpu-optimizations.patch" @@ -233,7 +234,7 @@ (outputs '("out" "lib")) (native-inputs - (list gperf pkg-config python-cython python-sphinx yasm)) + (list git-minimal gperf pkg-config python-cython python-sphinx yasm)) (inputs (list `(,apache-thrift "lib") `(,apache-thrift "include") diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 6bb754a079..a323457615 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -143,6 +143,7 @@ (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build qt-build-system) (guix build utils)) + #:test-exclude "SyncXAttrTest" #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-cmake @@ -159,13 +160,9 @@ (("@kwidgetsaddons@") (search-input-directory inputs "/include/KF5/KWidgetsAddons/"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" "SyncXAttrTest")))) (add-before 'check 'pre-check (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") ;; Tests write to $HOME. (setenv "HOME" (getcwd)) #t)) @@ -442,7 +439,6 @@ and securely connects to Microsoft OneDrive services.") `(;; The "tests" target is broken and assumes that tests are run in the ;; root directory. #:tests? #f - #:test-target "tests" #:phases (modify-phases %standard-phases (add-after 'unpack 'search-$PATH-for-binaries diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index dfe6a782be..dae4719b51 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -601,7 +601,7 @@ to create RSS feeds for websites that don't provide any.") (base32 "1fl362920n6nz4x9wihyzbr82d9cy60sknhmajj62whd5gs49sbw")))) (build-system meson-build-system) (inputs (list fmt tidy-html pybind11 python pugixml)) - (native-inputs (list cmake pkg-config)) ; need cmake to find pybind11 + (native-inputs (list cmake-minimal pkg-config)) ; need cmake to find pybind11 (home-page "https://gitlab.com/gabmus/syndication-domination") (synopsis "RSS/Atom feed parser") (description "This package provides an experimental RSS/Atom feed diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 1020595718..047145dd63 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -267,6 +267,9 @@ execution, and libreadline support.") (build-system cmake-build-system) (arguments (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-cmake-shell @@ -282,6 +285,10 @@ execution, and libreadline support.") (substitute* "doc/man7/CMakeLists.txt" (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}") "${CMAKE_CURRENT_SOURCE_DIR}")))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "test" args))) (add-after 'install 'install-completions (lambda _ (let ((bash-completion-install-dir diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm index 926e9dcad4..5fdc41553b 100644 --- a/gnu/packages/tbb.scm +++ b/gnu/packages/tbb.scm @@ -50,7 +50,8 @@ "tbb-gcc-14.patch")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:parallel-tests? #f + #:configure-flags '(,@(if (or (target-riscv64?) (target-ppc32?)) '("-DTBB_TEST_LINK_FLAGS=-latomic") diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index c833bcc0cc..2fa8013485 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -1291,6 +1291,7 @@ route audio during phone calls, and a library.") (sha256 (base32 "1k874v9bzipk5x9nr21f3259f5sk7nxnnz618kji0mx9aa0fvjf1")))) (build-system cmake-build-system) + (arguments (list #:tests? #f)) ; disabled by default and still failing (native-inputs (list pkg-config)) (inputs (list openssl zlib)) (synopsis "Library for real-time communications with async IO support") @@ -1321,7 +1322,8 @@ Binary Floor Control Protocol}, @acronym{HTTP, Hypertext Transfer Protocol} and (base32 "1xwvhpvrs6anw8mq709ff9d6vm0mizf6sj1sz69y85s7p4qz4rfz")))) (build-system cmake-build-system) (arguments - `(#:make-flags (list (string-append "PREFIX=" %output)) + `(#:tests? #f + #:make-flags (list (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (add-after 'unpack 'neuter-module_path (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index c2a2e79998..4d14c334ae 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -290,8 +290,6 @@ text-based approach to terminal recording.") (delete-file-recursively "external/xkbcommon") #t)))) (build-system cmake-build-system) - (arguments - `(#:configure-flags '("-DBUILD_TESTING=ON"))) (native-inputs (list check libxkbcommon ; for xkbcommon-keysyms.h pkg-config)) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b9a3c2222b..c240878926 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -77468,19 +77468,25 @@ PDF documents.") "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx")))) (build-system qt-build-system) (arguments - `(#:test-target "check" - #:phases - (modify-phases %standard-phases - ;; Qt has its own configuration utility. - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "qmake" - (string-append "PREFIX=" out) - (string-append "DESKTOPDIR=" out "/share/applications") - (string-append "ICONDIR=" out "/share/pixmaps") - (string-append "METAINFODIR=" out "/share/metainfo") - "texmaker.pro"))))))) + (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 + ;; Qt has its own configuration utility. + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "qmake" + (string-append "PREFIX=" out) + (string-append "DESKTOPDIR=" out "/share/applications") + (string-append "ICONDIR=" out "/share/pixmaps") + (string-append "METAINFODIR=" out "/share/metainfo") + "texmaker.pro")))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install))))) (inputs (list poppler-qt5 qtbase-5 qtwayland-5 qtscript-5 zlib)) (native-inputs diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index db32a20e0c..e1c69ceb60 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages cmake) #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) @@ -780,8 +781,7 @@ jmacs, joe, jpico, jstar, and rjoe.") (delete-file-recursively "lib/json"))))) (build-system cmake-build-system) (arguments - (list #:configure-flags #~(list "-DBUILD_TESTING=ON") - #:phases + (list #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-tiny-process-library (lambda* (#:key native-inputs inputs #:allow-other-keys) @@ -1258,27 +1258,29 @@ in plain text file format.") (base32 "05qllpls3r95nfl14gqq3cv4lisf07fgn85n52w8blc5pfl1h93g")))) (build-system cmake-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'insert-tests - (lambda* (#:key inputs #:allow-other-keys) - (let ((tests (assoc-ref inputs "tests"))) - (copy-recursively tests "tests")) - #t)) - (add-after 'insert-tests 'disable-failing-tests - (lambda _ - (substitute* "tests/parser/CMakeLists.txt" - (("# Test max property name and values") - "# Disabled: test max property name and values\nif(FALSE)\n") - (("# Test max section names") - "endif()\n\n# Test max section names")))) - (add-after 'install 'delete-static-library - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib"))) - (with-directory-excursion lib - (delete-file "libeditorconfig_static.a")) - #t)))))) + (list + #:cmake cmake-3.25 + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'insert-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((tests (assoc-ref inputs "tests"))) + (copy-recursively tests "tests")) + #t)) + (add-after 'insert-tests 'disable-failing-tests + (lambda _ + (substitute* "tests/parser/CMakeLists.txt" + (("# Test max property name and values") + "# Disabled: test max property name and values\nif(FALSE)\n") + (("# Test max section names") + "endif()\n\n# Test max section names")))) + (add-after 'install 'delete-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (with-directory-excursion lib + (delete-file "libeditorconfig_static.a")) + #t)))))) (native-inputs `(("tests" ,(origin diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index c693e043c4..ae8bce7b3e 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1463,6 +1463,7 @@ reading and writing CSV and TSV files.") (arguments ;; Required to locate the install script properly. `(#:out-of-source? #f + #:tests? #f #:parallel-build? #f ;occasionally failed. #:imported-modules (,@%cmake-build-system-modules diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 79bfe7827f..7eefc31928 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -978,7 +978,8 @@ number generator") (base32 "0ldqhvmj9wl0yp3hz675zbnq69lw533s0ahy9bbdxxnj5gjb86gw")))) (build-system cmake-build-system) (arguments - (list #:configure-flags + (list #:parallel-tests? #f + #:configure-flags #~(list "-DCMAKE_C_FLAGS=-Wno-error=calloc-transposed-args" "-DUSE_SHARED_MBEDTLS_LIBRARY=ON" "-DUSE_STATIC_MBEDTLS_LIBRARY=OFF") @@ -1230,9 +1231,18 @@ ciphers such as ChaCha20, Curve25519, NTRU, and Blake2b.") (build-system cmake-build-system) (native-inputs (list perl)) (arguments - '(#:test-target "run_minimal_tests" - #:configure-flags - '("-DBUILD_SHARED_LIBS=ON" "-DDISABLE_GO=ON"))) + (list + #:configure-flags + #~(list "-DBUILD_SHARED_LIBS=ON" "-DDISABLE_GO=ON") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "run_minimal_tests" args)))))) (synopsis "General purpose cryptographic library") (description "AWS libcrypto (aws-lc) contains portable C implementations of algorithms needed for TLS and common applications, and includes optimized diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 368a01941b..cbdb31e3fe 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2833,9 +2833,14 @@ projects while introducing many more.") (list #:tests? #false ; no tests #:make-flags #~(list (string-append "PREFIX=" #$output) (string-append "CC=" #+(cc-for-target))) + #:modules '((guix build qt-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases #~(modify-phases %standard-phases (delete 'configure) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install)) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4151,7 +4156,7 @@ be used for realtime video capture via Linux-specific APIs.") (build-system cmake-build-system) (arguments (list - #:cmake cmake-next ;needs cmake >= 3.28 + #:tests? #f #:configure-flags #~(let ((libdir (string-append (assoc-ref %outputs "out") "/lib"))) (list (string-append "-DOBS_VERSION_OVERRIDE=" #$version) @@ -6112,7 +6117,8 @@ create smoother and stable videos.") qtsvg-5 zeromq)) (arguments - `(#:configure-flags + `(#:tests? #f + #:configure-flags (list (string-append "-DPYTHON_MODULE_PATH:PATH=" %output "/lib/python" ,(version-major+minor (package-version python)) "/site-packages") diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 89a001b51c..b67f5b1373 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -811,7 +811,8 @@ is based on Vim's builtin plugin support.") "1j3z7jay0m6g06v04falrzr062g07xr4svbrc3hywlqi2h6rrvk5")))) (build-system cmake-build-system) (arguments - (list #:modules + (list #:tests? #f + #:modules '((srfi srfi-26) (guix build cmake-build-system) (guix build utils)) #:configure-flags diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index c4051c7672..c7883d1bbc 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -372,7 +372,7 @@ used to connect to VNC servers such as the tigervnc-server package.") libtool gettext-minimal font-util - cmake + cmake-minimal perl))) (inputs (modify-inputs (append (package-inputs xorg-server) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1df4e9d1c5..53e6e9d4b1 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -190,7 +190,16 @@ SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.") (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" #$output "/lib") "-DBUILD_SHARED_LIBS=ON" - "-DLLVM_SPIRV_INCLUDE_TESTS=ON"))) + "-DLLVM_SPIRV_INCLUDE_TESTS=ON") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "test" args)))))) (inputs (list llvm-18)) (native-inputs (list clang-18 llvm-18 python-lit spirv-headers)) (home-page "https://github.com/KhronosGroup/SPIRV-LLVM-Translator") @@ -216,8 +225,7 @@ translation between LLVM IR and SPIR-V.") (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:cmake ,cmake-minimal-3.30 - #:configure-flags '("-DBUILD_SHARED_LIBS=ON" + `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON" ,@(if (target-riscv64?) `("-DCMAKE_EXE_LINKER_FLAGS=-latomic") @@ -371,6 +379,7 @@ Enhanced Subpixel Morphological Anti-Aliasing ;; Limit the tests to those architectures tested upstream. #:tests? (and (not (%current-target-system)) (target-x86?)) + #:parallel-tests? #f #:configure-flags #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" (dirname (dirname diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c5048ece31..a9b5f732ab 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1712,12 +1712,27 @@ current version of any major web browser.") (delete-file-recursively "bin/jsonchecker"))))) (build-system cmake-build-system) (arguments - '(#:phases + '(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-Wno-free-nonheap-object") + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-march=native (lambda _ (substitute* "CMakeLists.txt" - (("-m[^-]*=native") ""))))))) + (("-m[^-]*=native") "")))) + (add-after 'fix-march=native 'skip-deleted-tests + (lambda _ + (substitute* "test/unittest/CMakeLists.txt" + (("jsoncheckertest.cpp") "")))) + (add-after 'fix-march=native 'fix-dependencies + (lambda _ + (substitute* "test/CMakeLists.txt" + (("^find_package\\(GTestSrc\\)") + "find_package(GTest REQUIRED)") + ((".*GTEST_SOURCE_DIR.*") "") + (("GTESTSRC_FOUND)") + "GTest_FOUND)"))))))) + (native-inputs (list valgrind/pinned)) + (inputs (list googletest)) (home-page "https://github.com/Tencent/rapidjson") (synopsis "JSON parser/generator for C++ with both SAX/DOM style API") (description @@ -1766,7 +1781,8 @@ C.") (search-patches "yajl-CVE-2023-33460.patch")))) (build-system cmake-build-system) (arguments - '(#:phases + '(#:tests? #f + #:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-tests (lambda _ @@ -1853,8 +1869,10 @@ for efficient socket-like bidirectional reliable communication channels.") (list ;; Tests on non-x86_64 architectures are not well supported upstream. #:tests? (target-x86-64?) - #:test-target "run-tests" #:configure-flags '(list "-DUSE_SYSTEM_GTEST=ON") + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) #:phases '(modify-phases %standard-phases (add-after 'unpack 'use-gcc @@ -1862,7 +1880,11 @@ for efficient socket-like bidirectional reliable communication channels.") ;; XXX This is the only test that fails. (add-after 'unpack 'delete-broken-test (lambda _ - (delete-file "test/wasm2c/spec/memory_init.txt")))))) + (delete-file "test/wasm2c/spec/memory_init.txt"))) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "run-tests" args)))))) (native-inputs (list python googletest)) (home-page "https://github.com/WebAssembly/wabt") (synopsis "WebAssembly Binary Toolkit") @@ -1990,7 +2012,8 @@ features.") (patches (search-patches "websocketpp-fix-for-cmake-3.15.patch")))) (build-system cmake-build-system) (inputs (list boost openssl)) - (arguments '(#:configure-flags '("-DBUILD_TESTS=ON") + (arguments '(#:parallel-tests? #f + #:configure-flags '("-DBUILD_TESTS=ON") #:phases (modify-phases %standard-phases (add-after 'install 'remove-tests @@ -7626,6 +7649,7 @@ protocols.") (build-system cmake-build-system) (arguments (list + #:tests? #f #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" "-DCIVETWEB_ENABLE_CXX=ON" @@ -9031,6 +9055,7 @@ HTTrack is fully configurable, and has an integrated help system.") (build-system cmake-build-system) (arguments (list + #:tests? #f #:phases '(modify-phases %standard-phases (add-after 'unpack 'use-system-googletest @@ -9577,7 +9602,7 @@ grepping the list.") (define-public libzim (package (name "libzim") - (version "8.2.1") + (version "9.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -9585,7 +9610,7 @@ grepping the list.") (commit version))) (sha256 (base32 - "1g735aqw0vlxqgyjv02lvq24dr5shydp4y8mqianf8720s5fs73f")) + "1il1vc1hs954s3vnwhr337165dxbykvrldrvbilp5jxbkmwqb60d")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments @@ -9611,7 +9636,7 @@ for ZIM files.") (define-public kiwix-lib (package (name "kiwix-lib") - (version "13.0.0") + (version "14.0.0") (home-page "https://github.com/kiwix/kiwix-lib/") (source (origin (method git-fetch) @@ -9620,7 +9645,7 @@ for ZIM files.") (commit version))) (sha256 (base32 - "0mvlppbj0mqn4ka3cfaaj1pvn062cxbgz01c0nq04x0mzq1xwh5w")) + "099arjsx1wgz5jhvzn49859wh0v8n3ya33kmnqaw69h55mjvgza0")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments @@ -9656,7 +9681,7 @@ It contains the code shared by all Kiwix ports.") (define-public kiwix-desktop (package (name "kiwix-desktop") - (version "2.3.1") + (version "2.4.1") (source (origin (method url-fetch) (uri (string-append @@ -9665,18 +9690,23 @@ It contains the code shared by all Kiwix ports.") ".tar.gz")) (sha256 (base32 - "0hlk05gcb3fmnxhwj6gan51v98rdq3iv2lklwbpmm1bazmz8i7br")) - (patches (search-patches "kiwix-desktop-newer-libkiwix.patch")))) + "1vkmk9j2jii7ri4lcayr0dr5b2w3dc24lyqmm3g4234834b1f4wl")))) (build-system qt-build-system) (arguments - `(#:test-target "check" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (invoke "qmake" - (string-append "PREFIX=" - (assoc-ref outputs "out")))))))) + (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 + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" + (string-append "PREFIX=" + (assoc-ref outputs "out"))))) + (replace 'build (assoc-ref gnu:%standard-phases 'build)) + (replace 'install (assoc-ref gnu:%standard-phases 'install))))) (inputs (list bash-minimal curl @@ -9705,14 +9735,14 @@ offline (such as Wikipedia), without any access to Internet.") (define-public kiwix-tools (package (name "kiwix-tools") - (version "3.5.0") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append "https://download.kiwix.org/release/" "kiwix-tools/kiwix-tools-" version ".tar.xz")) (sha256 (base32 - "0q6b7viy1jr212q0glqid2hqxnsd2mxsx5gzcalkc4gb0bzgj32d")))) + "032lzzgn3hicai4lx701cs6h731cs29x1h59j9gggcgrp1n4wxks")))) (build-system meson-build-system) (inputs (list curl diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 52642760e0..92f86c25f8 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -393,8 +393,7 @@ loginctl commands (lock/unlock/before-sleep) and inhibit.") "0mn97wlzc5ccywbq87ka7a27jajkdkgypkfzkcan014viph80wif")))) (build-system cmake-build-system) (arguments - (list #:cmake cmake-next - #:tests? #f ;No tests. + (list #:tests? #f ;No tests. #:configure-flags #~'("-DNO_HYPRPM=True") #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7737aed2b1..13cbcc94d8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -261,8 +261,7 @@ command line, without displaying a keyboard at all.") "0cwbd9cdbg40frhircwfbaxdqh11s8jqq9dqy228j9zvb27y2b72")))) (build-system cmake-build-system) (arguments - (list #:cmake cmake-next - ;; TODO: Figure out what's expected in the test environment. + (list ;; TODO: Figure out what's expected in the test environment. #:tests? #f)) (native-inputs (list gcc-15 hyprwayland-scanner pkg-config)) @@ -3411,8 +3410,7 @@ virtual-pointer (pointer command) protocols.") (base32 "14gnkz18dipsa2v24f4nm9syxaa7g21iqjm7y65jn849ka2jr1h8")))) (build-system cmake-build-system) (arguments - (list #:configure-flags #~(list "-DBUILD_TESTING=ON") - #:phases #~(modify-phases %standard-phases + (list #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-problematic-tests (lambda _ (substitute* "config_parser_test.cc" @@ -3944,9 +3942,7 @@ This package is the fork of hsetroot by Hyriand.") (base32 "0h0iibncjl780nnwvf1mfmqckdzzc4b4fphflj4mq56nswf697ha")))) (build-system cmake-build-system) (arguments - (list - #:cmake cmake-next - #:tests? #f)) ;No tests. + (list #:tests? #f)) ;No tests. (native-inputs (list gcc-15 pkg-config)) @@ -3984,8 +3980,7 @@ reduce percieved brightness below the monitor's minimum.") (base32 "1f0vcp0c9d3m9v3avajprpv14khnv3wk3y9fi3pcwr5xf2alaxv2")))) (build-system cmake-build-system) (arguments - `(#:cmake ,cmake-next - #:phases + `(#:phases (modify-phases %standard-phases ;; remove when fixed (add-after 'unpack 'fixgldiscover @@ -4034,9 +4029,7 @@ GPU-accelerated screen locking utility.") (base32 "0j3hbqfx40cjxkvaiqzfij8pgblg2hyv9lbbjjh4iahciwgh7623")))) (build-system cmake-build-system) - (arguments - `(#:tests? #f ;; no test - #:cmake ,cmake-next)) + (arguments '(#:tests? #f)) ;; no test (native-inputs (list gcc-14 pkg-config)) (inputs (list cairo diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 6dc4eb2b1b..c5ebb1b673 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1199,8 +1199,8 @@ Onion Service.") alist "Association list of port to address mappings. The following example: @lisp -'((22 . \"127.0.0.1:22\") - (80 . \"127.0.0.1:8080\")) +'((22 \"127.0.0.1:22\") + (80 \"127.0.0.1:8080\")) @end lisp maps ports 22 and 80 of the Onion Service to the local ports 22 and 8080.")) @@ -1395,8 +1395,8 @@ networking daemon."))) @var{mapping}. @var{mapping} is a list of port/host tuples, such as: @example - '((22 . \"127.0.0.1:22\") - (80 . \"127.0.0.1:8080\")) + '((22 \"127.0.0.1:22\") + (80 \"127.0.0.1:8080\")) @end example In this example, port 22 of the hidden service is mapped to local port 22, and diff --git a/gnu/tests/messaging.scm b/gnu/tests/messaging.scm index f1f4247c58..0601ff6f69 100644 --- a/gnu/tests/messaging.scm +++ b/gnu/tests/messaging.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017-2018, 2021-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2025 Evgeny Pisemsky <mail@pisemsky.site> ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,7 +43,8 @@ %test-bitlbee %test-ngircd %test-pounce - %test-quassel)) + %test-quassel + %test-mosquitto)) (define (run-xmpp-test name xmpp-service pid-file create-account) "Run a test of an OS running XMPP-SERVICE, which writes its PID to PID-FILE." @@ -592,3 +594,78 @@ OPENSSL:localhost:7000,verify=0 &") (name "quassel") (description "Connect to a quassel IRC server.") (value (run-quassel-test)))) + + +;;; +;;; Mosquitto. +;;; + +(define (run-mosquitto-test) + (define os + (marionette-operating-system + (simple-operating-system (service dhcpcd-service-type) + (service mosquitto-service-type)) + #:imported-modules (source-module-closure + '((gnu services herd))))) + + (define vm + (virtual-machine + (operating-system os))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-64) + (gnu build marionette)) + + (define marionette + (make-marionette (list #$vm))) + + (test-runner-current (system-test-runner #$output)) + (test-begin "mosquitto") + + (test-assert "service runs" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (wait-for-service 'mosquitto)) + marionette)) + + (test-assert "service listens on TCP port 1883" + (wait-for-tcp-port 1883 marionette)) + + (test-equal "service receives a message" + 0 + (marionette-eval + '(system* #$(file-append mosquitto "/bin/mosquitto_pub") + "-t" "test-topic" + "-m" "Hello, mosquitto!" + "-r") + marionette)) + + (test-equal "service returns a message" + "Hello, mosquitto!" + (marionette-eval + '(begin + (use-modules (ice-9 popen) + (ice-9 rdelim)) + (let* ((port (open-pipe* OPEN_READ + #$(file-append + mosquitto + "/bin/mosquitto_sub") + "-t" "test-topic" + "-C" "1")) + (msg (read-line port))) + (close-pipe port) + msg)) + marionette)) + + (test-end)))) + + (gexp->derivation "mosquitto-test" test)) + +(define %test-mosquitto + (system-test + (name "mosquitto") + (description "Test a running Mosquitto MQTT broker.") + (value (run-mosquitto-test)))) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 8b1889e36b..b0587fddf0 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -31,7 +31,9 @@ #:use-module (guix packages) #:export (%cmake-build-system-modules cmake-build - cmake-build-system)) + cmake-build-system + default-cmake + default-ninja)) ;; Commentary: ;; @@ -64,10 +66,17 @@ 'cmake-minimal-cross 'cmake-minimal)))) +(define (default-ninja) + "Return the default ninja package." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((module (resolve-interface '(gnu packages ninja)))) + (module-ref module 'ninja/pinned))) + (define* (lower name #:key source inputs native-inputs outputs system target (implicit-inputs? #t) (implicit-cross-inputs? #t) (cmake (default-cmake target)) + (ninja (default-ninja)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." @@ -84,6 +93,7 @@ `(("source" ,source)) '()) ,@`(("cmake" ,cmake)) + ,@`(("ninja" ,ninja)) ,@native-inputs ,@(if target '() inputs) ,@(if (and target implicit-cross-inputs?) @@ -115,9 +125,12 @@ (search-paths '()) (make-flags ''()) (out-of-source? #t) + (generator "Unix Makefiles") (build-type "RelWithDebInfo") (tests? #t) - (test-target "test") + (test-exclude "") + (test-repeat-until-pass? #t) + (test-repeat-until-pass-count 5) (parallel-build? #t) (parallel-tests? #t) (validate-runpath? #t) (patch-shebangs? #t) @@ -155,9 +168,12 @@ provides a 'CMakeLists.txt' file as its build system." configure-flags) #:make-flags #$make-flags #:out-of-source? #$out-of-source? + #:generator #$generator #:build-type #$build-type #:tests? #$tests? - #:test-target #$test-target + #:test-exclude #$test-exclude + #:test-repeat-until-pass? #$test-repeat-until-pass? + #:test-repeat-until-pass-count #$test-repeat-until-pass-count #:parallel-build? #$parallel-build? #:parallel-tests? #$parallel-tests? #:validate-runpath? #$validate-runpath? @@ -193,9 +209,12 @@ provides a 'CMakeLists.txt' file as its build system." (native-search-paths '()) (make-flags ''()) (out-of-source? #t) + (generator "Unix Makefiles") (build-type "RelWithDebInfo") (tests? #f) ; nothing can be done - (test-target "test") + (test-exclude "") + (test-repeat-until-pass? #t) + (test-repeat-until-pass-count 5) (parallel-build? #t) (parallel-tests? #t) (validate-runpath? #t) (patch-shebangs? #t) @@ -256,9 +275,12 @@ build system." configure-flags)) #:make-flags #$make-flags #:out-of-source? #$out-of-source? + #:generator #$generator #:build-type #$build-type #:tests? #$tests? - #:test-target #$test-target + #:test-exclude #$test-exclude + #:test-repeat-until-pass? #$test-repeat-until-pass? + #:test-repeat-until-pass-count #$test-repeat-until-pass-count #:parallel-build? #$parallel-build? #:parallel-tests? #$parallel-tests? #:validate-runpath? #$validate-runpath? diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 5eeeb59e65..612e148fb6 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -137,7 +137,7 @@ TRIPLET." "Return the default ninja package." ;; Lazily resolve the binding to avoid a circular dependency. (let ((module (resolve-interface '(gnu packages ninja)))) - (module-ref module 'ninja))) + (module-ref module 'ninja/pinned))) (define (default-meson) "Return the default meson package." diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index d1f721c54e..84e008bfe7 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -61,13 +61,6 @@ (guix build qt-utils) ,@%cmake-build-system-modules)) -(define (default-cmake) - "Return the default CMake package." - - ;; Do not use `@' to avoid introducing circular dependencies. - (let ((module (resolve-interface '(gnu packages cmake)))) - (module-ref module 'cmake-minimal))) - (define (default-qtbase) "Return the default qtbase package." @@ -79,7 +72,8 @@ ;; the variables defined here. (define* (lower name #:key source inputs native-inputs outputs system target - (cmake (default-cmake)) + (cmake (default-cmake target)) + (ninja (default-ninja)) (qtbase (default-qtbase)) #:allow-other-keys #:rest arguments) @@ -96,6 +90,7 @@ `(("source" ,source)) '()) ,@`(("cmake" ,cmake)) + ,@`(("ninja" ,ninja)) ,@`(("qtbase" ,qtbase)) ,@native-inputs ,@(if target @@ -128,9 +123,12 @@ (search-paths '()) (make-flags ''()) (out-of-source? #t) + (generator "Unix Makefiles") (build-type "RelWithDebInfo") (tests? #t) - (test-target "test") + (test-exclude "") + (test-repeat-until-pass? #t) + (test-repeat-until-pass-count 5) (parallel-build? #t) (parallel-tests? #t) (validate-runpath? #t) (patch-shebangs? #t) @@ -168,9 +166,12 @@ provides a 'CMakeLists.txt' file as its build system." #:configure-flags #$configure-flags #:make-flags #$make-flags #:out-of-source? #$out-of-source? + #:generator #$generator #:build-type #$build-type #:tests? #$tests? - #:test-target #$test-target + #:test-exclude #$test-exclude + #:test-repeat-until-pass? #$test-repeat-until-pass? + #:test-repeat-until-pass-count #$test-repeat-until-pass-count #:parallel-build? #$parallel-build? #:parallel-tests? #$parallel-tests? #:validate-runpath? #$validate-runpath? @@ -205,9 +206,12 @@ provides a 'CMakeLists.txt' file as its build system." (native-search-paths '()) (make-flags ''()) (out-of-source? #t) + (generator "Unix Makefiles") (build-type "RelWithDebInfo") (tests? #f) ; nothing can be done - (test-target "test") + (test-exclude "") + (test-repeat-until-pass? #t) + (test-repeat-until-pass-count 5) (parallel-build? #t) (parallel-tests? #f) (validate-runpath? #t) (patch-shebangs? #t) @@ -258,9 +262,12 @@ build system." #:configure-flags #$configure-flags #:make-flags #$make-flags #:out-of-source? #$out-of-source? + #:generator #$generator #:build-type #$build-type #:tests? #$tests? - #:test-target #$test-target + #:test-exclude #$test-exclude + #:test-repeat-until-pass? #$test-repeat-until-pass? + #:test-repeat-until-pass-count #$test-repeat-until-pass-count #:parallel-build? #$parallel-build? #:parallel-tests? #$parallel-tests? #:validate-runpath? #$validate-runpath? diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index 61033061c6..6d62b870ed 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2024 Greg Hogan <code@greghogan.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,8 @@ #:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module (guix build utils) #:use-module (ice-9 match) + #:use-module (ice-9 threads) + #:use-module (srfi srfi-34) #:export (%standard-phases cmake-build)) @@ -33,7 +36,7 @@ ;; Code: (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t) - build-type target + build-type target generator (tests? #t) #:allow-other-keys) "Configure the given package." (let* ((out (assoc-ref outputs "out")) @@ -48,38 +51,103 @@ (chdir "../build")) (format #t "build directory: ~s~%" (getcwd)) - (let ((args `(,srcdir - ,@(if build-type - (list (string-append "-DCMAKE_BUILD_TYPE=" - build-type)) - '()) - ,(string-append "-DCMAKE_INSTALL_PREFIX=" out) - ;; ensure that the libraries are installed into /lib - "-DCMAKE_INSTALL_LIBDIR=lib" - ;; add input libraries to rpath - "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE" - ;; add (other) libraries of the project itself to rpath - ,(string-append "-DCMAKE_INSTALL_RPATH=" out "/lib") - ;; enable verbose output from builds - "-DCMAKE_VERBOSE_MAKEFILE=ON" - ,@configure-flags))) - (format #t "running 'cmake' with arguments ~s~%" args) - (apply invoke "cmake" args)))) + (call-with-temporary-output-file + (lambda (temp port) + (let ((args `(,srcdir + ;; Load variables into the the cache to prevent + ;; warnings about unused manually-specified variables. + ,(string-append "-C " temp) + ,@(if generator + (list (string-append "-G" generator)) + '()) + ,@configure-flags))) -(define* (check #:key (tests? #t) (parallel-tests? #t) (test-target "test") + (define save-to-cache + (lambda* (name value) + ;; <type> and <docstring> arguments are used only by CMake GUIs. + (format port "set(~a \"~a\" CACHE STRING \"\")~%" name value))) + + (if build-type + (save-to-cache "CMAKE_BUILD_TYPE" build-type)) + (save-to-cache "CMAKE_INSTALL_PREFIX" out) + ;; Ensure that the libraries are installed into /lib. + (save-to-cache "CMAKE_INSTALL_LIBDIR" "lib") + ;; Add input libraries to rpath. + (save-to-cache "CMAKE_INSTALL_RPATH_USE_LINK_PATH" "TRUE") + ;; Add (other) libraries of the project itself to rpath. + (save-to-cache "CMAKE_INSTALL_RPATH" (string-append out "/lib")) + ;; Enable verbose output from builds. + (save-to-cache "CMAKE_VERBOSE_MAKEFILE" "ON") + ;; Enable colored compiler diagnostics. + (save-to-cache "CMAKE_COLOR_DIAGNOSTICS" "ON") + ;; BUILD_TESTING in an option of CMake's CTest module. + (save-to-cache "BUILD_TESTING" (if tests? "ON" "OFF")) + + (close-port port) + (format #t "running 'cmake' with arguments ~s~%" args) + (apply invoke "cmake" args)))))) + +(define* (build #:key (make-flags '()) (parallel-build? #t) #:allow-other-keys) - (let ((gnu-check (assoc-ref gnu:%standard-phases 'check))) - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (gnu-check #:tests? tests? #:test-target test-target - #:parallel-tests? parallel-tests?))) + (apply invoke "cmake" + `("--build" + "." + ,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + ;; When unset CMake defers to the build system. + '("-j" "1")) + ;; Pass the following options to the native tool. + "--" + ,@(if parallel-build? + ;; Set load average limit for Make and Ninja. + `("-l" ,(number->string (total-processor-count))) + '()) + ,@make-flags))) + +(define %test-suite-log-regexp + ;; Name of test suite log files as commonly found in CMake. + "^LastTest\\.log$") + +(define* (check #:key (tests? #t) (test-exclude "") + (parallel-tests? #t) + (test-repeat-until-pass? #t) + (test-repeat-until-pass-count 5) + (test-suite-log-regexp %test-suite-log-regexp) + #:allow-other-keys) + (if tests? + (guard (c ((invoke-error? c) + ;; Dump the test suite log to facilitate debugging. + (display "\nTest suite failed, dumping logs.\n" + (current-error-port)) + (gnu:dump-file-contents "." test-suite-log-regexp) + (raise c))) + (apply invoke "ctest" "--output-on-failure" "--no-tests=error" + `(,@(if (string-null? test-exclude) + '() + `("--exclude-regex" ,test-exclude)) + ,@(if parallel-tests? + `("-j" ,(number->string (parallel-job-count)) + "--test-load" + ,(number->string (total-processor-count))) + ;; When unset CMake defers to the build system. + '("-j" "1")) + ,@(if test-repeat-until-pass? + `("--repeat" + ,(string-append "until-pass:" + (number->string test-repeat-until-pass-count))) + '())))) + (format #t "test suite not run~%"))) + +(define* (install #:rest args) + (invoke "cmake" "--install" ".")) (define %standard-phases - ;; Everything is as with the GNU Build System except for the `configure' - ;; and 'check' phases. (modify-phases gnu:%standard-phases (delete 'bootstrap) + (replace 'build build) (replace 'check check) - (replace 'configure configure))) + (replace 'configure configure) + (replace 'install install))) (define* (cmake-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 0ef84c9cdf..24cb5ef747 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Alice Brenon <alice.brenon@ens-lyon.fr> ;;; Copyright © 2022 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com> +;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -271,6 +272,9 @@ thrown." ("MS-PL" . license:ms-pl) ("NCSA" . license:ncsa) ("OGL-UK-1.0" . license:ogl-psi1.0) + ("CERN-OHL-S-2.0" . license:ohl2-s) + ("CERN-OHL-P-2.0" . license:ohl2-p) + ("CERN-OHL-W-2.0" . license:ohl2-w) ("OpenSSL" . license:openssl) ("OLDAP-2.8" . license:openldap2.8) ("OPL-1.0" . license:opl1.0+) diff --git a/guix/licenses.scm b/guix/licenses.scm index 8fd4f36392..5550c48376 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org> ;;; Copyright © 2021 Kyle Meyer <kyle@kyleam.com> +;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,6 +91,7 @@ ncsa nmap ogl-psi1.0 + ohl2-s ohl2-w ohl2-p openldap2.8 openssl perl-license psfl public-domain @@ -648,6 +650,21 @@ at URI, which may be a file:// URI pointing the package's tree." "https://www.nationalarchives.gov.uk/doc/open-government-licence/version/1/" #f)) +(define ohl2-s + (license "Cern OHL version 2 - Strongly reciprocal variant" + "https://ohwr.org/cern_ohl_s_v2.txt" + "https://cern-ohl.web.cern.ch/home")) + +(define ohl2-w + (license "Cern OHL version 2 - Weakly reciprocal variant" + "https://ohwr.org/cern_ohl_w_v2.txt" + "https://cern-ohl.web.cern.ch/home")) + +(define ohl2-p + (license "Cern OHL version 2 - Permissive variant" + "https://ohwr.org/cern_ohl_p_v2.txt" + "https://cern-ohl.web.cern.ch/home")) + (define openssl (license "OpenSSL" "http://directory.fsf.org/wiki/License:OpenSSL" |