[PATCH 00/34] Fix regexes in FIND-FILES invocations.

OpenSubmitted by Sarah Morgensen.
Details
2 participants
  • Sarah Morgensen
  • Maxime Devos
Owner
unassigned
Severity
normal
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:16
Download
(address . guix-patches@gnu.org)
cover.1627850945.git.iskarian@mgsn.dev
Download
Hello Guix,

This is a start to addressing [0], which points out that there are many
incorrect usages of regexes in callers of FIND-FILES. I chose packages with 0-3
dependent packages, and according to `guix refresh -l`, this patchset
incurs just 25 rebuilds:

Toggle snippet (4 lines)
$ xargs -a packages.txt guix refresh -l
Building the following 18 packages would ensure 25 dependent packages are rebuilt: c-reduce@2.10.0 cataclysm-dda@0.F kdevelop@5.6.1 aegis@4.24 openttd@1.11.2 bitmask@0.21.6 guile-gnome@2.16.5 linphone-desktop@4.2.5 kaldi-gstreamer-server@0-2.f68cab4 python-keras@2.2.4 claws-mail@4.0.0 python-git-multimail@1.5.0.post1 mumps@5.2.1 shogun@6.1.3 rcm@1.3.4 t-todo-manager@1.2.0-97.89ad444 superstarfighter@0.6.4 openmw@0.46.0

[0] https://issues.guix.gnu.org/37150 Erroneous uses of regex in the
invokation of FIND-FILES

--
Sarah Morgensen (34):
gnu: wpa-supplicant-minimal: Fix regex in FIND-FILES invocation.
gnu: hostapd: Fix regex in FIND-FILES invocation.
gnu: infamous-plugins: Fix regex in FIND-FILES invocation.
gnu: tao: Fix regex in FIND-FILES invocation.
gnu: kcov: Fix regex in FIND-FILES invocation.
gnu: astyle: Fix regex in FIND-FILES invocation.
gnu: unshield: Fix regex in FIND-FILES invocation.
gnu: cook: Fix regex in FIND-FILES invocation.
gnu: libabigail: Fix regex in FIND-FILES invocation.
gnu: grfcodec: Fix regex in FIND-FILES invocation.
gnu: go-github-com-keybase-go-ps: Fix regex in FIND-FILES invocation.
gnu: guile-sly: Fix regex in FIND-FILES invocation.
gnu: g-wrap: Fix regex in FIND-FILES invocation.
gnu: guile-ncurses: Fix regex in FIND-FILES invocation.
gnu: guile-gi: Fix regex in FIND-FILES invocation.
gnu: guile-ac-d-bus: Fix regex in FIND-FILES invocation.
gnu: belle-sip: Fix regex in FIND-FILES invocation.
gnu: python-libsvm: Fix regex in FIND-FILES invocation.
gnu: kaldi: Fix regex in FIND-FILES invocation.
gnu: kaldi-gstreamer-server: Fix regex in FIND-FILES invocation.
gnu: tensorflow: Fix regex in FIND-FILES invocation.
gnu: sendmail: Fix regex in FIND-FILES invocation.
gnu: scotch: Fix regex in FIND-FILES invocation.
gnu: atlas: Fix regex in FIND-FILES invocation.
gnu: hypre: Fix regex in FIND-FILES invocation.
gnu: qtpass: Fix regex in FIND-FILES invocation.
gnu: john-the-ripper-jumbo: Fix regex in FIND-FILES invocation.
gnu: python-robotframework-sshlibrary: Fix regex in FIND-FILES
invocation.
gnu: python-cram: Fix regex in FIND-FILES invocation.
gnu: aegis: Fix regex in FIND-FILES invocation.
gnu: bullet: Fix regex in FIND-FILES invocation.
gnu: shogun: Fix regex in FIND-FILES invocation.
gnu: alpine: Fix regex in FIND-FILES invocation.
gnu: rtags: Fix regex in FIND-FILES invocation.

gnu/packages/admin.scm | 9 +++++----
gnu/packages/audio.scm | 7 ++++---
gnu/packages/code.scm | 9 +++++----
gnu/packages/compression.scm | 3 ++-
gnu/packages/cook.scm | 3 ++-
gnu/packages/elf.scm | 3 ++-
gnu/packages/game-development.scm | 5 +++--
gnu/packages/golang.scm | 2 +-
gnu/packages/guile-xyz.scm | 11 ++++++-----
gnu/packages/linphone.scm | 3 ++-
gnu/packages/machine-learning.scm | 29 +++++++++++++++--------------
gnu/packages/mail.scm | 7 ++++---
gnu/packages/maths.scm | 11 ++++++-----
gnu/packages/password-utils.scm | 13 +++++++------
gnu/packages/python-xyz.scm | 7 ++++---
gnu/packages/version-control.scm | 3 ++-
16 files changed, 70 insertions(+), 55 deletions(-)


base-commit: fcba63f8b7806493fc5060b267af93cdb7d21aa6
--
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:18
Download
[PATCH 01/34] gnu: wpa-supplicant-minimal: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
24781538bbc2bb6d0e84ae21b6fee41157e0e41e.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/admin.scm (wpa-supplicant-minimal)[arguments]: Fix regex.
---
gnu/packages/admin.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index ecea149f0e..223a23f5fc 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -42,6 +42,7 @@
 ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
 ;;; Copyright © 2021 WinterHound <winterhound@yandex.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1844,9 +1845,9 @@ features of sudo with a fraction of the codebase.")
 
                (mkdir-p man5) (mkdir man8)
                (for-each (copy-man-page man5)
-                         (find-files "doc/docbook" "\\.5"))
+                         (find-files "doc/docbook" "\\.5$"))
                (for-each (copy-man-page man8)
-                         (find-files "doc/docbook" "\\.8"))
+                         (find-files "doc/docbook" "\\.8$"))
 
                ;; wpa_supplicant.conf(5) does not explain all configuration
                ;; options but refers to the example config file, so install it
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:18
Download
[PATCH 02/34] gnu: hostapd: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
64487db569a94a2f3e9fcb0a634f77847c6e0088.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/admin.scm (hostapd)[arguments]: Fix regex.
---
gnu/packages/admin.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (18 lines)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 223a23f5fc..47cca0c3ab 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2006,9 +2006,9 @@ command.")
                    (install-file file target)))
 
                (for-each (copy-man-page man1)
-                         (find-files "." "\\.1"))
+                         (find-files "." "\\.1$"))
                (for-each (copy-man-page man8)
-                         (find-files "." "\\.8"))
+                         (find-files "." "\\.8$"))
                #t))))
 
       #:make-flags (list (string-append "CC=" ,(cc-for-target))
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:18
Download
[PATCH 03/34] gnu: infamous-plugins: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
3ab29a32ca84ef31cf6eff132d84fac03cf84f8c.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/audio.scm (infamous-plugins)[arguments]: Fix regex.
---
gnu/packages/audio.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (30 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index b9ac034f36..f56ac61c4c 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -34,6 +34,7 @@
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1039,13 +1040,13 @@ generators of mostly elementary and occasionally exotic nature.")
        (modify-phases %standard-phases
          (add-after 'unpack 'remove-compiler-flags
            (lambda _
-             (substitute* (find-files "." "CMakeLists.txt")
+             (substitute* (find-files "." "^CMakeLists\\.txt$")
                (("-msse2 -mfpmath=sse") ""))
              #t))
          (add-after 'unpack 'fix-build-with-newer-lv2
            (lambda _
              ;; https://github.com/ssj71/infamousPlugins/commit/4c7275b1fa8ea3296446421cbd29ec2df66588c0
-             (substitute* (find-files "src" ".*\\.cxx")
+             (substitute* (find-files "src" "\\.cxx$")
                (("_LV2UI_Descriptor") "LV2UI_Descriptor"))
              #t)))))
     (inputs
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:18
Download
[PATCH 06/34] gnu: astyle: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
c2edff8747dc3646d2558e1dfd11bcc1d96955e2.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/code.scm (astyle)[arguments]: Fix regex.
---
gnu/packages/code.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (21 lines)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 542ac880fb..c71c31d634 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -806,12 +806,12 @@ Objective@tie{}C, D, Java, Pawn, and Vala).  Features:
                (for-each (lambda (l)
                            (copy-file
                             l (string-append libdir "/" (basename l))))
-                         (find-files "bin" "lib*"))
+                         (find-files "bin" "^lib"))
                (for-each
                 (lambda (sofile)
                   (make-so-link sofile "(\\.[0-9]){3}$")  ;; link .so
                   (make-so-link sofile "(\\.[0-9]){2}$")) ;; link .so.3
-                (find-files libdir "lib.*\\.so\\..*")))
+                (find-files libdir "^lib.*\\.so\\.")))
              #t)))))
     (home-page "http://astyle.sourceforge.net/")
     (synopsis "Source code indenter, formatter, and beautifier")
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:18
Download
[PATCH 05/34] gnu: kcov: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
53ab4388c71da7fc12a676dddd0f1821e7c5fe3e.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/code.scm (kcov)[arguments]: Fix regex.
---
gnu/packages/code.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index a414cde3de..542ac880fb 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2021 lu hui <luhuins@163.com>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -564,7 +565,7 @@ results and determine build stability.")
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-/bin/bash-references
            (lambda _
-             (substitute* (find-files "src" ".*\\.cc?$")
+             (substitute* (find-files "src" "\\.cc?$")
                (("/bin/bash") (which "bash"))
                (("/bin/sh") (which "sh")))
              #t)))))
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:18
Download
[PATCH 04/34] gnu: tao: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
cb84dcfd2ffc948a0c13bc72181a01f2d1f66884.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/audio.scm (tao)[arguments]: Fix regex.
---
gnu/packages/audio.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f56ac61c4c..432949c2a0 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1222,7 +1222,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
                (install-file "user-scripts/error.parse" share)
                (copy-recursively "examples" (string-append share "examples"))
                (for-each (lambda (file) (install-file file inc))
-                         (find-files "include" "\\.h"))
+                         (find-files "include" "\\.h$"))
                #t))))))
     (inputs
      `(("audiofile" ,audiofile)
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:18
Download
[PATCH 07/34] gnu: unshield: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
09cd39e9362a87824319b2c1ede4566c9620f291.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/compression.scm (unshield)[arguments]: Fix regex.
---
gnu/packages/compression.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 26cddb12fa..42282d5e0c 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
 ;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1529,7 +1530,7 @@ or junctions, and always follows hard links.")
                        '("unshield-avigomanager11b22.zip"
                          "unshield-baldurs_gate_patch_v1_1_4315_international.zip"
                          "unshield-the-feeble-files-spanish.zip"))
-             (substitute* (find-files "test/" "/*\\.sh")
+             (substitute* (find-files "test/" "\\.sh$")
                ;; Tests expect the unshield binary in a specific
                ;; location.
                (("/var/tmp/unshield/bin/unshield")
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:18
Download
[PATCH 08/34] gnu: cook: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
fa696a05faf83b67d698a03f47b03ff37ad51a67.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/cook.scm (cook)[arguments]: Fix regex.
---
gnu/packages/cook.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/cook.scm b/gnu/packages/cook.scm
index ba13709eda..baeb08cfc5 100644
--- a/gnu/packages/cook.scm
+++ b/gnu/packages/cook.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,7 +48,7 @@
          (add-before 'configure 'pre-conf
            (lambda _
              (substitute* (append '("common/env.c")
-                                  (find-files "test" "\\.sh"))
+                                  (find-files "test" "\\.sh$"))
                (("/bin/sh") (which "sh")))
 
              ;; Guix's binutils (because it wants bit-reproducable builds) is
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:18
Download
[PATCH 09/34] gnu: libabigail: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
9371c80eb940bd3df09f091958881425434e075c.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/elf.scm (libabigail)[arguments]: Fix regex.
---
gnu/packages/elf.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index aab912648b..9328e5411d 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2020 Mark Wielaard <mark@klomp.org>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -164,7 +165,7 @@ object or archive file), @command{eu-strip} (for discarding symbols),
                                    file (string-append (assoc-ref outputs "out")
                                                        "/share/bash-completion"
                                                        "/completions")))
-                                (find-files "bash-completion" ".*abi.*"))
+                                (find-files "bash-completion" "abi"))
                       #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:20
Download
[PATCH 10/34] gnu: grfcodec: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
680974401ccf1cf407b1e02d75b8a8cdc3f874db.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/game-development.scm (grfcodec)[arguments]: Fix regex.
---
gnu/packages/game-development.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index e1593c0f82..9996830077 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -231,7 +232,7 @@ DeuTex has functions such as merging wads, etc.")
                              "readme" "readme.rpn"))
                  (for-each (lambda (file)
                              (install-file file man))
-                           (find-files "." "\\.1"))))
+                           (find-files "." "\\.1$"))))
              #t)))))
     (inputs
      `(("boost" ,boost)
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:20
Download
[PATCH 11/34] gnu: go-github-com-keybase-go-ps: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
8627a97e442f4e37d4db76d9e94228f0ae29bb14.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/golang.scm (go-github-com-keybase-go-ps)[arguments]:
Fix regex.
---
gnu/packages/golang.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a830afa022..eedf00dfaa 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -875,7 +875,7 @@ Go.")
          (modify-phases %standard-phases
            (add-after 'unpack 'fix-tests
              (lambda* (#:key native-inputs inputs #:allow-other-keys)
-               (substitute* (find-files "." "test\\.go")
+               (substitute* (find-files "." "test\\.go$")
                  (("/bin/sleep" command)
                   (string-append
                    (assoc-ref (or native-inputs inputs) "coreutils")
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:20
Download
[PATCH 12/34] gnu: guile-sly: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
def06e7337f43ee2245c3d59ed2a89f64cca7122.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/guile-xyz.scm (guile-sly)[arguments]: Fix regex.
---
gnu/packages/guile-xyz.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e91bf88247..c3910a6d38 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -38,6 +38,7 @@
 ;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
 ;;; Copyright © 2021 Zelphir Kaltstahl <zelphirkaltstahl@posteo.de>
 ;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1949,7 +1950,7 @@ users and in some situations.")
                      "_guile_required_version=\"2\"")
                     (("ac_subst_vars='")
                      "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
-                  (substitute* (find-files "." "Makefile.in")
+                  (substitute* (find-files "." "^Makefile\\.in$")
                     (("moddir = .*$")
                      (string-append
                       "moddir = "
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:20
Download
[PATCH 13/34] gnu: g-wrap: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
e531bfcb24124d6eae035496a40c9d9f75e71a05.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/guile-xyz.scm (g-wrap)[arguments]: Fix regex.
---
gnu/packages/guile-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index c3910a6d38..18f9c8e70d 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2097,7 +2097,7 @@ object-oriented programming system, GOOPS.")
          (add-before 'configure 'pre-configure
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
-               (substitute* (find-files "." "^Makefile.in$")
+               (substitute* (find-files "." "^Makefile\\.in$")
                  (("guilemoduledir =.*guile/site" all)
                   (string-append all "/@GUILE_EFFECTIVE_VERSION@")))
                #t))))))
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:20
Download
[PATCH 14/34] gnu: guile-ncurses: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
ad8a1100b04c9f8f7a62f56c829eb13578d511db.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/guile-xyz.scm (guile-ncurses)[arguments]: Fix regex.
---
gnu/packages/guile-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 18f9c8e70d..777530aae7 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2243,7 +2243,7 @@ many readers as needed).")
                            (parallel-job-count)))
              (let* ((out   (assoc-ref outputs "out"))
                     (dir   "src/ncurses")
-                    (files (find-files dir ".scm")))
+                    (files (find-files dir "\\.scm$")))
                (substitute* files
                  (("\"libguile-ncurses\"")
                   (format #f "\"~a/lib/guile/~a/libguile-ncurses\""
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:20
Download
[PATCH 15/34] gnu: guile-gi: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
ec6313510f43f4bf4322d35951579bf218df47ca.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/guile-xyz.scm (guile-gi)[arguments]: Fix regex.
---
gnu/packages/guile-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 777530aae7..dda19b0d37 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3076,7 +3076,7 @@ list of components.  This module takes care of that for you.")
                                (open-pipe* OPEN_READ
                                            "guile" "-c"
                                            "(display (effective-version))"))))
-               (substitute* (find-files "module" ".*\\.scm")
+               (substitute* (find-files "module" "\\.scm$")
                  (("\\(load-extension \"libguile-gi\" \"(.*)\"\\)" m arg)
                   (format #f "~s"
                           `(load-extension
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:20
Download
[PATCH 16/34] gnu: guile-ac-d-bus: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
f2d399b8793b69a0d905721d97c539afc412efa8.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/guile-xyz.scm (guile-ac-d-bus)[arguments]: Fix regex.
---
gnu/packages/guile-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index dda19b0d37..17b1982d74 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3858,7 +3858,7 @@ and space linear in the size of the input text.")
                       ;; not appear in .go file names.
                       (for-each (lambda (file)
                                   (rename-file file (guile-sls->sls file)))
-                                (find-files "compat" "\\.guile\\.sls"))
+                                (find-files "compat" "\\.guile\\.sls$"))
 
                       ;; Move directories under d-bus/ to match module names.
                       (mkdir "d-bus")
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:20
Download
[PATCH 17/34] gnu: belle-sip: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
917330881812a162c22891b6fc44d327344a074a.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/linphone.scm (belle-sip)[arguments]: Fix regex.
---
gnu/packages/linphone.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 1c60e767b0..8745580554 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2020, 2021 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -506,7 +507,7 @@ including both ARM and x86.")
            (lambda* (#:key inputs #:allow-other-keys)
              ;; Fix mDNS dependency.
              (let* ((avahi (assoc-ref inputs "avahi")))
-               (substitute* (find-files "." "CMakeLists.txt")
+               (substitute* (find-files "." "^CMakeLists\\.txt$")
                  (("find_package\\(DNSSD REQUIRED\\)")
                   "set(DNSSD_FOUND 1)")
                  (("\\$\\{DNSSD_INCLUDE_DIRS\\}")
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:21
Download
[PATCH 18/34] gnu: python-libsvm: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
fc7348beda00477779a4f5a61330709f7f24a85d.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/machine-learning.scm (python-libsvm)[arguments]: Fix
regex.
---
gnu/packages/machine-learning.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 177d1aaa4f..8337ae9a27 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com>
 ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -184,7 +185,7 @@ classification.")
               (mkdir-p site)
               (for-each (lambda (file)
                           (copy-file file (string-append site (basename file))))
-                        (find-files "python" "\\.py"))
+                        (find-files "python" "\\.py$"))
               (copy-file "libsvm.so.2"
                          (string-append site "libsvm.so.2")))
             #t)))))
-- 
2.31.1
S
S
Sarah Morgensen wrote on 1 Aug 2021 23:21
Download
[PATCH 19/34] gnu: kaldi: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
18b7c9d99b1734486d9651395c576ec11db75a08.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/machine-learning.scm (kaldi)[arguments]: Fix regex.
---
gnu/packages/machine-learning.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (21 lines)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 8337ae9a27..13998e5824 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1392,12 +1392,12 @@ discrete, and conditional dimensions.")
                              (let ((target (readlink file)))
                                (delete-file file)
                                (install-file target lib)))
-                           (find-files lib "\\.so"))
+                           (find-files lib "\\.so[\\.0-9]*$"))
                  ;; Install headers
                  (for-each (lambda (file)
                              (let ((target-dir (string-append inc "/" (dirname file))))
                                (install-file file target-dir)))
-                           (find-files "." "\\.h"))
+                           (find-files "." "\\.h$"))
                  (install-file "gst-plugin/libgstonlinegmmdecodefaster.so"
                                (string-append lib "/gstreamer-1.0"))
                  #t))))))
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 21/34] gnu: tensorflow: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
ed96f2eb0a0480f73ec295e5c8df82c9befb260a.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/machine-learning.scm (tensorflow)[arguments]: Fix regex.
---
gnu/packages/machine-learning.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 9f977a3fc9..02365a4d59 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1691,7 +1691,7 @@ Python.")
 
              ;; Fix the build with python-3.8, taken from rejected upstream patch:
              ;; https://github.com/tensorflow/tensorflow/issues/34197
-             (substitute* (find-files "tensorflow/python" ".*\\.cc$")
+             (substitute* (find-files "tensorflow/python" "\\.cc$")
                (("(nullptr,)(\\ +/. tp_print)" _ _ tp_print)
                 (string-append "NULL,   " tp_print)))
              #t))
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 22/34] gnu: sendmail: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
fda6313fc70e7cadab16986b5074b7ba2a525e5e.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/mail.scm (sendmail)[arguments]: Fix regex.
---
gnu/packages/mail.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index f75cd910e5..c3d737bbda 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -42,6 +42,7 @@
 ;;; Copyright © 2020 divoplade <d@divoplade.fr>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2021 Benoit Joly <benoit@benoitj.ca>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2875,8 +2876,8 @@ powerful user customization features.")
                  (append
                   (list "smrsh/smrsh.c" "sendmail/conf.c" "contrib/mailprio"
                         "contrib/mmuegel" "devtools/bin/configure.sh")
-                  (find-files "." ".*\\.m4")
-                  (find-files "." ".*\\.cf"))
+                  (find-files "." "\\.m4$")
+                  (find-files "." "\\.cf$"))
                (("/bin/sh") (which "sh")))
 
              (substitute* "devtools/bin/Build"
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 20/34] gnu: kaldi-gstreamer-server: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
db0b70be46a62348d63b34abfb293bdef5f8fc8f.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/machine-learning.scm
(kaldi-gstreamer-server)[arguments]: Fix regex.
---
gnu/packages/machine-learning.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 13998e5824..9f977a3fc9 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1553,7 +1553,7 @@ automatically.")
 
                  ;; Install sample configuration files
                  (for-each (cut install-file <> share)
-                           (find-files "." "\\.yaml"))
+                           (find-files "." "\\.yaml$"))
 
                  ;; Install executables
                  (mkdir-p bin)
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 23/34] gnu: scotch: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
09f791449bf34647baed88b7899a7a591fc8b0bf.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/maths.scm (scotch)[arguments]: Fix regex.
---
gnu/packages/maths.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (27 lines)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 1afe72659a..61f11c6b52 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -48,6 +48,7 @@
 ;;; Copyright © 2021 Paul A. Patience <paul@apatience.com>
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
 ;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3423,10 +3424,10 @@ YACC = bison -pscotchyy -y -b y
                ;; metis files are not installed with 'make install'
                (for-each (lambda (f)
                            (install-file f (string-append out "/include")))
-                         (find-files "../include/" ".*metis\\.h"))
+                         (find-files "../include/" "metis\\.h$"))
                (for-each (lambda (f)
                            (install-file f (string-append out "/lib")))
-                         (find-files "../lib/" ".*metis\\..*"))
+                         (find-files "../lib/" "metis\\."))
                #t))))))
     (home-page "https://www.labri.fr/perso/pelegrin/scotch/")
     (properties
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 24/34] gnu: atlas: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
432ec4a51f7f1a2325acbfc10caf6181a7c56c7d.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/maths.scm (atlas)[arguments]: Fix regex.
---
gnu/packages/maths.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 61f11c6b52..d9d71a335d 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4407,14 +4407,14 @@ packages.")
          (add-before 'configure 'fix-/bin/sh
            (lambda _
              ;; Use `sh', not `/bin/sh'.
-             (substitute* (find-files "." "Makefile|configure|SpewMakeInc\\.c")
+             (substitute* (find-files "." "^(Makefile|configure|SpewMakeInc\\.c)$")
                (("/bin/sh")
                 "sh"))
              #t))
          ;; Fix /bin/sh in generated make files.
          (add-after 'configure 'fix-/bin/sh-in-generated-files
            (lambda _
-             (substitute* (find-files "." "^[Mm]ake\\.inc.*")
+             (substitute* (find-files "." "^[Mm]ake\\.inc")
                (("/bin/sh")
                 "sh"))
              #t))
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 25/34] gnu: hypre: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
5abc5445cf3b34dfd90ba3fcc329d26917f14f9c.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/maths.scm (hypre)[arguments]: Fix regex.
---
gnu/packages/maths.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d9d71a335d..5425c702ba 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4947,7 +4947,7 @@ set.")
                            (when (positive? size)
                              (error (format #f "~a size ~d; error indication~%"
                                             filename size)))))
-                       (find-files "test" ".*\\.err$"))
+                       (find-files "test" "\\.err$"))
              #t))
          (add-after 'install 'install-docs
            (lambda* (#:key outputs #:allow-other-keys)
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 26/34] gnu: qtpass: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
94006b3e049029bde5724e4a4a9ad8292aae52da.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/password-utils.scm (qtpass)[arguments]: Fix regex.
---
gnu/packages/password-utils.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index b969391ba9..6a0236e43b 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2021 David Dashyan <mail@davie.li>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -674,7 +675,7 @@ key URIs using the standard otpauth:// scheme.")
                                   (src (string-append base ".ts"))
                                   (st (stat src)))
                              (set-file-time file st)))
-                         (find-files "." ".*\\.qm")))
+                         (find-files "." "\\.qm$")))
              #t))
          (add-after 'install 'install-auxilliary
            ;; Install man-page, icon and .desktop file.
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 27/34] gnu: john-the-ripper-jumbo: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
2ddd07a588c5de0c8b7cc3c164f730706518f102.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/password-utils.scm (john-the-ripper-jumbo)[arguments]:
Fix regex.
---
gnu/packages/password-utils.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

Toggle diff (31 lines)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 6a0236e43b..bb5162be72 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -981,7 +981,7 @@ between hosts and entries in the password store.")
                              (find-files "." symlink?))
                    (for-each (install-file-to execdir)
                              (cons* "mailer" "benchmark-unify" "relbench"
-                                    (find-files "." ".*\\.js")))
+                                    (find-files "." "\\.js$")))
                    (for-each (lambda (f)
                                (let* ((base (basename f))
                                       (name (substring base 0 (string-index base #\.)))
@@ -990,11 +990,11 @@ between hosts and entries in the password store.")
                                  (when (and (executable-file? f)
                                             (not (file-exists? link)))
                                    (symlink (string-append execdir "/" base) link))))
-                             (find-files "." ".*\\.(pl|py|rb|lua)"))
+                             (find-files "." "\\.(pl|py|rb|lua)$"))
                    (for-each (install-file-to datadir)
-                             (append (find-files "." "(stats|dictionary.*)")
-                                     (find-files "." "(.*\\.chr|.*\\.lst)")
-                                     (find-files "." ".*\\.conf")))
+                             (append (find-files "." "^(stats$|dictionary\\.)")
+                                     (find-files "." "\\.(chr|lst)$")
+                                     (find-files "." "\\.conf$")))
                    (copy-recursively "rules" (string-append datadir "/rules")))
                  (copy-recursively "../doc" docdir)
                  #t)))
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 28/34] gnu: python-robotframework-sshlibrary: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
a812847dadf8e9e3ab364357d896cdbb93ece0a6.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/python-xyz.scm
(python-robotframework-sshlibrary)[arguments]: Fix regex.
---
gnu/packages/python-xyz.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 61db9febb8..6484658c82 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -106,6 +106,7 @@
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
 ;;; Copyright © 2021 Franck Pérignon <franck.perignon@univ-grenoble-alpes.fr>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4429,7 +4430,7 @@ utility, a static analysis tool (linter) for Robot Framework source files.")
                (invoke "chmod" "-R" "+w" "docs")
                (invoke "invoke" "kw-docs" "project-docs")
                (mkdir-p doc)
-               (for-each delete-file (find-files "docs" "\\.rst"))
+               (for-each delete-file (find-files "docs" "\\.rst$"))
                (copy-recursively "docs" doc)
                #t)))
          (replace 'check
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 29/34] gnu: python-cram: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
e2ac86604fa8025be26f1cd1d216e25f965a65e4.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/python-xyz.scm (python-cram)[arguments]: Fix regex.
---
gnu/packages/python-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6484658c82..8858eb8d1c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9747,10 +9747,10 @@ pseudo terminal (pty), and interact with both the process and its pty.")
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-source
            (lambda _
-             (substitute* (find-files "cram" ".*\\.py$")
+             (substitute* (find-files "cram" "\\.py$")
                ;; Replace default shell path.
                (("/bin/sh") (which "sh")))
-             (substitute* (find-files "tests" ".*\\.t$")
+             (substitute* (find-files "tests" "\\.t$")
                (("md5") "md5sum")
                (("/bin/bash") (which "bash"))
                (("/bin/sh") (which "sh")))
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 30/34] gnu: aegis: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
51ee578449d167f64b2128415a70ac26c034cdca.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/version-control.scm (aegis)[arguments]: Fix regex.
---
gnu/packages/version-control.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 7c1dbe8b26..36bcbe4b06 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -39,6 +39,7 @@
 ;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2021 François J. <francois-oss@avalenn.eu>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2163,7 +2164,7 @@ accessed and migrated on modern systems.")
                                      "web/eg_oss_templ.sh"
                                      "web/webiface.html"
                                      "libaegis/getpw_cache.cc")
-                                   (find-files "test" "\\.sh"))
+                                   (find-files "test" "\\.sh$"))
                            (("/bin/sh") (which "sh")))
               (setenv "SH" (which "sh"))
               #t))
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 31/34] gnu: bullet: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
978db4320b8dc978d9d780311627576feaac53b3.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/game-development.scm (bullet)[origin]<snippet>: Fix
regex.
---
gnu/packages/game-development.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 9996830077..22006f60fb 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -120,7 +120,7 @@
               (modules '((guix build utils)))
               (snippet
                '(begin
-                  (for-each delete-file (find-files "build3" "premake*"))
+                  (for-each delete-file (find-files "build3" "^premake"))
                   (with-directory-excursion "examples/ThirdPartyLibs"
                     (for-each delete-file-recursively
                               '("Gwen" "clsocket" "enet" "glad" "imgui"
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 32/34] gnu: shogun: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
c6c2635e0186c413344f11346014469bc1620313.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/machine-learning.scm (shogun)[origin]<snippet>: Fix
regex.
---
gnu/packages/machine-learning.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

Toggle diff (46 lines)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 02365a4d59..1263b0621c 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -454,12 +454,12 @@ optimizing, and searching weighted finite-state transducers (FSTs).")
            ;; Remove non-free sources and files referencing them
            (for-each delete-file
                      (find-files "src/shogun/classifier/svm/"
-                                 "SVMLight\\.(cpp|h)"))
+                                 "^SVMLight\\.(cpp|h)$"))
            (for-each delete-file
                      (find-files "examples/undocumented/libshogun/"
                                  (string-append
-                                  "(classifier_.*svmlight.*|"
-                                  "evaluation_cross_validation_locked_comparison).cpp")))
+                                  "^(classifier_.*svmlight.*|"
+                                  "evaluation_cross_validation_locked_comparison).cpp$")))
            ;; Remove non-free functions.
            (define (delete-ifdefs file)
              (with-atomic-file-replacement file
@@ -481,17 +481,17 @@ optimizing, and searching weighted finite-state transducers (FSTs).")
            (for-each delete-ifdefs
                      (append
                       (find-files "src/shogun/classifier/mkl"
-                                  "^MKLClassification\\.cpp")
+                                  "^MKLClassification\\.cpp$")
                       (find-files "src/shogun/classifier/svm"
-                                  "^SVMLightOneClass\\.(cpp|h)")
+                                  "^SVMLightOneClass\\.(cpp|h)$")
                       (find-files "src/shogun/multiclass"
-                                  "^ScatterSVM\\.(cpp|h)")
+                                  "^ScatterSVM\\.(cpp|h)$")
                       (find-files "src/shogun/kernel/"
-                                  "^(Kernel|CombinedKernel|ProductKernel)\\.(cpp|h)")
+                                  "^(Kernel|CombinedKernel|ProductKernel)\\.(cpp|h)$")
                       (find-files "src/shogun/regression/svr"
-                                  "^(MKLRegression|SVRLight)\\.(cpp|h)")
+                                  "^(MKLRegression|SVRLight)\\.(cpp|h)$")
                       (find-files "src/shogun/transfer/domain_adaptation"
-                                  "^DomainAdaptationSVM\\.(cpp|h)")))
+                                  "^DomainAdaptationSVM\\.(cpp|h)$")))
            #t))))
     (build-system cmake-build-system)
     (arguments
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 33/34] gnu: alpine: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
31167155545135890ed3ecc4c32d657408195cc8.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/mail.scm (alpine)[origin]<snippet>: Fix regex.
---
gnu/packages/mail.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c3d737bbda..a4abd070e1 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3685,7 +3685,7 @@ operators and scripters.")
        (snippet
         '(begin
            ;; Remove pre-built binaries scattered across the source repository.
-           (for-each delete-file (find-files "." "\\.(dll|exe)"))
+           (for-each delete-file (find-files "." "\\.(dll|exe)$"))
            #t))))
     (build-system gnu-build-system)
     (arguments
-- 
2.31.1
S
S
Sarah Morgensen wrote on 2 Aug 2021 05:27
Download
[PATCH 34/34] gnu: rtags: Fix regex in FIND-FILES invocation.
(address . 49813@debbugs.gnu.org)
c53fa86a08eb9cb135416d916b17a9c1241991bd.1627850945.git.iskarian@mgsn.dev
Download
See https://issues.guix.gnu.org/37150 for more information.

* gnu/packages/code.scm (rtags)[origin]<snippet>: Fix regex.
---
gnu/packages/code.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index c71c31d634..c2c248c9a1 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -604,7 +604,7 @@ possible to collect coverage information without special compiler switches.")
         ;; Substitute #include "rct/header.h" with #include <rct/header.h>.
         '(with-directory-excursion "src"
            (delete-file-recursively "rct")        ;remove bundled copy
-           (let ((files (find-files "." ".*\\.cpp|.*\\.h")))
+           (let ((files (find-files "." "\\.(cpp|h)$")))
              (substitute* files
                (("#include ?\"rct/(.*.h)\"" all header)
                 (string-append "#include <rct/" header ">")))
-- 
2.31.1
M
M
Maxime Devos wrote on 22 Aug 2021 11:53
Download
Re: [bug#49813] [PATCH 04/34] gnu: tao: Fix regex in FIND-FILES invocation.
0542500ca3b4ce38e81e69334305cacb6aa0e8e2.camel@telenet.be
Download
Sarah Morgensen schreef op zo 01-08-2021 om 14:18 [-0700]:
Toggle quote (3 lines)
> - (find-files "include" "\\.h"))
> + (find-files "include" "\\.h$"))

C++ header files are sometimes named "something.hpp" instead
of "something.h", so you might want to verify these don't exist.
(And if they do exist, keep the regex "\\.h", or make it "\\.(h|hpp)$"?)

Likewise for 'kaldi', 'shogun' and 'rtags'. Otherwise, these
new regexes look good to me (but I didn't test them).

Greetings,
Maxime.
Download
-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYSIelBccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7mWIAP9FZvK6Pjzakwbw/JtwlaRBgfMB
p6LXdL5ujUOU2/oQfAD/THLx3qbaZ+2MzHmcy0UwM1fN5TW1BOePAjjNr/w+Twg=
=vvDt
-----END PGP SIGNATURE-----


S
S
Sarah Morgensen wrote on 29 Aug 2021 00:59
Download
(name . Maxime Devos)(address . maximedevos@telenet.be)(address . 49813@debbugs.gnu.org)
867dg52n1n.fsf@mgsn.dev
Download
Hi Maxime,

Thanks for taking a look at this.

Maxime Devos <maximedevos@telenet.be> writes:

Toggle quote (11 lines)
> Sarah Morgensen schreef op zo 01-08-2021 om 14:18 [-0700]:
>> - (find-files "include" "\\.h"))
>> + (find-files "include" "\\.h$"))
>
> C++ header files are sometimes named "something.hpp" instead
> of "something.h", so you might want to verify these don't exist.
> (And if they do exist, keep the regex "\\.h", or make it "\\.(h|hpp)$"?)
>
> Likewise for 'kaldi', 'shogun' and 'rtags'. Otherwise, these
> new regexes look good to me (but I didn't test them).

Good catch. I just checked the sources for all of those, and I can
verify that they don't exist. (Shogun and rtags do have .hpp files in
their source, but only in other directories.)

--
Sarah
?
You may also send email to 49813@debbugs.gnu.org to comment.