From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 09 12:26:48 2024 Received: (at submit) by debbugs.gnu.org; 9 Jun 2024 16:26:48 +0000 Received: from localhost ([127.0.0.1]:47634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sGLNY-0005BS-19 for submit@debbugs.gnu.org; Sun, 09 Jun 2024 12:26:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:35490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sGLNV-0005BG-Mw for submit@debbugs.gnu.org; Sun, 09 Jun 2024 12:26:46 -0400 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 1sGLNE-0005H2-Vj for guix-patches@gnu.org; Sun, 09 Jun 2024 12:26:29 -0400 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sGLN9-000487-UJ for guix-patches@gnu.org; Sun, 09 Jun 2024 12:26:28 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8485440F2D; Sun, 9 Jun 2024 18:26:20 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8XgkKabxWyO0; Sun, 9 Jun 2024 18:26:19 +0200 (CEST) From: kiasoc5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1717950379; bh=2MrfHAvw3BPDS09XaHfmNCprbBwugchXDyraBmZF6/o=; h=From:To:Cc:Subject:Date; b=e+sr+X9b8DVaNDIhnNetl36IMlVSQDgNll07U3mAppesnxAABc5OYWgw+OgXuqfZk qxDzOVCALoihCJATbVEZOsmyK0Id4OlNexDnua4cyfOzIsevcBXpOcjGx12M9A+USk xr9yT1qfJtirPeUcvyKy0r7QTpE6Tfj0nfDAY1CkBMLsptcOFO0m3kHfcY+z1ew20Y ALTnJU4piJtICJ1O5VRqd1SLzbd+mIMI5pMUQ3At/swXU/HBHTf055lsn7vod6TurC oXpl1AqFz6CssuqLnB8npmPt3kwrB0vXeYTZDL+zC5Y8MWOqV43dWueUQzmmf82WyR MR2wycFZzMvMQ== To: guix-patches@gnu.org Subject: [PATCH] gnu: multitail: Update to 7.1.2. Date: Sun, 9 Jun 2024 12:25:33 -0400 Message-ID: <99145451167baec2d4b3d2c61bf44455260ef152.1717950332.git.kiasoc5@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=kiasoc5@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: kiasoc5 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * gnu/packages/logging.scm (multitail): Update to 7.1.2. [source]: Update upstream repository location. [arguments]: Use G-expressions. Change-Id: I2136e73553cc8189a9ed0a84db61a0167873e843 --- gnu/packages/logging.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index a757c22154..9f503a7c11 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -167,24 +167,25 @@ (define-public tailon (define-public multitail (package (name "multitail") - (version "6.5.2") + (version "7.1.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/halturin/multitail") + (url "https://github.com/folkertvanheusden/multitail") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "17hg5qpangyx4m7hp2x4h56mp6w3wsaslg1il39qcpwsffh1rihc")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" (assoc-ref %outputs "out")) - "SYSCONFDIR=$(PREFIX)/etc") + (list + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + "SYSCONFDIR=$(PREFIX)/etc") #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'unpack 'fix-broken-build ;; With some luck, you might be able to remove this when updating… (lambda _ @@ -196,7 +197,7 @@ (define-public multitail "\t$(INSTALL_DIR) $(DESTDIR)$(SYSCONFDIR)\n"))) (substitute* "version" (("(VERSION=).*" _ assign) - (string-append assign ,version))))) + (string-append assign #$version))))) (add-after 'unpack 'patch-curses-headers (lambda _ (substitute* "mt.h" base-commit: 580d77d0fb12448ef1621699cc0c56e787e2aadb -- 2.45.1