From patchwork Mon Nov 20 17:33:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 56668 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BFFBB27BBEA; Mon, 20 Nov 2023 17:35:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 22DB627BBE2 for ; Mon, 20 Nov 2023 17:35:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r58Ap-0005a0-3h; Mon, 20 Nov 2023 12:35:03 -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 1r58Am-0005Zk-37 for guix-patches@gnu.org; Mon, 20 Nov 2023 12:35:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r58Al-0002Fb-RP for guix-patches@gnu.org; Mon, 20 Nov 2023 12:34:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r58An-0000ew-W2 for guix-patches@gnu.org; Mon, 20 Nov 2023 12:35:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67110] [PATCH v2] gnu: mympd: Update to 13.0.5. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Nov 2023 17:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67110 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67110@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 67110-submit@debbugs.gnu.org id=B67110.17005016572449 (code B ref 67110); Mon, 20 Nov 2023 17:35:01 +0000 Received: (at 67110) by debbugs.gnu.org; 20 Nov 2023 17:34:17 +0000 Received: from localhost ([127.0.0.1]:54423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r58A5-0000dQ-1r for submit@debbugs.gnu.org; Mon, 20 Nov 2023 12:34:17 -0500 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:32922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r58A0-0000dF-T8 for 67110@debbugs.gnu.org; Mon, 20 Nov 2023 12:34:15 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 3097D20550 for <67110@debbugs.gnu.org>; Mon, 20 Nov 2023 18:34:08 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 94A4C80097; Mon, 20 Nov 2023 18:34:08 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 7XJSD29hVWwk; Mon, 20 Nov 2023 18:34:08 +0100 (CET) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 0D22980095; Mon, 20 Nov 2023 18:34:07 +0100 (CET) From: Bruno Victal Date: Mon, 20 Nov 2023 17:33:08 +0000 Message-ID: <6fef32a0128bdd36b2f4a18234f98a17e3e73cb5.1700501588.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mpd.scm (mympd): Update to 13.0.5. [native-inputs]: Add jekyll. [outputs]: Add 'doc. [arguments]<#:configure-flags>: Install HTML documentation. Set correct value for localstatedir. <#:phases>: Add 'move-doc. Change-Id: I0f1ab4295b7bc03876ad1bbeff6154b4da6adc9a --- gnu/packages/mpd.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) base-commit: c07a5f050f67fa9054e93479cdda2f298c567460 diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 0e762144a1..e59397ea3a 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -57,6 +57,7 @@ (define-module (gnu packages mpd) #:use-module (gnu packages libusb) #:use-module (gnu packages lua) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) @@ -622,7 +623,7 @@ (define-public mpdevil (define-public mympd (package (name "mympd") - (version "12.1.1") + (version "13.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -631,22 +632,29 @@ (define-public mympd (file-name (git-file-name name version)) (sha256 (base32 - "1bal31xmdmq46bi0qmia07sqcwy695vcz5y5hxwkz71rcfywbsf9")))) + "1ly3iw4irybfxyafgrldldwc28a879wwnd1pg32m2sgrwyhr0czm")))) + (outputs '("out" "doc")) (build-system cmake-build-system) (arguments (list #:configure-flags - #~(list "-DMYMPD_BUILD_TESTING=ON" - ;; Handled by 'strip' phase. - "-DMYMPD_STRIP_BINARY=OFF") + #~(list "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" + "-DMYMPD_BUILD_TESTING=ON" + "-DMYMPD_DOC_HTML=ON") #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? ;; The following test requires network connectivity. - (invoke "ctest" "--exclude-regex" "test_http_client"))))))) - (native-inputs (list jq perl pkg-config)) + (invoke "ctest" "--exclude-regex" "test_http_client")))) + (add-after 'install 'move-doc + (lambda _ + (let ((old (string-append #$output "/share/doc")) + (new (string-append #$output:doc "/share/doc"))) + (mkdir-p (dirname new)) + (rename-file old new))))))) + (native-inputs (list jekyll jq perl pkg-config)) (inputs (list flac libid3tag lua openssl pcre2)) (home-page "https://jcorporation.github.io/") (synopsis "Web-based MPD client")