rename packages

glicid/packages/benchmark.scm

@@ -16,7 +16,7 @@
 (define-public intel-mpi-benchmarks/openmpi-2021.3
   (package
     (inherit gnu:intel-mpi-benchmarks/openmpi)
-    (name "intel-mpi-benchmarks-newer")
+    (name "intel-mpi-benchmarks-upstream")
     (version "2021.3")
     (source 
       (origin

glicid/packages/fabric-management.scm

@@ -6,10 +6,10 @@
 
 )
 
-(define-public ucx-newer-1.11.2
+(define-public ucx-upstream-1.11.2
   (package
     (inherit gnu:ucx)
-    (name (string-append (package-name gnu:ucx) "-newer" ))
+    (name (string-append (package-name gnu:ucx) "-upstream" ))
     (version "1.11.2")
     (source 
       (origin
@@ -21,10 +21,10 @@
   )
 )
 
-(define-public ucx-newer-1.11.2
+(define-public ucx-upstream-1.11.2
   (package
     (inherit gnu:ucx)
-    (name (string-append (package-name gnu:ucx) "-newer" ))
+    (name (string-append (package-name gnu:ucx) "-upstream" ))
     (version "1.11.2")
     (source 
       (origin
@@ -36,10 +36,10 @@
   )
 )
 
-(define-public ucx-newer-1.12.0
+(define-public ucx-upstream-1.12.0
   (package
     (inherit gnu:ucx)
-    (name (string-append (package-name gnu:ucx) "-newer" ))
+    (name (string-append (package-name gnu:ucx) "-upstream" ))
     (version "1.12.0")
     (source 
       (origin
@@ -51,5 +51,5 @@
   )
 )
 
-(define local-ucx ucx-newer-1.12.0)
+(define local-ucx ucx-upstream-1.12.0)
 (define-public ucx-latest (latest-version local-ucx gnu:ucx))

glicid/packages/linux.scm

@@ -16,10 +16,10 @@
   #:use-module (glicid utils)
 )
 
-(define-public rdma-core-newer-37.1
+(define-public rdma-core-upstream-37.1
   (package
     (inherit gnu:rdma-core)
-    (name (string-append (package-name gnu:rdma-core) "-newer" ))
+    (name (string-append (package-name gnu:rdma-core) "-upstream" ))
     (version "37.1")
     (source
       (origin
@@ -31,10 +31,10 @@
   )
 )
 
-(define-public rdma-core-newer-38.0
+(define-public rdma-core-upstream-38.0
   (package
     (inherit gnu:rdma-core)
-    (name (string-append (package-name gnu:rdma-core) "-newer" ))
+    (name (string-append (package-name gnu:rdma-core) "-upstream" ))
     (version "38.0")
     (source
       (origin
@@ -46,10 +46,10 @@
   )
 )
 
-(define-public rdma-core-newer-39.0
+(define-public rdma-core-upstream-39.0
   (package
     (inherit gnu:rdma-core)
-    (name (string-append (package-name gnu:rdma-core) "-newer" ))
+    (name (string-append (package-name gnu:rdma-core) "-upstream" ))
     (version "39.0")
     (source
       (origin
@@ -61,15 +61,15 @@
   )
 )
 
-(define local-rdma-core rdma-core-newer-39.0)
+(define local-rdma-core rdma-core-upstream-39.0)
 
 (define-public rdma-core-latest (latest-version local-rdma-core gnu:rdma-core))
 
-(define-public libfabric-newer-1.13.1
+(define-public libfabric-upstream-1.13.1
   (package
     (inherit gnu:libfabric)
     (version "1.13.1")
-    (name (string-append (package-name gnu:libfabric) "-newer" ))
+    (name (string-append (package-name gnu:libfabric) "-upstream" ))
     (source
       (origin
         (method url-fetch)
@@ -80,11 +80,11 @@
   )
 )
 
-(define-public libfabric-newer-1.14.0
+(define-public libfabric-upstream-1.14.0
   (package
     (inherit gnu:libfabric)
     (version "1.14.0")
-    (name (string-append (package-name gnu:libfabric) "-newer" ))
+    (name (string-append (package-name gnu:libfabric) "-upstream" ))
     (source
       (origin
         (method url-fetch)
@@ -95,7 +95,7 @@
   )
 )
 
-(define local-libfabric libfabric-newer-1.14.0)
+(define local-libfabric libfabric-upstream-1.14.0)
 
 (define-public libfabric-latest (latest-version local-libfabric gnu:libfabric))
 

glicid/packages/maths.scm

@@ -1,18 +1,19 @@
 (define-module (glicid packages maths)
   #:use-module (guix packages)
   #:use-module (guix utils)
-  #:use-module (gnu packages maths)
+  #:use-module ((gnu packages maths) #:prefix gnu:)
   #:use-module (gnu packages commencement)
   #:use-module (gnu packages mpi)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (gnu packages)
+  #:use-module (glicid utils)
 )
 
-(define-public scalapack-newer
+(define-public scalapack-upstream
   (package
-    (inherit scalapack) 
+    (inherit gnu:scalapack) 
-    (name "scalapack-newer")
+    (name "scalapack-upstream")
     (version "2.1.0-new-upstream")
     (source
       (origin
@@ -39,13 +40,13 @@
     )
   )
 )
+(define local:scalapack scalapack-upstream)
+(define-public scalapack-latest (latest-version local:scalapack gnu:scalapack))
 
-(define-public scalapack-latest scalapack-newer)
+(define-public openblas-upstream-0.3.15
-
-(define-public openblas-newer-0.3.15
   (package
-    (inherit openblas)
+    (inherit gnu:openblas)
-    (name "openblas-newer")
+    (name "openblas-upstream")
     (version "0.3.15")
     (source
       (origin
@@ -56,3 +57,8 @@
     )
   )
 )
+
+
+(define local:openblas openblas-upstream-0.3.15)
+(define-public scalapack-latest (latest-version local:openblas gnu:openblas))
+