GNU bug report logs - #41330
Patch to expose #:scheme-file-regexp in guile build system

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 41330 in the body.
You can then email your comments to 41330 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Alex Sassmannshausen <alex <at> komputilo.eu>
To: "guix-patches\@gnu.org" <guix-patches <at> gnu.org>
Subject: Patch to expose #:scheme-file-regexp in guile build system
Date: Sat, 16 May 2020 15:37:47 +0200

[Message part 1 (text/plain, inline)]

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

[0001-build-system-guile-Expose-scheme-file-regexp.patch (text/x-diff, inline)]

From b798fef327c86b82f336e3fec0e96b791032f470 Mon Sep 17 00:00:00 2001
From: Alex Sassmannshausen <alex <at> 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

Message #8 received at 41330 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Alex Sassmannshausen <alex <at> komputilo.eu>
Cc: 41330 <at> debbugs.gnu.org
Subject: Re: [bug#41330] Patch to expose #:scheme-file-regexp in guile build
 system
Date: Mon, 18 May 2020 14:30:57 +0200

Hi Alex,

Alex Sassmannshausen <alex <at> komputilo.eu> skribis:

>>From b798fef327c86b82f336e3fec0e96b791032f470 Mon Sep 17 00:00:00 2001
> From: Alex Sassmannshausen <alex <at> 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’.

Message #11 received at 41330 <at> debbugs.gnu.org (full text, mbox):

From: Alex Sassmannshausen <alex <at> komputilo.eu>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 41330 <at> debbugs.gnu.org
Subject: Re: [bug#41330] Patch to expose #:scheme-file-regexp in guile build
 system
Date: Mon, 18 May 2020 15:38:47 +0200

Saluton,

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

> Hi Alex,
>
> Alex Sassmannshausen <alex <at> komputilo.eu> skribis:
>
>>>From b798fef327c86b82f336e3fec0e96b791032f470 Mon Sep 17 00:00:00 2001
>> From: Alex Sassmannshausen <alex <at> 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.