guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/07: clojure-utils: Avoid use of '@@'.


From: guix-commits
Subject: 07/07: clojure-utils: Avoid use of '@@'.
Date: Wed, 15 Jan 2020 17:48:54 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 65b510bbc4f2a9ce5bfe3355e6006e9d08f14532
Author: Ludovic Court├Ęs <address@hidden>
AuthorDate: Wed Jan 15 23:38:35 2020 +0100

    clojure-utils: Avoid use of '@@'.
    
    * guix/build/clojure-utils.scm (%doc-regex): Avoid @@, which doesn't
    work on Guile 3.
    (file-sans-extension): Likewise.
---
 guix/build/clojure-utils.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/guix/build/clojure-utils.scm b/guix/build/clojure-utils.scm
index 9f7334b..a9ffad3 100644
--- a/guix/build/clojure-utils.scm
+++ b/guix/build/clojure-utils.scm
@@ -69,10 +69,7 @@
 
 (define-with-docs %doc-regex
   "Default regex for matching the base name of top-level documentation files."
-  (format #f
-          "(~a)|(\\.(html|markdown|md|txt)$)"
-          (@@ (guix build guile-build-system)
-              %documentation-file-regexp)))
+  "^(README.*|.*\\.html|.*\\.org|.*\\.md|\\.markdown|\\.txt)$")
 
 (define* (install-doc #:key
                       doc-dirs
@@ -185,10 +182,12 @@ canonicalized."
          (apply find-files "./" args))))
 
 ;;; FIXME: should be moved to (guix build utils)
-(define-with-docs file-sans-extension
-  "Strip extension from path, if any."
-  (@@ (guix build guile-build-system)
-      file-sans-extension))
+(define (file-sans-extension file)                ;TODO: factorize
+  "Return the substring of FILE without its extension, if any."
+  (let ((dot (string-rindex file #\.)))
+    (if dot
+        (substring file 0 dot)
+        file)))
 
 (define (relative-path->clojure-lib-string path)
   "Convert PATH to a clojure library string."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]