From 7c53675c7f75c93eb41d36e7e599ccc9e78415ee Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann@objoo.org>
Date: Mon, 25 Oct 2021 20:51:36 +0200
Subject: [PATCH] packages simplification

---
 glicid/packages/linux.scm | 67 ++++++---------------------------------
 1 file changed, 9 insertions(+), 58 deletions(-)

diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm
index c9f181c..8f6a199 100644
--- a/glicid/packages/linux.scm
+++ b/glicid/packages/linux.scm
@@ -99,7 +99,7 @@
 (package
     (inherit rdma-core)
     (name "glicid-rdma-core")
-    (version "31.0")
+    (version "37.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/linux-rdma/rdma-core"
@@ -114,80 +114,31 @@
 
 (define-public glicid-rdma-core-gcc-11
 (package
-    (inherit rdma-core)
+    (inherit glicid-rdma-core)
     (name "glicid-rdma-core-gcc-11")
-    (version "32.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/linux-rdma/rdma-core"
-                                  "/releases/download/v" version "/rdma-core-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1z1i741bcn9vchmkjs8nxj0c0bw0jr53zj74l839n2wrb45f55w1"))))
     (inputs `(("gcc-11", gcc-11)
       ,@(package-inputs rdma-core)))
  )
 )
 
-(define-public glicid-specific-rdma-core-gcc-11
-  (package
-    (inherit rdma-core)
-    (name "glicid-specific-rdma-core-gcc-11")
-    (version "36.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/linux-rdma/rdma-core"
-                                  "/releases/download/v" version "/rdma-core-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-;;                 "1s4b80jzdi2m6j5aix3mxl6iafgbqp88pfxy7568zxwc8rkcz71x"
-		   "13ccvy3qv5b87g3b5q86gjv4wkgv86dlm9xbmii5aiy3i10ym48l"
-))))
-      (inputs `(("gcc", gcc-11)
-      ,@(package-inputs rdma-core)))
 
+(define-public glicid-libfabric
+(package
+    (inherit libfabric)
+    (name "glicid-libfabric")
+    (version "1.13.1")
  )
 )
 
 
 (define-public glicid-libfabric-gcc-11
 (package
-    (inherit libfabric)
+    (inherit glicid-libfabric)
     (name "glicid-libfabric-gcc-11")
-    (version "1.11.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "https://github.com/ofiwg/libfabric/releases/download/v"
-                       version "/libfabric-" version ".tar.bz2"))
-       (sha256
-        (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz"))))
 
     (inputs `(("gcc-11", gcc-11)
-      ,@(package-inputs libfabric)))
- )
-)
-
-(define-public glicid-specific-libfabric-gcc-11
-(package
-    (inherit libfabric)
-    (name "glicid-specific-libfabric-gcc-11")
-    (version "1.12.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "https://github.com/ofiwg/libfabric/releases/download/v"
-                       version "/libfabric-" version ".tar.bz2"))
-       (sha256
-        (base32 "0b34p88w399jabdf77jpskxyv2j60nwxlsj3lyk9svjy9458wg6v"))))
-
-    (inputs `(("gcc", gcc-11)
       ("rdma-core", glicid-specific-rdma-core-gcc-11)
-      ,@(package-inputs libfabric)))
+      ,@(package-inputs glicid-libfabric)))
  )
 )