From 99f470ef8fdf1c4162662cb83555484113b39173 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann.dupont@univ-nantes.fr>
Date: Mon, 29 Nov 2021 09:06:20 +0100
Subject: [PATCH] new names to avoid confusion

---
 glicid/packages/fabric-management.scm | 21 ++++++------
 glicid/packages/linux.scm             | 49 +++++++++++++++------------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm
index f50f571..9a8ac46 100644
--- a/glicid/packages/fabric-management.scm
+++ b/glicid/packages/fabric-management.scm
@@ -97,9 +97,10 @@
 )
 
 
-(define-public ucx-1.11.2
+(define-public ucx-newer-1.11.2
  (package
   (inherit gnu:ucx)
+  (name (string-append (package-name gnu:ucx) "-newer" ))
   (version "1.11.2")
   (source 
    (origin
@@ -112,7 +113,7 @@
  )
 )
 
-(define local-ucx ucx-1.11.2)
+(define local-ucx ucx-newer-1.11.2)
 
 ;; not working right now ;; (define-public ucx-latest (latest-version local-ucx gnu:ucx))
 (define-public ucx-latest local-ucx) ;; for now…
@@ -130,18 +131,18 @@
   )
  )
 
-(define ucx-glicid-transform-gcc-10
- (gcc10-instead-of-gcc ucx-glicid))
+;(define ucx-glicid-transform-gcc-10
+; (gcc10-instead-of-gcc ucx-glicid))
 
 (define ucx-glicid-transform-gcc-11 
  (gcc11-instead-of-gcc ucx-glicid))
 
-(define-public ucx-glicid-gcc-10
- (package 
-  (inherit ucx-glicid-transform-gcc-10)
-  (version (string-append (package-version ucx-glicid-transform-gcc-10) "-gcc-10" ))
- )
-)
+;(define-public ucx-glicid-gcc-10
+; (package 
+;  (inherit ucx-glicid-transform-gcc-10)
+;  (version (string-append (package-version ucx-glicid-transform-gcc-10) "-gcc-10" ))
+; )
+;)
 
 (define-public ucx-glicid-gcc-11
  (package 
diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm
index 078dfbf..08af2f5 100644
--- a/glicid/packages/linux.scm
+++ b/glicid/packages/linux.scm
@@ -95,9 +95,10 @@
 )
 
 
-(define-public rdma-core-37.1
+(define-public rdma-core-newer-37.1
 (package
     (inherit gnu:rdma-core)
+    (name (string-append (package-name gnu:rdma-core) "-newer" ))
     (version "37.1")
     (source (origin
               (method url-fetch)
@@ -110,9 +111,10 @@
  )
 )
 
-(define-public rdma-core-38.0
+(define-public rdma-core-newer-38.0
  (package
     (inherit gnu:rdma-core)
+    (name (string-append (package-name gnu:rdma-core) "-newer" ))
     (version "38.0")
     (source (origin
               (method url-fetch)
@@ -126,22 +128,22 @@
 )
 
 
-(define local-rdma-core rdma-core-38.0)
+(define local-rdma-core rdma-core-newer-38.0)
 (define-public rdma-core-latest local-rdma-core)
 
 
-(define rdma-core-transform-gcc-10
- (gcc10-instead-of-gcc rdma-core-latest))
+;(define rdma-core-transform-gcc-10
+; (gcc10-instead-of-gcc rdma-core-latest))
 
 (define rdma-core-transform-gcc-11 
  (gcc11-instead-of-gcc rdma-core-latest))
 
-(define-public rdma-core-gcc-10
- (package 
-  (inherit rdma-core-transform-gcc-10)
-  (version (string-append (package-version rdma-core-transform-gcc-10) "-gcc-10" ))
- )
-)
+;(define-public rdma-core-gcc-10
+; (package 
+;  (inherit rdma-core-transform-gcc-10)
+;  (version (string-append (package-version rdma-core-transform-gcc-10) "-gcc-10" ))
+; )
+;)
 
 (define-public rdma-core-gcc-11
  (package 
@@ -151,10 +153,12 @@
 )
 
 
-(define-public libfabric-1.13.1
+(define-public libfabric-newer-1.13.1
  (package
     (inherit gnu:libfabric)
     (version "1.13.1")
+    (name (string-append (package-name gnu:libfabric) "-newer" ))
+
     (source
      (origin
        (method url-fetch)
@@ -167,10 +171,11 @@
  )
 )
 
-(define-public libfabric-1.14.0
+(define-public libfabric-newer-1.14.0
  (package
     (inherit gnu:libfabric)
     (version "1.14.0")
+    (name (string-append (package-name gnu:libfabric) "-newer" ))
     (source
      (origin
        (method url-fetch)
@@ -183,21 +188,21 @@
  )
 )
 
-(define local-libfabric libfabric-1.14.0)
+(define local-libfabric libfabric-newer-1.14.0)
 (define-public libfabric-latest local-libfabric)
 
-(define libfabric-transform-gcc-10
- (gcc10-instead-of-gcc libfabric-latest))
+;(define libfabric-transform-gcc-10
+; (gcc10-instead-of-gcc libfabric-latest))
 
 (define libfabric-transform-gcc-11 
  (gcc11-instead-of-gcc libfabric-latest))
 
-(define-public libfabric-gcc-10
- (package 
-  (inherit libfabric-transform-gcc-10)
-  (version (string-append (package-version libfabric-transform-gcc-10) "-gcc-10" ))
- )
-)
+;(define-public libfabric-gcc-10
+; (package 
+;  (inherit libfabric-transform-gcc-10)
+;  (version (string-append (package-version libfabric-transform-gcc-10) "-gcc-10" ))
+; )
+;)
 
 (define-public libfabric-gcc-11
  (package