From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iDVdNQoVqWObAAEAbAwnHQ (envelope-from ) for ; Mon, 26 Dec 2022 04:29:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id MJWNNAoVqWPmvgAAG6o9tA (envelope-from ) for ; Mon, 26 Dec 2022 04:29:14 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5728D1D951 for ; Mon, 26 Dec 2022 04:29:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p9eAk-0006FU-Ku; Sun, 25 Dec 2022 22:29:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p9eAh-0006DP-7T for guix-patches@gnu.org; Sun, 25 Dec 2022 22:29:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p9eAg-0006ff-Vr for guix-patches@gnu.org; Sun, 25 Dec 2022 22:29:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p9eAg-0001tR-J5 for guix-patches@gnu.org; Sun, 25 Dec 2022 22:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60330] [PATCH Draft] gnu: lilypond: Update to 2.24.0 Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Dec 2022 03:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60330 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60330@debbugs.gnu.org Cc: jgart X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16720253367256 (code B ref -1); Mon, 26 Dec 2022 03:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Dec 2022 03:28:56 +0000 Received: from localhost ([127.0.0.1]:50466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p9eAa-0001sy-03 for submit@debbugs.gnu.org; Sun, 25 Dec 2022 22:28:56 -0500 Received: from lists.gnu.org ([209.51.188.17]:57020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p9eAY-0001sm-Aq for submit@debbugs.gnu.org; Sun, 25 Dec 2022 22:28:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p9eAX-0006D7-WD for guix-patches@gnu.org; Sun, 25 Dec 2022 22:28:54 -0500 Received: from mx1.dismail.de ([78.46.223.134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p9eAV-0006el-B3 for guix-patches@gnu.org; Sun, 25 Dec 2022 22:28:53 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id aac84cb4 for ; Mon, 26 Dec 2022 04:28:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=KHK32bwIwgI+8F78ckKx1 JPTvTvTqwFILZg29dhTt9o=; b=CI731hVej4fWMAQP0u7rjSoTGY8U4NEyF1I+Y RbSQ+8EhKtlkWdqhv4x04WvT/IkL1Gy4h9lorUxZYX7doIqqnHb+Ynh1vk3mIKkL /LQd+b6kDriSZSJUQ04HZHRNH4THfS6/AZHaXAKr7m0QELjLx8c0O83CkmN8rAC8 EiI/9HqoBeMLGA61rpFcrefJWkrSykeZ5v9DZvd9rv2jK9EpZlwiomDKR2d7oMNy TuiVOiNXQNN63yAq7xS49jxqs704OyuTXXgDW7ba/+BoEqRFehtyMK0fV7vy1lHs I9aMmoBwGrRXOwjWrc2Wre9nGnKFEW/NPlq6ANoAG2lxUidvA== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id beaa1be9 for ; Mon, 26 Dec 2022 04:28:47 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 8ff937d7 for ; Mon, 26 Dec 2022 04:28:47 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 7a51dbd6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 26 Dec 2022 04:28:41 +0100 (CET) Date: Sun, 25 Dec 2022 21:27:38 -0600 Message-Id: <20221226032737.31606-1-jgart@dismail.de> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=78.46.223.134; envelope-from=jgart@dismail.de; helo=mx1.dismail.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches From: jgart via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672025354; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=XeqKrFcj3NO7l8xw5ZltEnWPrwl8OykuLorngScUSeU=; b=ijgdUuZ47OB/kgtKru00dLcGkZyP78jab9UgpOuIZrWl9SfBrSLwzZZIZHI6v/cBKJaWxO LVPMFhoEqy79xl2B8YNQqaAhVqaaAAvUksFWyxlw/Y+Kii89IPIeOrsYeAme84wwgkZ6R3 g9r/S4bqtgfHw+xshsqiaRLKnlUbtzl+G/yfW8Zoeb2+Rmox15/9SqtmaNfK0XJ7f4NaCa imidy8yLzZ4fe5JD8S2t8OxET8ZJII3/NyUOZLmNha1+RWdOczaHipkkR8iM0ReViFIJN8 1KRCO2D7nO7Bv18S6uFtayZzoV+HF4I/BvnHDjCtPoe+XpO7WhtlHl7ZfwVavw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=CI731hVe; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672025354; a=rsa-sha256; cv=none; b=lRWgl6UP8Qn//PBj2A4HzhGQ6sK4uarPTTBtMEqj/ghrAfDTcBHxReboHpc+xkFfZ7yzUD 3e/yQG5R/g9+pbJpr4Vk3OuOQmgIN4eXiCLYiZL7J0aItELUc0OtySin9CNnIKcOtcNNz6 HmpgS+vrnFc0HqmJPz/RT7SlFNTgSekWhbW5SFPBdiljEK/MSoPe99sBiKgQqZRPrlXyxn JGI8OjQ5B2TPnGKBLVikxnRMPLZDi0ltO8micOmmB6Sak6inFA53y5oPT2CQR3ZjwFHWUc mPJAyVj7UcDGTSB1fquvOh/nJewNQQpUB2HNUbh5MeSYfymjyDJoIzjA+mDoAA== X-Spam-Score: -3.82 X-Migadu-Queue-Id: 5728D1D951 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=CI731hVe; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.82 X-TUID: OzxaNcIMo0jo * 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 hi, this is a wip. Any code review much appreciated! --- gnu/packages/music.scm | 68 ++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5be767a138..63e9732613 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -49,6 +49,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Wamm K. D. ;;; Copyright © 2022 Jose G Perez Taveras +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -96,6 +97,7 @@ (define-module (gnu packages music) #:use-module (gnu packages backup) #:use-module (gnu packages base) ;libbdf #:use-module (gnu packages bash) + #:use-module (gnu packages bdw-gc) #:use-module (gnu packages benchmark) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -1385,7 +1387,7 @@ (define-public ninjas2 (define-public lilypond (package (name "lilypond") - (version "2.20.0") + (version "2.24.0") (source (origin (method url-fetch) @@ -1393,60 +1395,32 @@ (define-public lilypond "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) @@ -1458,7 +1432,9 @@ (define-public lilypond ("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) -- 2.38.1