From 026ed35ddb896829c733f9cc032a7203abe5334c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 10 Jul 2023 10:03:46 +0200 Subject: guix: import: Handle texlua and TCL scripts. * guix/import/texlive.scm (linked-scripts): Also generate scripts from files with ".tlu" and ".tcl" extensions. (tlpdb->package): Add appropriate inputs when providing a TCL script. --- guix/import/texlive.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index fe28b24715..cb9651419b 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -292,7 +292,8 @@ When TEXLIVE-ONLY is true, only TeX Live packages are returned." (define (linked-scripts name package-database) "Return a list of script names to symlink from \"bin/\" directory for package NAME according to PACKAGE-DATABASE. Consider as scripts files with -\".lua\", \".pl\", \".py\", \".sh\" extensions, and files without extension." +\".lua\", \".pl\", \".py\", \".sh\", \".tcl\", \".tlu\" extensions, and files +without extension." (and-let* ((data (assoc-ref package-database name)) ;; Check if binaries are associated to the package. (depend (assoc-ref data 'depend)) @@ -310,7 +311,7 @@ package NAME according to PACKAGE-DATABASE. Consider as scripts files with (filter-map (lambda (script) (and (any (lambda (ext) (member (basename script ext) binaries)) - '(".lua" ".pl" ".py" ".sh")) + '(".lua" ".pl" ".py" ".sh" ".tcl" ".tlu")) (basename script))) ;; Get the right (alphabetic) order. (reverse scripts)))) @@ -466,13 +467,14 @@ of those files are returned that are unexpectedly installed." '((native-inputs (list texlive-metafont)))) '()) ;; Inputs. - ,@(match (filter-map (lambda (s) - (cond ((string-suffix? ".pl" s) 'perl) - ((string-suffix? ".py" s) 'python) - (else #f))) + ,@(match (append-map (lambda (s) + (cond ((string-suffix? ".pl" s) '(perl)) + ((string-suffix? ".py" s) '(python)) + ((string-suffix? ".tcl" s) '(tcl tk)) + (else '()))) (or scripts '())) (() '()) - (inputs `((inputs (list ,@inputs))))) + (inputs `((inputs (list ,@(delete-duplicates inputs eq?)))))) ;; Propagated inputs. ,@(match (translate-depends depends) (() '()) -- cgit v1.2.3 d=6a7cda20993aea36aa6e21e4a08b630f0d888d6d&showmsg=1'>Expand)Author 2020-11-07installer: parameters: Add a reboot button....Suggested by: zimoun <zimon.toutoune@gmail.com>. * gnu/installer/newt/parameters.scm (run-parameters-page): Add a reboot button. Mathieu Othacehe 2020-04-08installer: Add proxy support....* gnu/installer/proxy.scm: New file. * gnu/local.mk (INSTALLER_MODULES): Add it. * po/guix/POTFILES.in: Add it. * gnu/installer/newt/parameters.scm (run-proxy-page): New procedure, (run-parameters-page): add the previous procedure to the parameters menu. Mathieu Othacehe 2020-04-08installer: Turn help menu into parameters menu....* gnu/local.mk (INSTALLER_MODULES): Rename help.scm into parameters.scm. * po/guix/POTFILES.in: Ditto. * gnu/installer/record.scm (<installer>): Rename help-menu into parameter-menu and help-page into parameters-page. * gnu/installer/newt/parameters.scm: Renamed from help.scm. Update information messages. * gnu/installer/newt.scm: Update accordingly. * gnu/installer/newt/keymap.scm: Ditto. Mathieu Othacehe