From fcbd2f886a1e54090ed5ad9e3f26a52bc39d68ad Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann.dupont@univ-nantes.fr>
Date: Tue, 30 Nov 2021 16:19:40 +0100
Subject: [PATCH] introduce new openblas

---
 glicid/packages/glicid.scm | 40 --------------------------------------
 glicid/packages/maths.scm  | 30 +++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm
index e0e7f88..1a1f4b0 100644
--- a/glicid/packages/glicid.scm
+++ b/glicid/packages/glicid.scm
@@ -301,46 +301,6 @@
 ;
 
 
-(define-public glicid-specific-openblas
-  (package
-    (inherit openblas)
-    (name "glicid-specific-openblas")
-      (inputs `(
-       ("fortran-lib",gfortran-11 "lib")
-      ,@(package-inputs openblas)))
-      (native-inputs `(
-       ("gcc", gcc-11)
-       ("fortran" ,gfortran-11)
-     ,@(package-native-inputs openblas)))
-  )
-)
-
-(define-public glicid-vspecific-openblas
-  (package
-    (inherit openblas)
-    (name "glicid-vspecific-openblas")
-    (version "0.3.15")
-    (source
-     (origin
-     (method url-fetch)
-     (uri (string-append "https://github.com/xianyi/OpenBLAS/releases/download/v" version "/OpenBLAS-" version ".tar.gz" ))
-;       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h"))))
-
-    (name "glicid-specific-openblas")
-      (inputs `(
-       ("fortran-lib",gfortran-11 "lib")
-      ,@(package-inputs openblas)))
-      (native-inputs `(
-       ("gcc", gcc-11)
-       ("fortran" ,gfortran-11)
-     ,@(package-native-inputs openblas)))
-  )
-)
-
-
 (define-public glicid-motif
   (package
     (name "glicid-motif")
diff --git a/glicid/packages/maths.scm b/glicid/packages/maths.scm
index a361664..4d96f6f 100644
--- a/glicid/packages/maths.scm
+++ b/glicid/packages/maths.scm
@@ -57,6 +57,34 @@
 
 (define-public scalapack-latest scalapack-newer)
 
+(define-public openblas-newer-0.3.15
+  (package
+    (inherit openblas)
+    (name "openblas-newer")
+    (version "0.3.15")
+    (source
+     (origin
+     (method url-fetch)
+     (uri (string-append "https://github.com/xianyi/OpenBLAS/releases/download/v" version "/OpenBLAS-" version ".tar.gz" ))
+;       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h"))))
+
+   ; (name "glicid-specific-openblas")
+   ;   (inputs `(
+   ;    ("fortran-lib",gfortran-11 "lib")
+   ;   ,@(package-inputs openblas)))
+   ;   (native-inputs `(
+   ;    ("gcc", gcc-11)
+   ;    ("fortran" ,gfortran-11)
+   ;  ,@(package-native-inputs openblas)))
+  )
+)
+
+
+
 ;; scalapack-scivision-newer
-scalapack-newer
+;;scalapack-newer
 ;;; glicid/maths.scm ends here
+