me/guix
Archived
1
0
Fork 0
Code Activity

gnu: lilypond: Update to 2.20.0.

Browse source 
* gnu/packages/music.scm (lilypond): Update to 2.20.0.
[native-inputs]: Use texi2html-1.82 instead of texi2html.
This commit is contained in:
Nicolas Goaziou 2020-04-05 02:05:28 +02:00
parent f9f3ac4eda
commit 4da6de3e67
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
gnu/packages/music.scm
View file

@ -904,21 +904,20 @@ Sega Master System/Mark III, Sega Genesis/Mega Drive, BBC Micro
(define-public lilypond (define-public lilypond
(package (package
(name "lilypond") (name "lilypond")
(version "2.19.80") (version "2.20.0")
(source (origin (source
(method url-fetch) (origin
(uri (string-append (method url-fetch)
"http://download.linuxaudio.org/lilypond/sources/v" (uri (string-append "http://lilypond.org/download/sources/"
(version-major+minor version) "/" "v" (version-major+minor version) "/"
name "-" version ".tar.gz")) "lilypond-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar"))))
"0lql4q946gna2pl1g409mmmsvn2qvnq2z5cihrkfhk7plcqdny9n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; out-test/collated-files.html fails `(#:tests? #f ;out-test/collated-files.html fails
#:out-of-source? #t #:out-of-source? #t
#:make-flags '("conf=www") ;to generate images for info manuals #:make-flags '("conf=www") ;to generate images for info manuals
#:configure-flags #:configure-flags
(list "CONFIGURATION=www" (list "CONFIGURATION=www"
(string-append "--with-texgyre-dir=" (string-append "--with-texgyre-dir="
@ -936,25 +935,25 @@ Sega Master System/Mark III, Sega Genesis/Mega Drive, BBC Micro
(("TEX_FIKPARM=.*") "TEX_FIKPARM=found\n")) (("TEX_FIKPARM=.*") "TEX_FIKPARM=found\n"))
#t)) #t))
(add-after 'unpack 'fix-path-references (add-after 'unpack 'fix-path-references
(lambda _ (lambda _
(substitute* "scm/backend-library.scm" (substitute* "scm/backend-library.scm"
(("\\(search-executable '\\(\"gs\"\\)\\)") (("\\(search-executable '\\(\"gs\"\\)\\)")
(string-append "\"" (which "gs") "\"")) (string-append "\"" (which "gs") "\""))
(("\"/bin/sh\"") (("\"/bin/sh\"")
(string-append "\"" (which "sh") "\""))) (string-append "\"" (which "sh") "\"")))
#t)) #t))
(add-before 'configure 'prepare-configuration (add-before 'configure 'prepare-configuration
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
(("SHELL=/bin/sh") "SHELL=sh") (("SHELL=/bin/sh") "SHELL=sh")
;; When checking the fontforge version do not consider the ;; When checking the fontforge version do not consider the
;; version string that's part of the directory. ;; version string that's part of the directory.
(("head -n") "tail -n") (("head -n") "tail -n")
;; Also allow for SOURCE_DATE_EPOCH = 0 in fontforge. ;; Also allow for SOURCE_DATE_EPOCH = 0 in fontforge.
(("20110222") "19700101")) (("20110222") "19700101"))
(setenv "out" "www") (setenv "out" "www")
(setenv "conf" "www") (setenv "conf" "www")
#t)) #t))
(add-after 'install 'install-info (add-after 'install 'install-info
(lambda _ (lambda _
(invoke "make" (invoke "make"
@ -978,13 +977,13 @@ Sega Master System/Mark III, Sega Genesis/Mega Drive, BBC Micro
("dblatex" ,dblatex) ("dblatex" ,dblatex)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("imagemagick" ,imagemagick) ("imagemagick" ,imagemagick)
("netpbm" ,netpbm) ;for pngtopnm ("netpbm" ,netpbm) ;for pngtopnm
("texlive" ,(texlive-union (list texlive-metapost ("texlive" ,(texlive-union (list texlive-metapost
texlive-generic-epsf texlive-generic-epsf
texlive-latex-lh texlive-latex-lh
texlive-latex-cyrillic))) texlive-latex-cyrillic)))
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("texi2html" ,texi2html) ("texi2html" ,texi2html-1.82)
("rsync" ,rsync) ("rsync" ,rsync)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("zip" ,zip))) ("zip" ,zip)))