From 885fe927e7648e6a7349acff163c0015bc3ab732 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 17 Dec 2020 21:45:54 +0200
Subject: gnu: glpk: Update to 5.0.

* gnu/packages/maths.scm (glpk): Update to 5.0.
(glpk-4.65): New variable.
* gnu/packages/algebra.scm (giac)[inputs]: Replace glpk with glpk-4.
---
 gnu/packages/algebra.scm |  2 +-
 gnu/packages/maths.scm   | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index f82c839ed3..d60f53a7f9 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -410,7 +410,7 @@ (define-public giac
     (inputs
      ;; TODO: Add libnauty, unbundle "libmicropython.a".
      `(("fltk" ,fltk)
-       ("glpk" ,glpk)
+       ("glpk" ,glpk-4)
        ("gmp" ,gmp)
        ("gsl" ,gsl)
        ("lapack" ,lapack)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c118e9e25c..794111afc4 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -562,7 +562,7 @@ (define-public sleef
 (define-public glpk
   (package
     (name "glpk")
-    (version "4.65")
+    (version "5.0")
     (source
      (origin
       (method url-fetch)
@@ -570,7 +570,7 @@ (define-public glpk
                           version ".tar.gz"))
       (sha256
        (base32
-        "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"))))
+        "05bgxidxj8d9xdp82niy7cy36w181cxq7p8vc3y2ixshpgp1642a"))))
     (build-system gnu-build-system)
     (inputs
      `(("gmp" ,gmp)))
@@ -586,6 +586,20 @@ (define-public glpk
 LP/MIP solver is included in the package.")
     (license license:gpl3+)))
 
+(define-public glpk-4
+  (package
+    (inherit glpk)
+    (name "glpk")
+    (version "4.65")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/glpk/glpk-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"))))))
+
 (define-public 4ti2
   (package
     (name "4ti2")
-- 
cgit v1.2.3