05/06: squash! build-system: Rewrite using gexps

[guix-commits]

civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.

commit 66b33e7f073dd09d955ef83533e1308a09e4aa57
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Mar 7 15:49:33 2021 +0100

    squash! build-system: Rewrite using gexps
---
 guix/build-system/cmake.scm | 4 ++--
 tests/lint.scm              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index 13fba6c..4e58bf7 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -166,7 +166,7 @@ provides a 'CMakeLists.txt' file as its build system."
 ;;; Cross-compilation.
 ;;;
 
-(define* (cmake-cross-build store name
+(define* (cmake-cross-build name
                             #:key
                             target
                             build-inputs target-inputs host-inputs
@@ -201,7 +201,7 @@ build system."
   (define builder
     (with-imported-modules imported-modules
       #~(begin
-          (use-modules ,@modules)
+          (use-modules #$@(sexp->gexp modules))
 
           (define %build-host-inputs
             (map (lambda (tuple)
diff --git a/tests/lint.scm b/tests/lint.scm
index 7c24611..e8dfded 100644
--- a/tests/lint.scm
+++ b/tests/lint.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
<ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès 
<ludo@gnu.org>
 ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2017 Alex Kost <alezost@gmail.com>
@@ -435,7 +435,7 @@
       (single-lint-warning-message (check-patch-headers pkg)))))
 
 (test-equal "derivation: invalid arguments"
-  "failed to create x86_64-linux derivation: (wrong-type-arg \"map\" \"Wrong 
type argument: ~S\" (invalid-module) ())"
+  "failed to create x86_64-linux derivation: (match-error \"match\" \"no 
matching pattern\" invalid-module)"
   (match (let ((pkg (dummy-package "x"
                                    (arguments
                                     '(#:imported-modules (invalid-module))))))