diff options
author | jgart <jgart@dismail.de> | 2022-12-25 21:32:22 -0600 |
---|---|---|
committer | Jonathan Brielmaier <jonathan.brielmaier@web.de> | 2023-02-06 23:18:54 +0100 |
commit | 1df2430f4625b46e8493c94d24982bbe3f78b959 (patch) | |
tree | 715c875e20d159eb0c05367887239f9ff1d2a551 /gnu/packages/music.scm | |
parent | a582d863465990642d331bc05bf073f47fb80908 (diff) | |
download | guix-1df2430f4625b46e8493c94d24982bbe3f78b959.tar.gz guix-1df2430f4625b46e8493c94d24982bbe3f78b959.zip |
gnu: lilypond: Update to 2.24.0.
* gnu/packages/music.scm (lilypond): Update to 2.24.0.
[arguments]: Remove adjust-to-API-change, prepare-configuration, and
install-info phases. Use disable-documentation flag and GUILE_FLAVOUR
environment variable. Remove make-flags keyword option.
[inputs]: Add extractpdfmark and update guile to 3.0.
[native-inputs]: Update Python 2 to 3 and add missing texlive-fontinst
and texlive-lm.
[home-page]: Update it.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Tested-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Diffstat (limited to 'gnu/packages/music.scm')
-rw-r--r-- | gnu/packages/music.scm | 69 |
1 files changed, 22 insertions, 47 deletions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 967d9e4b23..4ae15d2e09 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -49,6 +49,7 @@ ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com> ;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com> +;;; Copyright © 2022 jgart <jgart@dismail.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1386,7 +1387,7 @@ and auto-mapping slices to MIDI note numbers.") (define-public lilypond (package (name "lilypond") - (version "2.20.0") + (version "2.24.0") (source (origin (method url-fetch) @@ -1394,60 +1395,32 @@ and auto-mapping slices to MIDI note numbers.") "v" (version-major+minor version) "/" "lilypond-" version ".tar.gz")) (sha256 - (base32 "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar")))) + (base32 "0scbyzbxqnzgibls62npg2i3sywnb146gw7jlvinj9dhj8xvxv9w")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;out-test/collated-files.html fails - #:out-of-source? #t - #:make-flags '("conf=www") ;to generate images for info manuals - #:configure-flags - (list "CONFIGURATION=www" - (string-append "--with-texgyre-dir=" - (assoc-ref %build-inputs "font-tex-gyre") - "/share/fonts/opentype/")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-path-references - (lambda _ - (substitute* "scm/backend-library.scm" - (("\\(search-executable '\\(\"gs\"\\)\\)") - (string-append "\"" (which "gs") "\"")) - (("\"/bin/sh\"") - (string-append "\"" (which "sh") "\""))))) - (add-after 'fix-path-references 'adjust-to-API-change - (lambda _ - (substitute* '("Documentation/pictures/GNUmakefile" - "stepmake/stepmake/tex-rules.make") - ((".*-c .setpdfwrite.*") "")) - (substitute* "scm/backend-library.scm" - (("\"-c.setpdfwrite\"") "")) - (substitute* "scm/framework-ps.scm" - (("\".setpdfwrite ") "\"")))) - (add-before 'configure 'prepare-configuration - (lambda _ - (substitute* "configure" - (("SHELL=/bin/sh") "SHELL=sh") - ;; When checking the fontforge version do not consider the - ;; version string that's part of the directory. - (("head -n") "tail -n") - ;; Also allow for SOURCE_DATE_EPOCH = 0 in fontforge. - (("20110222") "19700101")) - (setenv "out" "www") - (setenv "conf" "www"))) - (add-after 'install 'install-info - (lambda _ - (invoke "make" - "-j" (number->string (parallel-job-count)) - "conf=www" "install-info")))))) + (list #:tests? #f ;out-test/collated-files.html fails + #:out-of-source? #t + #:configure-flags + #~(list "--disable-documentation" "GUILE_FLAVOR=guile-3.0") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-path-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scm/backend-library.scm" + (("\\(search-executable '\\(\"gs\"\\)\\)") + (string-append "\"" (search-input-file inputs "bin/gs") "\"")) + (("\"/bin/sh\"") + (string-append "\"" (search-input-file inputs "bin/sh") "\"")))))))) (inputs - `(("guile" ,guile-1.8) + `(("guile" ,guile-3.0) + ("extractpdfmark" ,extractpdfmark) ("font-dejavu" ,font-dejavu) ("font-tex-gyre" ,font-tex-gyre) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("ghostscript" ,ghostscript) ("pango" ,pango) - ("python" ,python-2))) + ("python" ,python))) (native-inputs `(("bison" ,bison) ("perl" ,perl) @@ -1459,14 +1432,16 @@ and auto-mapping slices to MIDI note numbers.") ("netpbm" ,netpbm) ;for pngtopnm ("texlive" ,(texlive-updmap.cfg (list texlive-metapost texlive-epsf + texlive-fontinst texlive-lh + texlive-lm texlive-latex-cyrillic))) ("texinfo" ,texinfo) ("texi2html" ,texi2html-1.82) ("rsync" ,rsync) ("pkg-config" ,pkg-config) ("zip" ,zip))) - (home-page "http://www.lilypond.org/") + (home-page "https://lilypond.org") (synopsis "Music typesetting") (description "GNU LilyPond is a music typesetter, which produces high-quality sheet |