me
/
guix
Archived
1
0
Fork 0
Code

guix: import: texlive importer handles Ruby linked scripts. 

* guix/import/texlive.scm (linked-scripts): Also check for scripts with ".rb" extension.
(tlpdb->package): Add proper RUBY input for Ruby linked scripts.
Nicolas Goaziou 2023-08-16 11:46:17 +02:00
parent 603db2ad71
commit 1804a99d05
No known key found for this signature in database
GPG Key ID: DA00B4F048E92F2D
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/import/texlive.scm
View File

@ -299,7 +299,7 @@ When TEXLIVE-ONLY is true, only TeX Live packages are returned."
(define (linked-scripts name package-database) (define (linked-scripts name package-database)
"Return a list of script names to symlink from \"bin/\" directory for "Return a list of script names to symlink from \"bin/\" directory for
package NAME according to PACKAGE-DATABASE. Consider as scripts files with package NAME according to PACKAGE-DATABASE. Consider as scripts files with
\".lua\", \".pl\", \".py\", \".sh\", \".tcl\", \".texlua\", \".tlu\" \".lua\", \".pl\", \".py\", \".rb\", \".sh\", \".tcl\", \".texlua\", \".tlu\"
extensions, and files without extension." extensions, and files without extension."
(and-let* ((data (assoc-ref package-database name)) (and-let* ((data (assoc-ref package-database name))
;; Check if binaries are associated to the package. ;; Check if binaries are associated to the package.
@ -318,7 +318,8 @@ extensions, and files without extension."
(filter-map (lambda (script) (filter-map (lambda (script)
(and (any (lambda (ext) (and (any (lambda (ext)
(member (basename script ext) binaries)) (member (basename script ext) binaries))
'(".lua" ".pl" ".py" ".sh" ".tcl" ".texlua" ".tlu")) '(".lua" ".pl" ".py" ".rb" ".sh" ".tcl" ".texlua"
".tlu"))
(basename script))) (basename script)))
;; Get the right (alphabetic) order. ;; Get the right (alphabetic) order.
(reverse scripts)))) (reverse scripts))))
@ -477,6 +478,7 @@ of those files are returned that are unexpectedly installed."
,@(match (append-map (lambda (s) ,@(match (append-map (lambda (s)
(cond ((string-suffix? ".pl" s) '(perl)) (cond ((string-suffix? ".pl" s) '(perl))
((string-suffix? ".py" s) '(python)) ((string-suffix? ".py" s) '(python))
((string-suffix? ".rb" s) '(ruby))
((string-suffix? ".tcl" s) '(tcl tk)) ((string-suffix? ".tcl" s) '(tcl tk))
(else '()))) (else '())))
(or scripts '())) (or scripts '()))