[bug#41330] Patch to expose #:scheme-file-regexp in guile build system

[bug#41330] Patch to expose #:scheme-file-regexp in guile build system

[Alex Sassmannshausen via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

Hello,

Please see proposition below.  Exposing this argument makes it possible
to only install specific scheme files in a project using the
guile-build-system.

WDYT?

Alex


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-system-guile-Expose-scheme-file-regexp.patch --]
[-- Type: text/x-diff, Size: 1733 bytes --]

From b798fef327c86b82f336e3fec0e96b791032f470 Mon Sep 17 00:00:00 2001
From: Alex Sassmannshausen <alex@komputilo.eu>
Date: Sat, 16 May 2020 15:32:45 +0200
Subject: [PATCH] build-system/guile: Expose #:scheme-file-regexp.

* guix/build-system/guile.scm (%scheme-file-regexp): New variable.
  (guile-build): Accept #:scheme-file-regexp and pass it on to builder.
---
 guix/build-system/guile.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm
index 3693014694..45e735b987 100644
--- a/guix/build-system/guile.scm
+++ b/guix/build-system/guile.scm
@@ -29,6 +29,10 @@
   #:export (%guile-build-system-modules
             guile-build-system))
 
+(define %scheme-file-regexp
+  ;; Regexp to match Scheme files.
+  "\\.(scm|sls)$")
+
 (define %guile-build-system-modules
   ;; Build-side modules imported by default.
   `((guix build guile-build-system)
@@ -80,6 +84,7 @@
                       (system (%current-system))
                       (source-directory ".")
                       not-compiled-file-regexp
+                      (scheme-file-regexp %scheme-file-regexp)
                       (compile-flags %compile-flags)
                       (imported-modules %guile-build-system-modules)
                       (modules '((guix build guile-build-system)
@@ -97,6 +102,7 @@
                                 (source
                                  source))
                     #:source-directory ,source-directory
+                    #:scheme-file-regexp ,scheme-file-regexp
                     #:not-compiled-file-regexp ,not-compiled-file-regexp
                     #:compile-flags ,compile-flags
                     #:phases ,phases
-- 
2.23.0

[bug#41330] Patch to expose #:scheme-file-regexp in guile build system

[Ludovic Courtès]

Hi Alex,

Alex Sassmannshausen <alex@komputilo.eu> skribis:

>>From b798fef327c86b82f336e3fec0e96b791032f470 Mon Sep 17 00:00:00 2001
> From: Alex Sassmannshausen <alex@komputilo.eu>
> Date: Sat, 16 May 2020 15:32:45 +0200
> Subject: [PATCH] build-system/guile: Expose #:scheme-file-regexp.
>
> * guix/build-system/guile.scm (%scheme-file-regexp): New variable.
>   (guile-build): Accept #:scheme-file-regexp and pass it on to builder.

LGTM, dankon!  :-)

Ludo’.

[bug#41330] Patch to expose #:scheme-file-regexp in guile build system

[Alex Sassmannshausen via Guix-patches via]

Saluton,

Ludovic Courtès <ludo@gnu.org> writes:

> Hi Alex,
>
> Alex Sassmannshausen <alex@komputilo.eu> skribis:
>
>>>From b798fef327c86b82f336e3fec0e96b791032f470 Mon Sep 17 00:00:00 2001
>> From: Alex Sassmannshausen <alex@komputilo.eu>
>> Date: Sat, 16 May 2020 15:32:45 +0200
>> Subject: [PATCH] build-system/guile: Expose #:scheme-file-regexp.
>>
>> * guix/build-system/guile.scm (%scheme-file-regexp): New variable.
>>   (guile-build): Accept #:scheme-file-regexp and pass it on to builder.
>
> LGTM, dankon!  :-)
>
> Ludo’.

Pushed now.

Thanks for the review!

Alex