From e5a0348962b9dbf222c3a96c3fad7c460dd5a5ca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 2 Mar 2019 22:15:26 +0200 Subject: gnu: lyx: Parameterize more version variables. * gnu/packages/tex.scm (lyx)[source]: Parameterize the version string. [arguments]: Parameterize version variables in 'configre-flags and in the custom phases 'setenv-check and 'install-symlink. --- gnu/packages/tex.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f7f8fc3296..3248076818 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016, 2018 Efraim Flashner +;;; Copyright © 2016, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus @@ -5542,7 +5542,8 @@ and Karl Berry.") (version "2.3.2-2") (source (origin (method url-fetch) - (uri (string-append "http://ftp.lyx.org/pub/lyx/stable/2.3.x/" + (uri (string-append "http://ftp.lyx.org/pub/lyx/stable/" + (version-major+minor version) ".x/" name "-" version ".tar.gz")) (sha256 (base32 @@ -5561,7 +5562,7 @@ and Karl Berry.") ,(string-append "-DLYX_INSTALL_PREFIX=" (assoc-ref %outputs "out") ;; Exact name and level is necessary. - "/lyx2.3")) + "/lyx" ,(version-major+minor version))) #:phases (modify-phases %standard-phases ;; See ;; https://www.lyx.org/trac/changeset/3a123b90af838b08680471d87170c38e56787df9/lyxgit @@ -5593,15 +5594,19 @@ and Karl Berry.") ,version "/src/tests/check_layout.cmake") (const #t)) - (setenv "LYX_DIR_23x" (string-append (getcwd) "/../lyx-" - ,version "/lib")) + (setenv (string-append "LYX_DIR_" + (string-join + (string-split + ,(version-major+minor version) #\-)) "x") + (string-append (getcwd) "/../lyx-" ,version "/lib")) #t)) (add-after 'install 'install-symlinks (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (mkdir-p (string-append out "/bin")) - (symlink "../lyx2.3/bin/lyx2.3" - (string-append out "/bin/lyx2.3")) + (symlink (string-append "../lyx" ,(version-major+minor version) + "/bin/lyx" ,(version-major+minor version)) + (string-append out "/bin/lyx" ,(version-major+minor version))) #t)))))) (inputs `(("boost" ,boost) -- cgit v1.2.3 .scm?id=d0f3a672dcbdfefd3556b6a21985ff0e35eed3be'>gnu: Add graphical installer support....Mathieu Othacehe 2019-01-13system: Add sudoedit to %setuid-programs....Meiyo Peng 2018-12-26system: Fix missing space in boot labels for kernels that are inferior packages...Pkill -9 2018-12-21system: 'kernel->boot-label' now accepts inferior packages....Pkill -9 2018-11-21linux-initrd: 'expression->initrd' returns the complete file name....Ludovic Courtès 2018-11-18system: De-monadify 'operating-system-bootcfg'....Ludovic Courtès 2018-11-18system: Please Emacs....Ludovic Courtès 2018-11-18system: De-monadify 'operating-system-boot-parameters'....Ludovic Courtès 2018-11-18linux-initrd: Return file-like objects instead of monadic values....Ludovic Courtès 2018-11-18system: Simplify kernel argument handling....Ludovic Courtès 2018-11-18bootloader: De-monadify configuration file generators....Ludovic Courtès 2018-09-26services: shepherd: Add workaround for 0.5.0 in containers....Ludovic Courtès 2018-06-21system: Mapped devices needed for boot do not yield Shepherd services....Ludovic Courtès 2018-06-20services: boot: Take gexps instead of monadic gexps....Ludovic Courtès 2018-06-20services: boot: Reverse the order of boot expressions....Ludovic Courtès 2018-06-18system: Have /run/setuid-programs first in $PATH....Ludovic Courtès 2018-06-12system: Move ~/.config/guix/current first in PATH and INFOPATH....Ludovic Courtès 2018-06-09system: Honor ~/.config/guix/current in /etc/profile....Ludovic Courtès 2018-06-01Merge branch 'master' into core-updatesLudovic Courtès 2018-05-31system: 'read-boot-parameters' provides a more meaningful warning....Ludovic Courtès 2018-05-28Merge branch 'master' into core-updatesMark H Weaver 2018-05-28file-systems: Remove 'title' field and add <file-system-label>....Ludovic Courtès 2018-05-21Merge branch 'master' into core-updatesMark H Weaver 2018-05-19file-systems: Do not export <file-system>....Ludovic Courtès 2018-04-12Merge branch 'master' into core-updatesMark H Weaver 2018-04-11system: Provide a fall-back PATH for non-login shells started with su(1)....Leo Famulari 2018-03-29Merge branch 'master' into core-updatesMarius Bakke 2018-03-20gnu: util-linux: Fix CVE-2018-7738 without grafting....Leo Famulari 2018-03-07services: file-systems: Include 'user-file-systems' service....Ludovic Courtès 2018-03-02system: Add 'initrd-modules' field....Ludovic Courtès 2018-01-23Merge branch 'master' into core-updatesMark H Weaver 2018-01-21services: Missing services are automatically instantiated....Ludovic Courtès 2018-01-11Merge branch 'master' into core-updatesLeo Famulari 2018-01-09system: Export operating-system-user-kernel-arguments....Danny Milosavljevic 2017-12-31Merge remote-tracking branch 'origin/master' into core-updatesEfraim Flashner 2017-12-22services: 'user-processes-service-type' can now be extended....Ludovic Courtès 2017-12-05Merge branch 'master' into core-updatesMarius Bakke 2017-11-20Add semicolon in commands that set GUIX_PROFILE....Ludovic Courtès 2017-11-19Merge branch 'master' into core-updatesMarius Bakke 2017-11-13services: guix: Remove dependency on 'lsof'....Ludovic Courtès 2017-11-09system: Do not set 'TZ'....Ludovic Courtès