From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: gnuplot update Date: Fri, 22 Jul 2016 15:43:24 +0300 Message-ID: <20160722124324.GB3727@debian-netbook> References: <20160722123352.GA3727@debian-netbook> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="uxuisgdDHaNETlh8" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQZnk-0002FF-Sl for guix-devel@gnu.org; Fri, 22 Jul 2016 08:43:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQZnf-0006rz-Lg for guix-devel@gnu.org; Fri, 22 Jul 2016 08:43:35 -0400 Received: from flashner.co.il ([178.62.234.194]:52563) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQZnf-0006rD-Af for guix-devel@gnu.org; Fri, 22 Jul 2016 08:43:31 -0400 Received: from localhost (85.65.166.137.dynamic.barak-online.net [85.65.166.137]) by flashner.co.il (Postfix) with ESMTPSA id E74A1401A5 for ; Fri, 22 Jul 2016 12:43:25 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20160722123352.GA3727@debian-netbook> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --uxuisgdDHaNETlh8 Content-Type: multipart/mixed; boundary="vOmOzSkFvhd7u8Ms" Content-Disposition: inline --vOmOzSkFvhd7u8Ms Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Ignore the previous patch, here's the real one to update it. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --vOmOzSkFvhd7u8Ms Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-gnuplot-Update-to-upstream-s-re-release-of-5.0.4.patch" Content-Transfer-Encoding: quoted-printable =46rom 2f2d8925c57da87a3e6c6fa697e58e0fe5a2b14f Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Fri, 22 Jul 2016 15:27:16 +0300 Subject: [PATCH] gnu: gnuplot: Update to upstream's re-release of 5.0.4. * gnu/packages/maths.scm (gnuplot): Add a guix revision number to the version scheme of gnuplot to force an update. --- gnu/packages/maths.scm | 55 +++++++++++++++++++++++++++-------------------= ---- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ef84986..ad7d0e2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -380,35 +380,40 @@ singular value problems.") "See LICENSE in the distribution.")))) =20 (define-public gnuplot - (package - (name "gnuplot") - (version "5.0.4") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" - version "/gnuplot-" version ".tar.gz")) - (sha256 - (base32 - "08vpmhl85l48xcccx8jrkamalih2d6z9ppqpsppwii9y2l1p3297")))) - (build-system gnu-build-system) - (inputs `(("readline" ,readline) - ("cairo" ,cairo) - ("pango" ,pango) - ("gd" ,gd))) - (native-inputs `(("pkg-config" ,pkg-config) - ("texlive" ,texlive-minimal))) - (home-page "http://www.gnuplot.info") - (synopsis "Command-line driven graphing utility") - (description "Gnuplot is a portable command-line driven graphing + ;; Gnuplot version 5.0.4 was updated in-place, resulting in a hash misma= tch. + ;; This can be removed at the next version update. + (let ((upstream-version "5.0.4") + (guix-revision "1")) + (package + (name "gnuplot") + (version (string-append upstream-version "-" guix-revision)) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" + upstream-version "/gnuplot-" + upstream-version ".tar.gz")) + (sha256 + (base32 + "07n3w12dkcxjnhsvsliaqnkhajhi818v6q8mkpmpbplbf92vh70m")))) + (build-system gnu-build-system) + (inputs `(("readline" ,readline) + ("cairo" ,cairo) + ("pango" ,pango) + ("gd" ,gd))) + (native-inputs `(("pkg-config" ,pkg-config) + ("texlive" ,texlive-minimal))) + (home-page "http://www.gnuplot.info") + (synopsis "Command-line driven graphing utility") + (description "Gnuplot is a portable command-line driven graphing utility. It was originally created to allow scientists and students to visualize mathematical functions and data interactively, but has grown to support many non-interactive uses such as web scripting. It is also used = as a plotting engine by third-party applications like Octave.") - ;; X11 Style with the additional restriction that derived works may o= nly be - ;; distributed as patches to the original. - (license (license:fsf-free - "http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyrigh= t")))) + ;; X11 Style with the additional restriction that derived works may= only be + ;; distributed as patches to the original. + (license (license:fsf-free + "http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyri= ght"))))) =20 (define-public hdf5 (package --=20 2.9.1 --vOmOzSkFvhd7u8Ms-- --uxuisgdDHaNETlh8 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXkhTsAAoJEPTB05F+rO6TtfMQAJiNzKU6hrDzBgLhhRtzLuid Cqh5me1TV9vF3c3Nx6/7JGuVmkwzHwpzFkH9xZUk77PMbsTlqXgiUhoALynqstDq l5gNmv6jNB5hZHu7jUoujO/HW2COAzIiGlVljUCt+cuHnCQnJZhCUoTqgFo6x1Ni E1025KiMdH0LWOsxczzKjEvKp+m8pdt0BPGw7jCB73LF/2E/Ohoz2+cSx7mOZIUY VTtwjkMKQQHNEYz1r5Yq5AVKmqFCT5VLMdQqPePL6aJk8vHwvhg3IQYeP0D+Gvhw FHKHFCNC4GZCzG0Rw8KLt1EtSo6ai2y4mMFLvYH1HNirtric5J0UyMX/Pl2vccgP tIphqm/m5qf3QDvpOr7PXVN5HLHs6m3/K9O/c90fLJfki6e1vwzrH+T7+awfUpTa LlJJ/O+ZO/A/MCVM8lOv9aBh00bTOxQInkvq3NT1REogCZEpNzKkGDels7ytsjE7 zKPm6MIafQGXdCMB6gXAT+u9fY3mbIWzwzdpHFAzHSyK59Exu/8+7nulse/UJlgH 6Y7iwJlGpA5Xw/YJIUiOJ/+IC79YKIUhkO8HUON3rwjiBVuEhm+0k3stf5LLsQPB 43i0bxZdIADzk1w1P6hPvltbkrWE3h0u2+qeSq3RYKzZsffp3l9ETXKo2yYAZ9dq O0SfElZgryyOUlAKTG6J =2XKZ -----END PGP SIGNATURE----- --uxuisgdDHaNETlh8--