[bug#31340] [PATCH] gnu: gnuplot: Update to 2.2.2

[bug#31340] [PATCH] gnu: gnuplot: Update to 2.2.2

[Adam Massmann]

[-- Attachment #1: Type: text/plain, Size: 141 bytes --]

Hello,

Attached below is a patch to update gnuplot to the current stable
version 2.2.2. Thanks a lot for all the work on Guix!

Best,
Adam


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-gnuplot-Update-to-2.2.2.patch --]
[-- Type: text/x-diff, Size: 1626 bytes --]

From d55155d8c5fae8d2396c68ccbc182a8dd565be56 Mon Sep 17 00:00:00 2001
From: Adam Massmann <massmannak@gmail.com>
Date: Tue, 1 May 2018 23:25:43 -0400
Subject: [PATCH] gnu: gnuplot: Update to 2.2.2

---
 gnu/packages/maths.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 00f35659e..5664b73c3 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -562,7 +562,7 @@ singular value problems.")
 (define-public gnuplot
   (package
     (name "gnuplot")
-    (version "5.0.6")
+    (version "5.2.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
@@ -570,7 +570,7 @@ singular value problems.")
                                   version ".tar.gz"))
        (sha256
         (base32
-         "0q5lr6nala3ln6f3yp6g17ziymb9r9gx9zylnw1y3hjmwl9lggjv"))))
+         "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4"))))
     (build-system gnu-build-system)
     (inputs `(("readline" ,readline)
               ("cairo" ,cairo)
@@ -580,6 +580,9 @@ singular value problems.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("texlive" ,texlive-tiny)))
+    (arguments `(#:configure-flags (list (string-append
+                                          "--with-texdir=" %output
+                                          "/texmf-local/tex/latex/gnuplot"))))
     (home-page "http://www.gnuplot.info")
     (synopsis "Command-line driven graphing utility")
     (description "Gnuplot is a portable command-line driven graphing
-- 
2.11.0

[bug#31340] [PATCH] gnu: gnuplot: Update to 2.2.2

[Adam Massmann]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

Apologies,

A typo in the commit of the previous patch propagated into the
email. This is an update to the stable branch *5.2.2*, not
2.2.2. Sorry for the confusion. A corrected patch with the correct
commit message is below.

Best,
Adam


[-- Attachment #2: 0001-gnu-gnuplot-Update-to-5.2.2.patch --]
[-- Type: text/x-diff, Size: 1999 bytes --]

From ee1052631f2cdde60a2abc005c3de39b1f826cf3 Mon Sep 17 00:00:00 2001
From: Adam Massmann <massmannak@gmail.com>
Date: Tue, 1 May 2018 23:49:40 -0400
Subject: [PATCH] gnu: gnuplot: Update to 5.2.2

---
 gnu/packages/maths.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 00f35659e..d80dd2fd7 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
 ;;; Copyright © 2018 Nadya Voronova <voronovank@gmail.com>
+;;; Copyright © 2018 Adam Massmann <massmannak@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -562,7 +563,7 @@ singular value problems.")
 (define-public gnuplot
   (package
     (name "gnuplot")
-    (version "5.0.6")
+    (version "5.2.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/"
@@ -570,7 +571,7 @@ singular value problems.")
                                   version ".tar.gz"))
        (sha256
         (base32
-         "0q5lr6nala3ln6f3yp6g17ziymb9r9gx9zylnw1y3hjmwl9lggjv"))))
+         "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4"))))
     (build-system gnu-build-system)
     (inputs `(("readline" ,readline)
               ("cairo" ,cairo)
@@ -580,6 +581,9 @@ singular value problems.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("texlive" ,texlive-tiny)))
+    (arguments `(#:configure-flags (list (string-append
+                                          "--with-texdir=" %output
+                                          "/texmf-local/tex/latex/gnuplot"))))
     (home-page "http://www.gnuplot.info")
     (synopsis "Command-line driven graphing utility")
     (description "Gnuplot is a portable command-line driven graphing
-- 
2.11.0

bug#31340: [PATCH] gnu: gnuplot: Update to 2.2.2

[Ludovic Courtès]

Hello Adam,

Adam Massmann <massmannak@gmail.com> skribis:

> From ee1052631f2cdde60a2abc005c3de39b1f826cf3 Mon Sep 17 00:00:00 2001
> From: Adam Massmann <massmannak@gmail.com>
> Date: Tue, 1 May 2018 23:49:40 -0400
> Subject: [PATCH] gnu: gnuplot: Update to 5.2.2
>
> ---
>  gnu/packages/maths.scm | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

I adjusted the commit log to match our convention and pushed it:

  https://git.savannah.gnu.org/cgit/guix.git/commit/?id=07254d8b229011efaed7b3f8e02bfa34f1a30ffd

Thank you & welcome!

Ludo’.