From patchwork Wed Apr 12 16:16:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 49107 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 2F87A174E8; Wed, 12 Apr 2023 17:17:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 F2BA017497 for ; Wed, 12 Apr 2023 17:17:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmd9g-0002K3-IP; Wed, 12 Apr 2023 12:17:08 -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 1pmd9c-0002Io-0X for guix-patches@gnu.org; Wed, 12 Apr 2023 12:17:04 -0400 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 1pmd9a-0002jP-O2 for guix-patches@gnu.org; Wed, 12 Apr 2023 12:17:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmd9a-0000cn-It for guix-patches@gnu.org; Wed, 12 Apr 2023 12:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62797] [PATCH] gnu: rrdtool: Update to 1.8.0. Resent-From: Aleksandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Apr 2023 16:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62797 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62797@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16813161952336 (code B ref -1); Wed, 12 Apr 2023 16:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Apr 2023 16:16:35 +0000 Received: from localhost ([127.0.0.1]:41541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmd99-0000bc-AN for submit@debbugs.gnu.org; Wed, 12 Apr 2023 12:16:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:58772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmd95-0000bJ-9V for submit@debbugs.gnu.org; Wed, 12 Apr 2023 12:16:34 -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 1pmd94-0002G4-LS for guix-patches@gnu.org; Wed, 12 Apr 2023 12:16:30 -0400 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmd92-0002eW-4c for guix-patches@gnu.org; Wed, 12 Apr 2023 12:16:30 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id CF46324046A for ; Wed, 12 Apr 2023 18:16:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.org; s=2017; t=1681316184; bh=UltXBZTnHPqZV1tt77N7eI7HlD3uHb98qGMtCfM5unU=; h=From:To:Subject:Date:From; b=iFBbYVDchTQIkfQqhqgfB7hgyiqrkYsxX43SfbP/0oM+5R0siDsNsCs7lc439UhvU /NUwx+Sv5Mhr7K6oxEUlzQNBgaNqa0dF5pR8byryZwcPTN8FhBdNinDMJelnzBr7A0 OiKDEr339j8fQLYRcyvMTvUG6DhnFtRKZx5D+Zpc1YCrtGcov4pW015MGvEtV15VKj H/Iip7xdiC0EWPF4rqz0BueezgyEjXXoqF0Q3zSuyUrgGl/hb+D/Bg0ceV5+V2N3Bb hJsHjXWjtpCJvh02Q3ZlFuaSKoCys8++Kje0gzOviEfVf1UgRh5jot5ZLIHgg6X4pf rs6DqgW266ejA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4PxSWX1274z6tsg for ; Wed, 12 Apr 2023 18:16:23 +0200 (CEST) From: Aleksandr Vityazev Date: Wed, 12 Apr 2023 16:16:19 +0000 Message-ID: <875ya1kre4.fsf@posteo.org> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=avityazev@posteo.org; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, 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: , 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/rrdtool.scm (rrdtool): Update to 1.8.0. [source]: Change uri, github is the primary distribution point; [inputs]: Use new style; [arguments]: Use gexps, remove 'pre-configure phase. Add (guix gexp) to #:use-modules. --- gnu/packages/rrdtool.scm | 59 +++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/gnu/packages/rrdtool.scm b/gnu/packages/rrdtool.scm index 1fb642216d..ca11eac8bd 100644 --- a/gnu/packages/rrdtool.scm +++ b/gnu/packages/rrdtool.scm @@ -31,29 +31,31 @@ (define-module (gnu packages rrdtool) #:use-module (gnu packages xml) #:use-module (guix build-system gnu) #:use-module (guix download) + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) (define-public rrdtool (package (name "rrdtool") - (version "1.7.2") + (version "1.8.0") (source (origin (method url-fetch) - (uri (string-append "http://oss.oetiker.ch/rrdtool/pub/rrdtool-" + (uri (string-append "https://github.com/oetiker/rrdtool-1.x/" + "archive/refs/tags/v" version ".tar.gz")) (sha256 (base32 - "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1")))) + "1k2r0n6xvw3bqqn17kvqca0pby9s0gy5k149mz8wzl31a5j9m9c8")))) (build-system gnu-build-system) (inputs - `(("cairo" ,cairo) - ("freetype" ,freetype) - ("glib" ,glib) - ("gtk" ,gtk+-2) - ("libxml2" ,libxml2) - ("pango" ,pango) - ("python" ,python))) + (list cairo + freetype + glib + gtk+-2 + libxml2 + pango + python)) (native-inputs (list groff pkg-config @@ -62,27 +64,22 @@ (define-public rrdtool perl ; will also build Perl bindings tzdata-for-tests)) (arguments - `(#:disallowed-references (,tzdata-for-tests) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'pre-configure - (lambda _ - (substitute* "libtool" - (("/bin/sed") (which "sed"))) - #t)) - (add-before 'check 'prepare-test-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")))) - (add-after 'install 'remove-native-input-references - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (examples (string-append out "/share/rrdtool/examples"))) - ;; Drop shebangs from examples to avoid depending on native-input - ;; perl. It's clear from context and extension how to run them. - (substitute* (find-files examples "\\.pl$") - (("^#!.*") "")) - #t)))))) + (list + #:disallowed-references (list (gexp-input tzdata-for-tests)) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'prepare-test-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TZDIR" + (search-input-directory inputs "share/zoneinfo")))) + (add-after 'install 'remove-native-input-references + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (examples (string-append out "/share/rrdtool/examples"))) + ;; Drop shebangs from examples to avoid depending on native-input + ;; perl. It's clear from context and extension how to run them. + (substitute* (find-files examples "\\.pl$") + (("^#!.*") "")))))))) (home-page "https://oss.oetiker.ch/rrdtool/") (synopsis "Time-series data storage and display system") (description