TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* guix/build/clojure-utils.scm (%doc-regex): Avoid @@, which doesn't
work on Guile 3.
(file-sans-extension): Likewise.
This commit is contained in:
Ludovic Courtès 2020-01-15 23:38:35 +01:00
parent 0aa6b38695
commit 65b510bbc4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
guix/build/clojure-utils.scm
View file

@ -69,10 +69,7 @@ (define-syntax-rule (define-with-docs name docs val)
(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 @@ (define (find-files* base-dir . args)
(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."