From 2e2fed3babd6501fb22b7d580c0cf1d03be54508 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann@objoo.org>
Date: Mon, 22 Nov 2021 23:24:52 +0100
Subject: [PATCH] new versions and derivations

---
 glicid/packages/fabric-management.scm |  5 ++-
 glicid/packages/linux.scm             | 54 +++++++++++++++++++--------
 glicid/packages/mpi.scm               |  6 ++-
 3 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm
index 9cd7245..ac1a51e 100644
--- a/glicid/packages/fabric-management.scm
+++ b/glicid/packages/fabric-management.scm
@@ -112,9 +112,10 @@
  )
 )
 
-(define local:ucx ucx-1.11.2)
+(define local-ucx ucx-1.11.2)
 
-(define-public ucx-latest (latest-version local:ucx gnu:ucx))
+;; not working right now ;; (define-public ucx-latest (latest-version local-ucx gnu:ucx))
+(define-public ucx-latest local-ucx) ;; for now…
 
 (define-public ucx-glicid
  (package 
diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm
index 8187b35..078dfbf 100644
--- a/glicid/packages/linux.scm
+++ b/glicid/packages/linux.scm
@@ -91,7 +91,7 @@
   #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages virtualization)
   #:use-module (glicid packages gcc)
-
+  #:use-module (glicid utils)
 )
 
 
@@ -126,14 +126,27 @@
 )
 
 
-(define-public rdma-core rdma-core-38.0)
+(define local-rdma-core rdma-core-38.0)
+(define-public rdma-core-latest local-rdma-core)
 
-(define-public glicid-rdma-core-gcc-11
- (package
-    (inherit rdma-core)
-    (name "glicid-rdma-core-gcc-11")
-    (inputs `(("gcc-11", gcc-11)
-      ,@(package-inputs rdma-core)))
+
+(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-11
+ (package 
+  (inherit rdma-core-transform-gcc-11)
+  (version (string-append (package-version rdma-core-transform-gcc-11) "-gcc-11" ))
  )
 )
 
@@ -170,18 +183,27 @@
  )
 )
 
-(define-public libfabric libfabric-1.14.0)
+(define local-libfabric libfabric-1.14.0)
+(define-public libfabric-latest local-libfabric)
 
-(define-public glicid-libfabric-gcc-11
- (package
-    (inherit libfabric)
-    (name "glicid-libfabric-gcc-11")
+(define libfabric-transform-gcc-10
+ (gcc10-instead-of-gcc libfabric-latest))
 
-    (inputs `(("gcc-11", gcc-11)
-      ("rdma-core", glicid-rdma-core-gcc-11)
-      ,@(package-inputs libfabric)))
+(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-11
+ (package 
+  (inherit libfabric-transform-gcc-11)
+  (version (string-append (package-version libfabric-transform-gcc-11) "-gcc-11" ))
+ )
+)
 
 ;;; glicid/linux.scm ends here
diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm
index 08b8f66..3a28545 100644
--- a/glicid/packages/mpi.scm
+++ b/glicid/packages/mpi.scm
@@ -97,16 +97,18 @@
 
 )
 
+(define latest-openmpi gnu:openmpi)
+
 (define-public openmpi-glicid
  (package 
   (inherit gnu:openmpi)
-  (version (string-append (package-version gnu:openmpi) "-glicid" ))
+  (version (string-append (package-version latest-openmpi) "-glicid" ))
  
  (inputs `(
             ("ucx",ucx)
             ("rdma-core",rdma-core)
             ("libfabric",libfabric) 
-                  ,@(package-inputs gnu:openmpi)))
+                  ,@(package-inputs latest-openmpi)))
  )
 )