* [bug#70031] [PATCH v2 01/65] build-system/cmake: Parallelize tests using ctest.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
@ 2024-10-22 18:08 ` Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 02/65] build-system/cmake: Add generator fields Greg Hogan
` (63 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:08 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build/cmake-build-system.scm (check): Replace call to gnu-build's
non-parallelizable check with an implementation using cmake's ctest.
---
guix/build/cmake-build-system.scm | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm
index d1ff5071be..1109b5c7c4 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,7 @@ (define-module (guix build cmake-build-system)
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
#:use-module (guix build utils)
#:use-module (ice-9 match)
+ #:use-module (srfi srfi-34)
#:export (%standard-phases
cmake-build))
@@ -77,12 +79,26 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t)
(format #t "running 'cmake' with arguments ~s~%" args)
(apply invoke "cmake" args))))
-(define* (check #:key (tests? #t) (parallel-tests? #t) (test-target "test")
+(define %test-suite-log-regexp
+ ;; Name of test suite log files as commonly found in CMake.
+ "^LastTest\\.log$")
+
+(define* (check #:key (tests? #t) (parallel-tests? #t)
+ (test-suite-log-regexp %test-suite-log-regexp)
#: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?)))
+ (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"
+ `(,@(if parallel-tests?
+ `("-j" ,(number->string (parallel-job-count)))
+ ;; When unset CMake defers to the build system.
+ '("-j" "1")))))
+ (format #t "test suite not run~%")))
(define %standard-phases
;; Everything is as with the GNU Build System except for the `configure'
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 02/65] build-system/cmake: Add generator fields.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 01/65] build-system/cmake: Parallelize tests using ctest Greg Hogan
@ 2024-10-22 18:08 ` Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 03/65] build-system/qt: " Greg Hogan
` (62 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:08 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build-system/cmake.scm (cmake-build, cmake-cross-build):
Add generator field defaulted to the default CMake build system
generator.
* doc/guix.texi: Document generator parameter.
Change-Id: I82c8157ac865bc1ea435910421ceff36decc34ca
---
doc/guix.texi | 29 ++++++++++++++++++++---------
guix/build-system/cmake.scm | 4 ++++
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index ac3a7adef0..d7efec0aab 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -132,6 +132,7 @@
Copyright @copyright{} 2024 Fabio Natali@*
Copyright @copyright{} 2024 Arnaud Daby-Seesaram@*
Copyright @copyright{} 2024 Nigko Yerden@*
+Copyright @copyright{} 2024 Greg Hogan@*
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -9443,16 +9444,26 @@ Build Systems
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}:
-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.
+@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.
+@end table
@end defvar
@defvar composer-build-system
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index 0b8a651ee0..af6d2e5c8a 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -101,6 +101,7 @@ (define* (cmake-build name inputs
(search-paths '())
(make-flags ''())
(out-of-source? #t)
+ (generator "Unix Makefiles")
(build-type "RelWithDebInfo")
(tests? #t)
(test-target "test")
@@ -141,6 +142,7 @@ (define* (cmake-build name inputs
configure-flags)
#:make-flags #$make-flags
#:out-of-source? #$out-of-source?
+ #:generator #$generator
#:build-type #$build-type
#:tests? #$tests?
#:test-target #$test-target
@@ -179,6 +181,7 @@ (define* (cmake-cross-build name
(native-search-paths '())
(make-flags ''())
(out-of-source? #t)
+ (generator "Unix Makefiles")
(build-type "RelWithDebInfo")
(tests? #f) ; nothing can be done
(test-target "test")
@@ -234,6 +237,7 @@ (define* (cmake-cross-build name
#: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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 03/65] build-system/qt: Add generator fields.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 01/65] build-system/cmake: Parallelize tests using ctest Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 02/65] build-system/cmake: Add generator fields Greg Hogan
@ 2024-10-22 18:08 ` Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 04/65] build-system/cmake: Add generator Greg Hogan
` (61 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:08 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build-system/qt.scm (qt-build, qt-cross-build): Add generator
field defaulted to the default CMake build system generator.
Change-Id: I41e003a212f94a636a7503eec37c90a2d9de23f6
---
guix/build-system/qt.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index d1f721c54e..8771888a62 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -128,6 +128,7 @@ (define* (qt-build name inputs
(search-paths '())
(make-flags ''())
(out-of-source? #t)
+ (generator "Unix Makefiles")
(build-type "RelWithDebInfo")
(tests? #t)
(test-target "test")
@@ -168,6 +169,7 @@ (define* (qt-build name inputs
#: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
@@ -205,6 +207,7 @@ (define* (qt-cross-build name
(native-search-paths '())
(make-flags ''())
(out-of-source? #t)
+ (generator "Unix Makefiles")
(build-type "RelWithDebInfo")
(tests? #f) ; nothing can be done
(test-target "test")
@@ -258,6 +261,7 @@ (define* (qt-cross-build name
#: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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 04/65] build-system/cmake: Add generator.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (2 preceding siblings ...)
2024-10-22 18:08 ` [bug#70031] [PATCH v2 03/65] build-system/qt: " Greg Hogan
@ 2024-10-22 18:08 ` Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 05/65] build-system/cmake: Add build Greg Hogan
` (60 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:08 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build/cmake-build-system.scm (configure): Add and use generator
field to configure the build system.
Change-Id: Ie6f439f031c3ba063773e6aa2c9c36c5eda56c0f
---
guix/build/cmake-build-system.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm
index 1109b5c7c4..3fab010c85 100644
--- a/guix/build/cmake-build-system.scm
+++ b/guix/build/cmake-build-system.scm
@@ -35,7 +35,7 @@ (define-module (guix build cmake-build-system)
;; Code:
(define* (configure #:key outputs (configure-flags '()) (out-of-source? #t)
- build-type target
+ build-type target generator
#:allow-other-keys)
"Configure the given package."
(let* ((out (assoc-ref outputs "out"))
@@ -51,6 +51,9 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t)
(format #t "build directory: ~s~%" (getcwd))
(let ((args `(,srcdir
+ ,@(if generator
+ (list (string-append "-G" generator))
+ '())
,@(if build-type
(list (string-append "-DCMAKE_BUILD_TYPE="
build-type))
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 05/65] build-system/cmake: Add build.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (3 preceding siblings ...)
2024-10-22 18:08 ` [bug#70031] [PATCH v2 04/65] build-system/cmake: Add generator Greg Hogan
@ 2024-10-22 18:08 ` Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 06/65] build-system/cmake: Add install Greg Hogan
` (59 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:08 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build/cmake-build-system.scm (build): New function to replace
the make build with the cmake build command.
---
guix/build/cmake-build-system.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm
index 3fab010c85..d827be1806 100644
--- a/guix/build/cmake-build-system.scm
+++ b/guix/build/cmake-build-system.scm
@@ -82,6 +82,15 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t)
(format #t "running 'cmake' with arguments ~s~%" args)
(apply invoke "cmake" args))))
+(define* (build #:key (parallel-build? #t) #:allow-other-keys)
+ (apply invoke "cmake"
+ `("--build"
+ "."
+ ,@(if parallel-build?
+ `("-j" ,(number->string (parallel-job-count)))
+ ;; When unset CMake defers to the build system.
+ '("-j" "1")))))
+
(define %test-suite-log-regexp
;; Name of test suite log files as commonly found in CMake.
"^LastTest\\.log$")
@@ -104,10 +113,9 @@ (define* (check #:key (tests? #t) (parallel-tests? #t)
(format #t "test suite not run~%")))
(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)))
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 06/65] build-system/cmake: Add install.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (4 preceding siblings ...)
2024-10-22 18:08 ` [bug#70031] [PATCH v2 05/65] build-system/cmake: Add build Greg Hogan
@ 2024-10-22 18:08 ` Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 07/65] build-system/cmake: Add test-exclude fields Greg Hogan
` (58 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:08 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build/cmake-build-system.scm (build): New function to replace
make install with the cmake install command.
---
guix/build/cmake-build-system.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm
index d827be1806..250ef96540 100644
--- a/guix/build/cmake-build-system.scm
+++ b/guix/build/cmake-build-system.scm
@@ -112,12 +112,16 @@ (define* (check #:key (tests? #t) (parallel-tests? #t)
'("-j" "1")))))
(format #t "test suite not run~%")))
+(define* (install #:rest args)
+ (invoke "cmake" "--install" "."))
+
(define %standard-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)
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 07/65] build-system/cmake: Add test-exclude fields.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (5 preceding siblings ...)
2024-10-22 18:08 ` [bug#70031] [PATCH v2 06/65] build-system/cmake: Add install Greg Hogan
@ 2024-10-22 18:08 ` Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 08/65] build-system/qt: " Greg Hogan
` (57 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:08 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build-system/cmake.scm (cmake-build, cmake-cross-build):
Add test-exclude field.
* doc/guix.texi: Document test-exclude parameter.
Change-Id: I7e2596968bec74ea7b48850abd9ab2c6a5121043
---
doc/guix.texi | 4 ++++
guix/build-system/cmake.scm | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/doc/guix.texi b/doc/guix.texi
index d7efec0aab..7d38a1322f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9463,6 +9463,10 @@ Build Systems
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}.
@end table
@end defvar
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index af6d2e5c8a..d9e9bf7bb6 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -105,6 +105,7 @@ (define* (cmake-build name inputs
(build-type "RelWithDebInfo")
(tests? #t)
(test-target "test")
+ (test-exclude "")
(parallel-build? #t) (parallel-tests? #t)
(validate-runpath? #t)
(patch-shebangs? #t)
@@ -146,6 +147,7 @@ (define* (cmake-build name inputs
#:build-type #$build-type
#:tests? #$tests?
#:test-target #$test-target
+ #:test-exclude #$test-exclude
#:parallel-build? #$parallel-build?
#:parallel-tests? #$parallel-tests?
#:validate-runpath? #$validate-runpath?
@@ -185,6 +187,7 @@ (define* (cmake-cross-build name
(build-type "RelWithDebInfo")
(tests? #f) ; nothing can be done
(test-target "test")
+ (test-exclude "")
(parallel-build? #t) (parallel-tests? #t)
(validate-runpath? #t)
(patch-shebangs? #t)
@@ -241,6 +244,7 @@ (define* (cmake-cross-build name
#:build-type #$build-type
#:tests? #$tests?
#:test-target #$test-target
+ #:test-exclude #$test-exclude
#:parallel-build? #$parallel-build?
#:parallel-tests? #$parallel-tests?
#:validate-runpath? #$validate-runpath?
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 08/65] build-system/qt: Add test-exclude fields.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (6 preceding siblings ...)
2024-10-22 18:08 ` [bug#70031] [PATCH v2 07/65] build-system/cmake: Add test-exclude fields Greg Hogan
@ 2024-10-22 18:08 ` Greg Hogan
2024-10-22 18:08 ` [bug#70031] [PATCH v2 09/65] build-system/cmake: Add test exclusion Greg Hogan
` (56 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:08 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build-system/qt.scm (qt-build, qt-cross-build): Add test-exclude
field.
Change-Id: I415c0b110e6214c391b2c9c0952cbda0e848041e
---
guix/build-system/qt.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index 8771888a62..6f52faf1d0 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -132,6 +132,7 @@ (define* (qt-build name inputs
(build-type "RelWithDebInfo")
(tests? #t)
(test-target "test")
+ (test-exclude "")
(parallel-build? #t) (parallel-tests? #t)
(validate-runpath? #t)
(patch-shebangs? #t)
@@ -173,6 +174,7 @@ (define* (qt-build name inputs
#:build-type #$build-type
#:tests? #$tests?
#:test-target #$test-target
+ #:test-exclude #$test-exclude
#:parallel-build? #$parallel-build?
#:parallel-tests? #$parallel-tests?
#:validate-runpath? #$validate-runpath?
@@ -211,6 +213,7 @@ (define* (qt-cross-build name
(build-type "RelWithDebInfo")
(tests? #f) ; nothing can be done
(test-target "test")
+ (test-exclude "")
(parallel-build? #t) (parallel-tests? #f)
(validate-runpath? #t)
(patch-shebangs? #t)
@@ -265,6 +268,7 @@ (define* (qt-cross-build name
#:build-type #$build-type
#:tests? #$tests?
#:test-target #$test-target
+ #:test-exclude #$test-exclude
#:parallel-build? #$parallel-build?
#:parallel-tests? #$parallel-tests?
#:validate-runpath? #$validate-runpath?
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 09/65] build-system/cmake: Add test exclusion.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (7 preceding siblings ...)
2024-10-22 18:08 ` [bug#70031] [PATCH v2 08/65] build-system/qt: " Greg Hogan
@ 2024-10-22 18:08 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 10/65] build-system/cmake: Optionally build tests Greg Hogan
` (55 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:08 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build/cmake-build-system.scm (check): Pass test exclusion regex
to ctest.
Change-Id: I11160f5b43a67006616057d19f863fdbc9337bf6
---
guix/build/cmake-build-system.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm
index 250ef96540..b90a0c14a9 100644
--- a/guix/build/cmake-build-system.scm
+++ b/guix/build/cmake-build-system.scm
@@ -95,7 +95,8 @@ (define %test-suite-log-regexp
;; Name of test suite log files as commonly found in CMake.
"^LastTest\\.log$")
-(define* (check #:key (tests? #t) (parallel-tests? #t)
+(define* (check #:key (tests? #t) (test-exclude "")
+ (parallel-tests? #t)
(test-suite-log-regexp %test-suite-log-regexp)
#:allow-other-keys)
(if tests?
@@ -106,7 +107,10 @@ (define* (check #:key (tests? #t) (parallel-tests? #t)
(gnu:dump-file-contents "." test-suite-log-regexp)
(raise c)))
(apply invoke "ctest" "--output-on-failure"
- `(,@(if parallel-tests?
+ `(,@(if (string-null? test-exclude)
+ '()
+ `("--exclude-regex" ,test-exclude))
+ ,@(if parallel-tests?
`("-j" ,(number->string (parallel-job-count)))
;; When unset CMake defers to the build system.
'("-j" "1")))))
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 10/65] build-system/cmake: Optionally build tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (8 preceding siblings ...)
2024-10-22 18:08 ` [bug#70031] [PATCH v2 09/65] build-system/cmake: Add test exclusion Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 11/65] build-system/cmake: Include ninja Greg Hogan
` (54 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build/cmake-build-system.scm (configure): Create and use CMake
variable cache file. Set the CMake variable BUILD_TESTING to the value
of TESTS? so that a package can optionally build tests. Set
CMAKE_COLOR_DIAGNOSTICS to ON.
Change-Id: Ia69de938a56733f717d4b4c6207b499bcee524ff
---
guix/build/cmake-build-system.scm | 75 ++++++++++++++++++-------------
1 file changed, 44 insertions(+), 31 deletions(-)
diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm
index b90a0c14a9..0933801ecb 100644
--- a/guix/build/cmake-build-system.scm
+++ b/guix/build/cmake-build-system.scm
@@ -35,7 +35,7 @@ (define-module (guix build cmake-build-system)
;; Code:
(define* (configure #:key outputs (configure-flags '()) (out-of-source? #t)
- build-type target generator
+ build-type target generator (tests? #t)
#:allow-other-keys)
"Configure the given package."
(let* ((out (assoc-ref outputs "out"))
@@ -50,37 +50,50 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t)
(chdir "../build"))
(format #t "build directory: ~s~%" (getcwd))
- (let ((args `(,srcdir
- ,@(if generator
- (list (string-append "-G" generator))
- '())
- ,@(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"
+ (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)))
- ;; Cross-build
- ,@(if target
- (list (string-append "-DCMAKE_C_COMPILER="
- target "-gcc")
- (string-append "-DCMAKE_CXX_COMPILER="
- target "-g++")
- (if (string-contains target "mingw")
- "-DCMAKE_SYSTEM_NAME=Windows"
- "-DCMAKE_SYSTEM_NAME=Linux"))
- '())
- ,@configure-flags)))
- (format #t "running 'cmake' with arguments ~s~%" args)
- (apply invoke "cmake" args))))
+ (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"))
+
+ ;; Cross-build
+ (if target
+ (begin
+ (save-to-cache "CMAKE_C_COMPILER" (string-append target "-gcc"))
+ (save-to-cache "CMAKE_CXX_COMPILER" (string-append target "-g++"))
+ (if (string-contains target "mingw")
+ (save-to-cache "CMAKE_SYSTEM_NAME" "Windows")
+ (save-to-cache "CMAKE_SYSTEM_NAME" "Linux"))))
+
+ (close-port port)
+ (format #t "running 'cmake' with arguments ~s~%" args)
+ (apply invoke "cmake" args))))))
(define* (build #:key (parallel-build? #t) #:allow-other-keys)
(apply invoke "cmake"
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 11/65] build-system/cmake: Include ninja.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (9 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 10/65] build-system/cmake: Optionally build tests Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 12/65] build-system/qt: " Greg Hogan
` (53 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build-system/cmake.scm (cmake-build): Add ninja to build-inputs.
Change-Id: I277615a6adb2c9f4d4ddecf2be73867fe72c2b92
---
guix/build-system/cmake.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index d9e9bf7bb6..f99c5661d2 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -72,6 +72,10 @@ (define* (lower name
`(("source" ,source))
'())
,@`(("cmake" ,cmake))
+ ,@`(("ninja" ,(module-ref
+ (resolve-interface
+ '(gnu packages ninja))
+ 'ninja)))
,@native-inputs
,@(if target '() inputs)
,@(if target
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 12/65] build-system/qt: Include ninja.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (10 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 11/65] build-system/cmake: Include ninja Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 13/65] gnu: astroid: Remove custom phases Greg Hogan
` (52 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* guix/build-system/qt.scm (qt-build): Add ninja to build-inputs.
Change-Id: I6ac3c1429c13674a94aaa869431214c49280f1da
---
guix/build-system/qt.scm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index 6f52faf1d0..56fd5561e1 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -96,6 +96,10 @@ (define* (lower name
`(("source" ,source))
'())
,@`(("cmake" ,cmake))
+ ,@`(("ninja" ,(module-ref
+ (resolve-interface
+ '(gnu packages ninja))
+ 'ninja)))
,@`(("qtbase" ,qtbase))
,@native-inputs
,@(if target
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 13/65] gnu: astroid: Remove custom phases.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (11 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 12/65] build-system/qt: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 14/65] gnu: rdma-core: " Greg Hogan
` (51 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/mail.scm (astroid):
[origin]: Remove bugfix resolved upstream.
[arguments]<#:parallel-tests?>: Disable.
<#:test-exclude>: Move exclusions from 'skip-markdown-test phase to here
and delete 'skip-markdown-test phase.
<#:generator>: Add.
<#:phases>: Remove custom 'build, 'check, and 'install.
[native-inputs]: Remove ninja.
---
gnu/packages/mail.scm | 38 +++++++++-----------------------------
1 file changed, 9 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index ead8740627..a0257f9c90 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -953,49 +953,30 @@ (define-public astroid
(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"))
@@ -1018,7 +999,6 @@ (define-public astroid
(list glib-networking
gsettings-desktop-schemas
gnupg
- ninja
pkg-config
ronn
w3m
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 14/65] gnu: rdma-core: Remove custom phases.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (12 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 13/65] gnu: astroid: Remove custom phases Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 15/65] gnu: fish: Fix tests Greg Hogan
` (50 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/linux.scm (rdma-core)
<#:configure-flags>: Remove generator.
<#:generator>: Add.
<#:phases>: Delete.
[native-inputs]: Remove ninja.
Change-Id: Ic0c2b60203df8a1e79ad1f7a51770c9c5aeaf3fc
---
gnu/packages/linux.scm | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 272d9bdd3f..2391a79a2a 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7095,9 +7095,8 @@ (define-public rdma-core
;; 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
@@ -7107,18 +7106,9 @@ (define-public rdma-core
'())
(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")
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 15/65] gnu: fish: Fix tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (13 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 14/65] gnu: rdma-core: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 16/65] gnu: igraph: " Greg Hogan
` (49 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/shells.scm (fish)[arguments]: Replace 'check phase to
replace the old cmake-build-system test target.
---
gnu/packages/shells.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 43a1fbb540..13f99bc728 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -255,6 +255,15 @@ (define-public fish
port)
(close-port port))
#t))
+ (replace 'check
+ (lambda* (#:key parallel-tests? tests? #:allow-other-keys)
+ (when tests?
+ (let ((job-count (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")))
+ ;; Test artifacts and actions are built and run with the
+ ;; 'test' target.
+ (invoke "make" "-j" job-count "test")))))
;; Use fish-foreign-env to source /etc/profile.
(add-before 'install 'source-etc-profile
(lambda* (#:key inputs #:allow-other-keys)
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 16/65] gnu: igraph: Fix tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (14 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 15/65] gnu: fish: Fix tests Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 17/65] gnu: inkscape: " Greg Hogan
` (48 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/graph.scm (igraph)[arguments]: Replace 'check phase to
replace the old cmake-build-system test target.
Change-Id: I88e10e714744433227975575c6bb94d3f205474c
---
gnu/packages/graph.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 02033c25b3..5351440450 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -144,7 +144,6 @@ (define-public igraph
;; 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"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'version-file
@@ -176,6 +175,15 @@ (define-public igraph
(add-after 'build 'build-doc
(lambda _
(invoke "cmake" "--build" "." "--target" "html")))
+ (replace 'check
+ (lambda* (#:key parallel-tests? tests? #:allow-other-keys)
+ (when tests?
+ (let ((job-count (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")))
+ ;; Test artifacts and actions are built and run with the
+ ;; 'check' target.
+ (invoke "make" "-j" job-count "check")))))
(add-after 'install 'install-doc
(lambda _
(copy-recursively
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 17/65] gnu: inkscape: Fix tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (15 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 16/65] gnu: igraph: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 18/65] gnu: inkscape/stable: " Greg Hogan
` (47 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/inkscape.scm (inkscape)[arguments]: Replace 'check
phase to replace the old cmake-build-system test target.
Change-Id: I95d4829b476b03becdf6c646bc3aabcfff1fba0a
---
gnu/packages/inkscape.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 13e1652f87..ea98a1f285 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -159,7 +159,6 @@ (define-public inkscape/stable
(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))
@@ -359,10 +358,15 @@ (define-public inkscape
#$@(if (target-x86-32?)
#~() ;XXX: there are remaining failures on i686
#~((replace 'check
+ ;; Test artifacts and actions are built with the 'check' target.
+ (lambda* (#:key parallel-tests? tests? #:allow-other-keys)
;; Re-instate the tests disabled in inkscape/stable, now that
;; their ImageMagick requirement is satisfied.
- (assoc-ref %standard-phases 'check))))
-
+ (when tests?
+ (let ((job-count (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")))
+ (invoke "make" "-j" job-count "check")))))))
(replace 'wrap-program
;; Ensure Python is available at runtime.
(lambda _
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 18/65] gnu: inkscape/stable: Fix tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (16 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 17/65] gnu: inkscape: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 19/65] gnu: kirigami: " Greg Hogan
` (46 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/inkscape.scm (inkscape/stable)[arguments]<#:phases>:
Fix argument to test command in 'check.
Change-Id: Ie89a7026f63256afabba038e0fc30e6ab0d8f3a6
---
gnu/packages/inkscape.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index ea98a1f285..c813c61e9d 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -257,7 +257,7 @@ (define-public inkscape/stable
'()))))
(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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 19/65] gnu: kirigami: Fix tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (17 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 18/65] gnu: inkscape/stable: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 20/65] gnu: kirigami-5: Disable tests Greg Hogan
` (45 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/kde-frameworks.scm (kirigami)[arguments]
<#:phases>: Add 'set-offscreen-display.
Change-Id: I054c0a2301e1e342f12ef4aa9e9b542c1339f712
---
gnu/packages/kde-frameworks.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 13d4e24726..d5bd5f0b5c 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1242,6 +1242,13 @@ (define-public kirigami
(base32
"173m6h9wr8pl5l70s6wmasm8dimkq737qgn6mlzdm18w3qb3p9s3"))))
(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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 20/65] gnu: kirigami-5: Disable tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (18 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 19/65] gnu: kirigami: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 21/65] gnu: vigra: Fix tests Greg Hogan
` (44 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/kde-frameworks.scm (kirigami)[arguments]
<#:tests?>: Re-disable tests, which are enabled by BUILD_TESTING.
Change-Id: I37061eff4514cf009208e5d29c60fa6ceecac422
---
gnu/packages/kde-frameworks.scm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index d5bd5f0b5c..f85b0d67dc 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1279,6 +1279,9 @@ (define-public kirigami-5
(sha256
(base32
"1q69b1qd2qs9hpwgw0y0ig93ag41l50dghribsnqhi0c9aklsn4b"))))
+ (arguments
+ ;; Tests require an OpenGL context
+ (list #:tests? #f))
(native-inputs
(list extra-cmake-modules qttools-5))
(inputs
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 21/65] gnu: vigra: Fix tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (19 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 20/65] gnu: kirigami-5: Disable tests Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 22/65] gnu: cpp-httplib: Disable parallel tests Greg Hogan
` (43 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/image.scm (vigra)[arguments]: Replace 'check phase to
replace the old cmake-build-system test target.
---
gnu/packages/image.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 7f17c71aef..75937cf6d8 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1371,8 +1371,7 @@ (define-public vigra
("python-nose" ,python-nose)
("sphinx" ,python-sphinx)))
(arguments
- `(#:test-target "check"
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-broken-tests
(lambda _
@@ -1383,7 +1382,16 @@ (define-public vigra
;; <https://github.com/ukoethe/vigra/issues/436>.
(substitute* "vigranumpy/test/CMakeLists.txt"
(("test1\\.py") ""))
- #t)))
+ #t))
+ (replace 'check
+ (lambda* (#:key parallel-tests? tests? #:allow-other-keys)
+ (when tests?
+ (let ((job-count (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")))
+ ;; Test artifacts and actions are built and run with the
+ ;; 'check' target.
+ (invoke "make" "-j" job-count "check"))))))
#:configure-flags
(list "-Wno-dev" ; suppress developer mode with lots of warnings
(string-append "-DVIGRANUMPY_INSTALL_DIR="
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 22/65] gnu: cpp-httplib: Disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (20 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 21/65] gnu: vigra: Fix tests Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 23/65] gnu: evolution-data-server: " Greg Hogan
` (42 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/cpp.scm (cpp-httplib)
[arguments]<#:parallel-tests?>: Disable.
Change-Id: I88334deb4afc29ab84b279e9d1759a777ddd49dd
---
gnu/packages/cpp.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 7044e491ec..a96037ffcf 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1134,7 +1134,8 @@ (define-public cpp-httplib
(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"
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 23/65] gnu: evolution-data-server: Disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (21 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 22/65] gnu: cpp-httplib: Disable parallel tests Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 24/65] gnu: kservice: " Greg Hogan
` (41 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/gnome.scm (evolution-data-server)
[arguments]<#:parallel-tests?>: Disable.
Change-Id: Ib56a2b25aa331763f72d2fd5ad034aee9b8f2d83
---
gnu/packages/gnome.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cf3d1a1496..088a60279d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8264,6 +8264,7 @@ (define-public evolution-data-server
(build-system cmake-build-system)
(arguments
(list
+ #:parallel-tests? #f
#:configure-flags
#~(let* ((lib (string-append #$output "/lib"))
(runpaths (map (lambda (s)
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 24/65] gnu: kservice: Disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (22 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 23/65] gnu: evolution-data-server: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 25/65] gnu: libical: " Greg Hogan
` (40 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/kde-frameworks.scm (kservice)
[arguments]<#:parallel-tests?>: Disable.
Change-Id: I07b2bf1302a85328825b6c2c3fdad02ab99f7f93
---
gnu/packages/kde-frameworks.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index f85b0d67dc..56e067fcd8 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -4538,6 +4538,7 @@ (define-public kservice
(list kcrash kdbusaddons kdoctools ki18n qtbase qtdeclarative))
(arguments
(list
+ #:parallel-tests? #f
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 25/65] gnu: libical: Disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (23 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 24/65] gnu: kservice: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 26/65] gnu: libmedfile: " Greg Hogan
` (39 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/calendar.scm (libical)
[arguments]<#:parallel-tests?>: Disable.
Change-Id: Ie7f2922a77bdc065a4a000b1fa683221c853c3af
---
gnu/packages/calendar.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 6717db867f..878e5269a0 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -137,6 +137,7 @@ (define-public libical
(build-system cmake-build-system)
(arguments
(list
+ #:parallel-tests? #f
#:configure-flags #~(list "-DSHARED_ONLY=true"
;; required by evolution-data-server
"-DGOBJECT_INTROSPECTION=true"
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 26/65] gnu: libmedfile: Disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (24 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 25/65] gnu: libical: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 27/65] gnu: mbedtls-lts: " Greg Hogan
` (38 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/engineering.scm (libmedfile)
[arguments]<#:parallel-tests?>: Disable.
Change-Id: I55f0d7bded6ac6b94b8389d6af4958b7ce7c6487
---
gnu/packages/engineering.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 6f449f0c39..81ee2748e7 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3047,7 +3047,8 @@ (define-public libmedfile
(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)
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 27/65] gnu: mbedtls-lts: Disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (25 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 26/65] gnu: libmedfile: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 28/65] gnu: scotch: " Greg Hogan
` (37 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/tls.scm (mbedtls-lts)
[arguments]<#:parallel-tests?>: Disable.
Change-Id: Ibaa4af6d12c9e8db931c0038b2bba9fbf1959592
---
gnu/packages/tls.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 1a1ce0d215..54203c7a78 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -974,7 +974,8 @@ (define-public mbedtls-lts
(base32 "070i5pxciw04swfqk1rmdprhsafn4cias3dlmkm467pqpjnhb394"))))
(build-system cmake-build-system)
(arguments
- (list #:configure-flags
+ (list #:parallel-tests? #f
+ #:configure-flags
#~(list "-DUSE_SHARED_MBEDTLS_LIBRARY=ON"
"-DUSE_STATIC_MBEDTLS_LIBRARY=OFF")
#:phases
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 28/65] gnu: scotch: Disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (26 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 27/65] gnu: mbedtls-lts: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 29/65] gnu: srt: " Greg Hogan
` (36 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/maths.scm (scotch)
[arguments]<#:parallel-tests?>: Disable.
Change-Id: Ic1368158890b64fe485b197749e2f44b621733f8
---
gnu/packages/maths.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4f5f5ce63e..78688c7543 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4657,7 +4657,8 @@ (define-public scotch
(list flex bison gfortran))
(outputs '("out" "metis"))
(arguments
- `(#:configure-flags '("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64"
+ `(#:parallel-tests? #f
+ #:configure-flags '("-DBUILD_SHARED_LIBS=YES" "-DINTSIZE=64"
"-DBUILD_PTSCOTCH=OFF")
#:phases
(modify-phases %standard-phases
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 29/65] gnu: srt: Disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (27 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 28/65] gnu: scotch: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 30/65] gnu: vulkan-loader: " Greg Hogan
` (35 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/networking.scm (srt)
[arguments]<#:parallel-tests?>: Disable.
Change-Id: If95af98db404f17d80b467f456af65ac333276fc
---
gnu/packages/networking.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index f209c1e27c..90f409d625 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -669,7 +669,8 @@ (define-public srt
(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")
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 30/65] gnu: vulkan-loader: Disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (28 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 29/65] gnu: srt: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 31/65] gnu: websocketpp: " Greg Hogan
` (34 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/vulkan.scm (vulkan-loader)
[arguments]<#:parallel-tests?>: Disable.
Change-Id: Ibea1a1e8c86dffedd2d184b441851b0a60898942
---
gnu/packages/vulkan.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 1b69da1a4d..77e63091c1 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -344,6 +344,7 @@ (define-public vulkan-loader
;; Limit the tests to those architectures tested upstream.
#:tests? (and (%current-system)
(target-x86?))
+ #:parallel-tests? #f
#:configure-flags
#~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
(dirname (dirname
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 31/65] gnu: websocketpp: Disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (29 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 30/65] gnu: vulkan-loader: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 32/65] gnu: dbus-cxx: Use #:test-exclude Greg Hogan
` (33 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/web.scm (websocketpp)
[arguments]<#:parallel-tests?>: Disable.
Change-Id: I9fd6247cf59b26a1d8c08398b2408884fd0f4848
---
gnu/packages/web.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 9cd6d4dd40..463ef52cf6 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1848,7 +1848,8 @@ (define-public websocketpp
(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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 32/65] gnu: dbus-cxx: Use #:test-exclude.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (30 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 31/65] gnu: websocketpp: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 33/65] gnu: hotspot: " Greg Hogan
` (32 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/glib.scm (dbus-cxx)[arguments]
<#:test-exclude>: Move exclude regex here from 'check phase.
<#:phases>: Remove 'check phase.
Change-Id: I6d2b17be9c2d1575dbebc28baf91990c7a903211
---
gnu/packages/glib.scm | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index a15a7ce58a..9454420a41 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1266,14 +1266,8 @@ (define-public dbus-cxx
"-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++))
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 33/65] gnu: hotspot: Use #:test-exclude.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (31 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 32/65] gnu: dbus-cxx: Use #:test-exclude Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 34/65] gnu: kconfig-5: " Greg Hogan
` (31 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/linux.scm (hotspot)[arguments]
<#:test-exclude>: Move exclude regex here from 'check phase.
<#:phases>: Remove 'check phase.
Change-Id: Iae9c98693a30c94c472a2f4056dfaa53b988c20c
---
gnu/packages/linux.scm | 41 +++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2391a79a2a..15b5ab1bed 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7356,6 +7356,24 @@ (define-public hotspot
#: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
@@ -7391,28 +7409,7 @@ (define-public hotspot
(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))
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 34/65] gnu: kconfig-5: Use #:test-exclude.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (32 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 33/65] gnu: hotspot: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 35/65] gnu: nextcloud-client: " Greg Hogan
` (30 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/kde-frameworks.scm (kconfig-5)[arguments]
<#:test-exclude>: Move exclude regex here from 'check phase.
<#:phases>: Move environment setup to 'pre-check and remove 'check
phase.
Change-Id: I923e18b0b1a89aa4ccdedb8f79b2efc5c9bdadf6
---
gnu/packages/kde-frameworks.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 56e067fcd8..143dac5f85 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -790,15 +790,15 @@ (define-public kconfig-5
(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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 35/65] gnu: nextcloud-client: Use #:test-exclude.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (33 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 34/65] gnu: kconfig-5: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 36/65] gnu: pdal: Use :#test-exclude and disable parallel tests Greg Hogan
` (29 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/sync.scm (nextcloud-client)[arguments]
<#:test-exclude>: Move exclude regex here from 'check phase.
<#:phases>: Move environment setup to 'pre-check and remove 'check
phase.
Change-Id: Ie5f568bbe1153291f53e429afb0026a96e8dbcc5
---
gnu/packages/sync.scm | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index af736d0c28..5055c9c698 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -143,6 +143,7 @@ (define-public nextcloud-client
(((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 @@ (define-public nextcloud-client
(("@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))
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 36/65] gnu: pdal: Use :#test-exclude and disable parallel tests.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (34 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 35/65] gnu: nextcloud-client: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 37/65] gnu: qxmpp: Use #:test-exclude Greg Hogan
` (28 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/geo.scm (pdal)[arguments]
<#:parallel-tests?>: Disable.
<#:test-exclude>: Move exclude regex here from 'check phase.
<#:phases>: Remove 'check phase.
Change-Id: Ib148edc5e5c5f251797360cacda1dfb5de71d664
---
gnu/packages/geo.scm | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 5d120b3c98..3e2a22bbb9 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1307,13 +1307,8 @@ (define-public pdal
(base32 "0gg5lcshlmn3wwak42xr0b8a8gdr4572d7hrcvxn2291kp2c3096"))))
(build-system cmake-build-system)
(arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "ctest" "-E" ;; This test hangs.
- "pdal_io_stac_reader_test")))))))
+ (list #:parallel-tests? #f
+ #:test-exclude "pdal_io_stac_reader_test"))
(native-inputs (list python))
(inputs (list gdal
h3
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 37/65] gnu: qxmpp: Use #:test-exclude.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (35 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 36/65] gnu: pdal: Use :#test-exclude and disable parallel tests Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 38/65] gnu: simgear: " Greg Hogan
` (27 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/messaging.scm (qxmpp)[arguments]
<#:test-exclude>: Move exclude regex here from 'check phase.
<#:phases>: Remove 'check phase.
Change-Id: I8116db30d3bbbeecc2e166f9d72329142bf4a26c
---
gnu/packages/messaging.scm | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index c482cd469e..2b7ceabe36 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -410,17 +410,12 @@ (define-public qxmpp
(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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 38/65] gnu: simgear: Use #:test-exclude.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (36 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 37/65] gnu: qxmpp: Use #:test-exclude Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 39/65] gnu: cmake: Update to 3.30.5 Greg Hogan
` (26 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/games.scm (simgear)[arguments]
<#:test-exclude>: Move exclude regex here from 'check phase.
<#:phases>: Remove 'check phase.
Change-Id: I3ac389580949f8edafca5768335d491a2ea86650
---
gnu/packages/games.scm | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c594b8ac2a..d0dcc64289 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9801,13 +9801,7 @@ (define simgear
(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)
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 39/65] gnu: cmake: Update to 3.30.5.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (37 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 38/65] gnu: simgear: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 40/65] gnu: asymptote: Pin CMake dependency Greg Hogan
` (25 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.30.5.
[source]: Remove the cmake-curl-certificates-3.24 patch.
[arguments]<#:configure-flags>: Disable debugger.
(cmake-minimal)[arguments]
<#:configure-flags>: Disable debugger.
<#:phases>: Output on failure in 'check phase.
(cmake): Update to 3.30.5.
[source]: Remove the cmake-curl-certificates-3.24 patch.
[inputs]: Add cppdap.
(cmake-3.30): Remove.
(cmake-3.24): New variable.
(%common-build-phases): Substitute for Ninja build.
---
gnu/packages/cmake.scm | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 8310dc55fa..199e0182c6 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -15,6 +15,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.
;;;
@@ -126,6 +127,7 @@ (define (%common-build-phases)
'("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"
@@ -171,7 +173,7 @@ (define %preserved-third-party-files
(define-public cmake-bootstrap
(package
(name "cmake-bootstrap")
- (version "3.24.2")
+ (version "3.30.5")
(source (origin
(method url-fetch)
(uri (string-append "https://cmake.org/files/v"
@@ -179,8 +181,7 @@ (define-public cmake-bootstrap
"/cmake-" version ".tar.gz"))
(sha256
(base32
- "1ny8y2dzc6fww9gzb1ml0vjpx4kclphjihkxagxigprxdzq2140d"))
- (patches (search-patches "cmake-curl-certificates-3.24.patch"))))
+ "0vd8ambs4r7yzwwshba0l0pl0b7q566a0pq6gsdz5wh80njf2mcz"))))
(build-system gnu-build-system)
(arguments
(list
@@ -203,7 +204,10 @@ (define-public cmake-bootstrap
;; 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
@@ -310,6 +314,8 @@ (define-public cmake-minimal
(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))))
@@ -341,6 +347,7 @@ (define-public cmake-minimal
(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~%"))))))
@@ -353,7 +360,7 @@ (define-public cmake
(package
(inherit cmake-minimal)
(name "cmake")
- (version "3.25.1")
+ (version "3.30.5")
(source (origin
(inherit (package-source cmake-minimal))
(method url-fetch)
@@ -368,8 +375,7 @@ (define-public cmake
,@rest))))
(sha256
(base32
- "1n4inb3fvk70sni5gmkljqw3cyllalyg3fnr9rlr7x3aa44isl8w"))
- (patches (search-patches "cmake-curl-certificates-3.24.patch"))))
+ "0vd8ambs4r7yzwwshba0l0pl0b7q566a0pq6gsdz5wh80njf2mcz"))))
(outputs '("out" "doc"))
(arguments
(substitute-keyword-arguments (package-arguments cmake-minimal)
@@ -406,7 +412,10 @@ (define-public cmake
(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)
@@ -414,10 +423,10 @@ (define-public cmake
texinfo)))
(properties (alist-delete 'hidden? (package-properties cmake-minimal)))))
-(define-public cmake-3.30
+(define-public cmake-3.24
(package
(inherit cmake)
- (version "3.30.3")
+ (version "3.24.4")
(source (origin
(method url-fetch)
(uri (string-append "https://cmake.org/files/v"
@@ -425,14 +434,9 @@ (define-public cmake-3.30
"/cmake-" version ".tar.gz"))
(sha256
(base32
- "1r48zym4dy4mvwzk704zh1vx9gb4a910f424ypvis28mcxdy2pbd"))))
- (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))))))
+ "15i2zbxlksqv4czajpwcc1c21smgw2mzpbghsdq71zqfa6cy9j9j"))
+ (patches (search-patches "cmake-curl-certificates-3.24.patch"))))
+ (properties '((hidden? . #t)))))
(define-public cmake-minimal-cross
(package
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 40/65] gnu: asymptote: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (38 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 39/65] gnu: cmake: Update to 3.30.5 Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 41/65] gnu: conan: " Greg Hogan
` (24 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/plotutils.scm (asymptote)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: I6ce8b737d9a21f83caad7b79b591e68a86f45fd0
---
gnu/packages/plotutils.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index d5b2f0d9fa..030b1cf121 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -89,7 +89,7 @@ (define-public asymptote
automake
bison
boost
- cmake
+ cmake-minimal
emacs-minimal
flex
ghostscript ;for tests
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 41/65] gnu: conan: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (39 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 40/65] gnu: asymptote: Pin CMake dependency Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 42/65] gnu: entangle: " Greg Hogan
` (23 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/package-management.scm (conan)[native-inputs]: Change
cmake to cmake-minimal.
Change-Id: I0d321cf175c91b564eb627ee7d612a5ea8cacd4e
---
gnu/packages/package-management.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 1763d2d59f..f68834663b 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1436,7 +1436,7 @@ (define-public conan
(native-inputs
(list autoconf-wrapper
automake
- cmake
+ cmake-minimal
git-minimal
libtool
meson
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 42/65] gnu: entangle: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (40 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 41/65] gnu: conan: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 43/65] gnu: go-mvdan-cc-editorconfig: " Greg Hogan
` (22 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/photo.scm (entangle)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: Idd528f9c83f61eec3a7ab29468361bfc667aa441
---
gnu/packages/photo.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index c9cf877085..91f6c911f8 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -720,7 +720,7 @@ (define-public entangle
`("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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 43/65] gnu: go-mvdan-cc-editorconfig: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (41 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 42/65] gnu: entangle: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 44/65] gnu: libdecor: " Greg Hogan
` (21 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/golang-xyz.scm (go-mvdan-cc-editorconfig)[native-inputs]:
Change cmake to cmake-minimal.
Change-Id: I847a6ad3225e22a918971d327b00377fa9b68208
---
gnu/packages/golang-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index e8b7f7ee9f..0d276f7898 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -7391,7 +7391,7 @@ (define-public go-mvdan-cc-editorconfig
(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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 44/65] gnu: libdecor: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (42 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 43/65] gnu: go-mvdan-cc-editorconfig: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 45/65] gnu: liblxi: " Greg Hogan
` (20 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/freedesktop.scm (libdecor)[native-inputs]: Change cmake
to cmake-minimal.
Change-Id: I91c23b13c83a1e4bbd5cbe3e63a79cd05a4bbaf2
---
gnu/packages/freedesktop.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 0ab0bb5104..9022fc086f 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3327,7 +3327,7 @@ (define-public libdecor
(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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 45/65] gnu: liblxi: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (43 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 44/65] gnu: libdecor: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 46/65] gnu: lxi-tools: " Greg Hogan
` (19 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/hardware.scm (liblxi)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: I7945be811d71e6b55942a040557b577a4d7f9349
---
gnu/packages/hardware.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 2922b14a42..4cf4d44782 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -1510,7 +1510,7 @@ (define-public liblxi
(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/")
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 46/65] gnu: lxi-tools: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (44 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 45/65] gnu: liblxi: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 47/65] gnu: pantheon-calculator: " Greg Hogan
` (18 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/hardware.scm (lxi-tools)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: I399241f4dcd71395ce3756bfca385809a42e38ef
---
gnu/packages/hardware.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 4cf4d44782..102c5862fd 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -1550,7 +1550,7 @@ (define-public lxi-tools
(("update-desktop-database") (which "true"))))))))
(native-inputs
(list bash-completion
- cmake
+ cmake-minimal
(list glib "bin")
pkg-config
python
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 47/65] gnu: pantheon-calculator: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (45 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 46/65] gnu: lxi-tools: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 48/65] gnu: pantheon-calendar: " Greg Hogan
` (17 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/pantheon.scm (pantheon-calculator)[native-inputs]: Change
cmake to cmake-minimal.
Change-Id: I1f4283ca371ec18c1882dc03960c3f268b31d8bd
---
gnu/packages/pantheon.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 9268aff292..8fa8c3db2a 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -126,7 +126,7 @@ (define-public pantheon-calculator
libgee
libhandy))
(native-inputs
- (list cmake
+ (list cmake-minimal
`(,glib "bin") ; for glib-compile-schemas
gettext-minimal
pkg-config
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 48/65] gnu: pantheon-calendar: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (46 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 47/65] gnu: pantheon-calculator: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 49/65] gnu: python-awkward-cpp: " Greg Hogan
` (16 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/pantheon.scm (pantheon-calendar)[native-inputs]: Change
cmake to cmake-minimal.
Change-Id: Ib6537bf8c2909a2c0acf5e6fb7fa46d5bd47fbaa
---
gnu/packages/pantheon.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 8fa8c3db2a..16a3516ddf 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -185,7 +185,7 @@ (define-public pantheon-calendar
libical
libportal))
(native-inputs
- (list cmake
+ (list cmake-minimal
`(,glib "bin") ; for glib-compile-schemas
gettext-minimal
pkg-config
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 49/65] gnu: python-awkward-cpp: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (47 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 48/65] gnu: pantheon-calendar: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 50/65] gnu: python-contourpy: " Greg Hogan
` (15 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/python-xyz.scm (python-awkward-cpp)[native-inputs]:
Change cmake to cmake-minimal.
Change-Id: I611327a62f8655269dd89fbb9f885adef01c70a5
---
gnu/packages/python-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8849096026..4d28b8ca1e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -417,7 +417,7 @@ (define-public python-awkward-cpp
(build-system pyproject-build-system)
(propagated-inputs (list python-importlib-resources 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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 50/65] gnu: python-contourpy: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (48 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 49/65] gnu: python-awkward-cpp: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 51/65] gnu: python-keystone-engine: " Greg Hogan
` (14 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/python-xyz.scm (python-contourpy)[native-inputs]: Change
cmake to cmake-3.24.
---
gnu/packages/python-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4d28b8ca1e..1f7fdd6edc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1300,7 +1300,7 @@ (define-public python-contourpy
(propagated-inputs
(list python-numpy))
(native-inputs
- (list cmake
+ (list cmake-3.24
meson-python
pkg-config
pybind11
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 51/65] gnu: python-keystone-engine: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (49 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 50/65] gnu: python-contourpy: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 52/65] gnu: python-lief: " Greg Hogan
` (13 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/emulators.scm (python-keystone-engine)[native-inputs]:
Change cmake to cmake-minimal.
Change-Id: Ieb60e5feac0d65098d9b7dc3021a4bba1685d21b
---
gnu/packages/emulators.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index f0a60c0b49..0fa59598e6 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -3883,7 +3883,7 @@ (define-public python-keystone-engine
(uri (pypi-uri "keystone-engine" version))
(sha256
(base32 "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig"))))
- (native-inputs (list cmake))
+ (native-inputs (list cmake-minimal))
(build-system pyproject-build-system)
(home-page "https://www.keystone-engine.org")
(synopsis
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 52/65] gnu: python-lief: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (50 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 51/65] gnu: python-keystone-engine: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 53/65] gnu: python-optree: " Greg Hogan
` (12 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/python-xyz.scm (python-lief)[native-inputs]: Change cmake
to cmake-3.24.
---
gnu/packages/python-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1f7fdd6edc..c85b5dc3af 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -37509,7 +37509,7 @@ (define-public python-lief
(base32
"11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661"))))
(build-system python-build-system)
- (native-inputs (list cmake))
+ (native-inputs (list cmake-3.24))
(arguments
(list
#:tests? #f ;needs network
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 53/65] gnu: python-optree: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (51 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 52/65] gnu: python-lief: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 54/65] gnu: python-pivy: " Greg Hogan
` (11 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/python-xyz.scm (python-optree)[native-inputs]: Change
cmake to cmake-minimal.
Change-Id: I2a1f99c5be79b897a957af354bf27bbcdfd8cf52
---
gnu/packages/python-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c85b5dc3af..8a835fda64 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12368,7 +12368,7 @@ (define-public python-optree
(list python-pytest
python-pytest-cov
python-pytest-xdist
- cmake
+ cmake-minimal
pybind11))
(home-page "https://github.com/metaopt/optree")
(synopsis "Optimized PyTree Utilities")
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 54/65] gnu: python-pivy: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (52 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 53/65] gnu: python-optree: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 55/65] gnu: python-pytorch: " Greg Hogan
` (10 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/python-xyz.scm (python-pivy)[native-inputs]: Change cmake
to cmake-minimal.
Change-Id: I0cb8afef2c291d48bd14cc3485c11dbf267c34fe
---
gnu/packages/python-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8a835fda64..0d1c055994 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -33487,7 +33487,7 @@ (define-public python-pivy
(("\\$\\{SoQt_INCLUDE_DIRS}")
"${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}")))))))
(native-inputs
- (list cmake swig))
+ (list cmake-minimal swig))
(inputs
(list python-wrapper
qtbase-5
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 55/65] gnu: python-pytorch: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (53 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 54/65] gnu: python-pivy: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 56/65] gnu: python-symengine: " Greg Hogan
` (9 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/machine-learning.scm (python-pytorch)[native-inputs]:
Change cmake to cmake-minimal.
Change-Id: Ice5ad31fe9864a3f09411c74313570885c1a6593
---
gnu/packages/machine-learning.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 988fac3b63..41ffcaeba8 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -4761,7 +4761,7 @@ (define-public python-pytorch
;; Even only the core tests take a very long time to run.
#:tests? #f))
(native-inputs
- (list cmake
+ (list cmake-minimal
doxygen
ideep-pytorch
ninja
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 56/65] gnu: python-symengine: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (54 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 55/65] gnu: python-pytorch: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 57/65] gnu: raider: " Greg Hogan
` (8 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/python-xyz.scm (python-symengine)[native-inputs]: Change
cmake to cmake-minimal.
Change-Id: Ibe96156b9fe7ba16c9fe1b136e153bf5ad765fd9
---
gnu/packages/python-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0d1c055994..a708c6171d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -19017,7 +19017,7 @@ (define-public python-symengine
(invoke "nosetests" "-v" "symengine.tests"))
(format #t "test suite not run~%")))))))
(native-inputs
- (list cmake python-cython-3 python-nose))
+ (list cmake-minimal python-cython-3 python-nose))
(inputs
(list symengine))
(home-page "https://github.com/symengine/symengine.py")
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 57/65] gnu: raider: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (55 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 56/65] gnu: python-symengine: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 58/65] gnu: siril: " Greg Hogan
` (7 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/gnome.scm (raider)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: I75ca5a9ec8382fc893fe82f5d99ae1a274f5bc15
---
gnu/packages/gnome.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 088a60279d..7e5e1064cc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4976,7 +4976,7 @@ (define-public raider
(native-inputs
(list gettext-minimal
pkg-config
- cmake
+ cmake-minimal
`(,glib "bin")
desktop-file-utils
itstool
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 58/65] gnu: siril: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (56 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 57/65] gnu: raider: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 59/65] gnu: soqt: " Greg Hogan
` (6 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/astronomy.scm (siril)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: Ia9e6d97acbc46f074bad759c8a6f29b56ae1eada
---
gnu/packages/astronomy.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 106f524a73..71fb526f67 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2469,7 +2469,7 @@ (define-public siril
`("GDK_PIXBUF_MODULE_FILE" =
(,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))
(native-inputs
- (list cmake git libconfig pkg-config))
+ (list cmake-minimal git libconfig pkg-config))
(inputs
(list cfitsio
(librsvg-for-system)
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 59/65] gnu: soqt: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (57 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 58/65] gnu: siril: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 60/65] gnu: syndication-domination: " Greg Hogan
` (5 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/qt.scm (soqt)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: I92f5c51743dc31513e57d9b864bf4b9d33c4f070
---
gnu/packages/qt.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 687c20cd90..f0f88e99b1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5174,7 +5174,7 @@ (define-public soqt
(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")
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 60/65] gnu: syndication-domination: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (58 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 59/65] gnu: soqt: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 61/65] gnu: tigervnc-server: " Greg Hogan
` (4 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/syndication.scm (syndication-domination)[native-inputs]:
Change cmake to cmake-3.24.
---
gnu/packages/syndication.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index ed284be26b..1b4779473e 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -530,7 +530,7 @@ (define-public syndication-domination
(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-3.24 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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 61/65] gnu: tigervnc-server: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (59 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 60/65] gnu: syndication-domination: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 62/65] gnu: trinityrnaseq: " Greg Hogan
` (3 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/vnc.scm (tigervnc-server)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: I8def88520d76e8c7ca216535d7316dc17cc0e14c
---
gnu/packages/vnc.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index 4f780a55dd..14ea390ed3 100644
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@@ -372,7 +372,7 @@ (define-public tigervnc-server
libtool
gettext-minimal
font-util
- cmake
+ cmake-minimal
perl)))
(inputs
(modify-inputs (append (package-inputs xorg-server)
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 62/65] gnu: trinityrnaseq: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (60 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 61/65] gnu: tigervnc-server: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 63/65] gnu: unicorn: " Greg Hogan
` (2 subsequent siblings)
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/bioinformatics.scm (trinityrnaseq)
[native-inputs]: Change cmake to cmake-minimal.
[arguments]<#:phases>[install]: Remove deletion of uncreated files.
---
gnu/packages/bioinformatics.scm | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index d167a11ba1..c7a3517e0c 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -6067,8 +6067,6 @@ (define-public trinityrnaseq
(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")))
@@ -6122,7 +6120,7 @@ (define-public trinityrnaseq
(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
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 63/65] gnu: unicorn: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (61 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 62/65] gnu: trinityrnaseq: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 64/65] gnu: wavbreaker: " Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 65/65] gnu: xffm+: " Greg Hogan
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/emulators.scm (unicorn)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: If51ffa3a05407828fe252620ce6ba067c008f9ad
---
gnu/packages/emulators.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 0fa59598e6..dc85b7e2a8 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -3516,7 +3516,7 @@ (define-public unicorn
(sha256
(base32 "0mlfs8qfi0clyncfkbxp6in0cpl747510i6bqymwid43xcirbikz"))))
(build-system pyproject-build-system)
- (native-inputs (list cmake pkg-config))
+ (native-inputs (list cmake-minimal pkg-config))
(home-page "https://www.unicorn-engine.org")
(synopsis "Generic CPU emulator framework")
(description
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 64/65] gnu: wavbreaker: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (62 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 63/65] gnu: unicorn: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
2024-10-22 18:09 ` [bug#70031] [PATCH v2 65/65] gnu: xffm+: " Greg Hogan
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/mp3.scm (wavbreaker)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: I42bd5c70f099ae587c42629339a99e65765e29f9
---
gnu/packages/mp3.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 32a1ddea27..888a7f8508 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -811,7 +811,7 @@ (define-public wavbreaker
(,(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+
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread* [bug#70031] [PATCH v2 65/65] gnu: xffm+: Pin CMake dependency.
2024-10-22 18:08 ` [bug#70031] [PATCH v2 00/65] Use CMake in build-system/cmake Greg Hogan
` (63 preceding siblings ...)
2024-10-22 18:09 ` [bug#70031] [PATCH v2 64/65] gnu: wavbreaker: " Greg Hogan
@ 2024-10-22 18:09 ` Greg Hogan
64 siblings, 0 replies; 87+ messages in thread
From: Greg Hogan @ 2024-10-22 18:09 UTC (permalink / raw)
To: 70031; +Cc: Greg Hogan
* gnu/packages/gnome.scm (xffm+)[native-inputs]: Change cmake to
cmake-minimal.
Change-Id: I0cf4fc3bdaa29674b7b9814df94bd12f8303d6bb
---
gnu/packages/gnome.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7e5e1064cc..7fef821b4b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13889,7 +13889,7 @@ (define-public xffm+
;; This is done so we can override.
(("`set.PREFIX_BIN") "set(QPREFIX_BIN")))))))
(native-inputs
- (list cmake pkg-config intltool gnu-gettext))
+ (list cmake-minimal pkg-config intltool gnu-gettext))
(inputs
(list glib gtk+ libx11 libsm libxv libxaw libxcb libxkbfile
shared-mime-info))
--
2.46.1
^ permalink raw reply related [flat|nested] 87+ messages in thread