Merge branch 'devel' into 'main'

bump rdma-core

See merge request glicid-public/guix-glicid!170

glicid/packages/linux.scm

@@ -21,11 +21,11 @@
   #:use-module (glicid packages golang)
   #:use-module (glicid utils))
 
-(define-public rdma-core-upstream-37.1
+(define-public rdma-core-upstream-44.0
   (package
     (inherit gnu:rdma-core)
     (name (string-append (package-name gnu:rdma-core) "-upstream"))
-    (version "37.1")
+    (version "44.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -33,68 +33,19 @@
                     version "/rdma-core-" version ".tar.gz"))
               (sha256
                (base32
-                "1hjwagf5x48vgshy5s01qjlzjr8kmxpflfcvh8pgj3zbj82zzxiz"))))))
+                "12w5v74wz1akac09frw7qk1yd06b00239zh7bvbvqyzjc0g61mi5"))))))
 
-(define-public rdma-core-upstream-38.0
+(define local-rdma-core
-  (package
+  rdma-core-upstream-44.0)
-    (inherit gnu:rdma-core)
-    (name (string-append (package-name gnu:rdma-core) "-upstream"))
-    (version "38.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
-                "043vybwx9kz4mbbmnj0jzkzsw02vzhkkjc5j3yjdiiqkmsgwr3cs"))))))
 
-(define-public rdma-core-upstream-39.0
+(define-public rdma-core-latest
-  (package
+  (latest-version local-rdma-core gnu:rdma-core))
-    (inherit gnu:rdma-core)
-    (name (string-append (package-name gnu:rdma-core) "-upstream"))
-    (version "39.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
-                "0y13px3qgyh3szywjhikw183y54iym9sa60aw0sf51p3kzgg1spn"))))))
 
-(define-public rdma-core-upstream-41.0
-  (package
-    (inherit gnu:rdma-core)
-    (name (string-append (package-name gnu:rdma-core) "-upstream"))
-    (version "41.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
-                "0yshfxm9i9fi51mmnxbbv39hqlrc34jzmq6gl2b9f8hzlywdxdz0"))))))
 
-(define-public rdma-core-upstream-42.0
-  (package
-    (inherit gnu:rdma-core)
-    (name (string-append (package-name gnu:rdma-core) "-upstream"))
-    (version "42.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
-                "03kclikv4k6rpsj6il131jjbnxyvdaiprc3wkmxn471crxsa9f9y"))))))
 
 (define-public rdma-core-upstream-42.1
   (package
-    (inherit gnu:rdma-core)
+    (inherit local-rdma-core)
-    (name (string-append (package-name gnu:rdma-core) "-upstream"))
     (version "42.1")
     (source (origin
               (method url-fetch)
@@ -105,11 +56,6 @@
                (base32
                 "02xjksnm71aak215f9262c2qbs77n4yc856ra6dlcfblciqk1cxp"))))))
 
-(define local-rdma-core
-  rdma-core-upstream-42.1)
-
-(define-public rdma-core-latest
-  (latest-version local-rdma-core gnu:rdma-core))
 
 (define-public libfabric-upstream-1.17.0
   (package
@@ -139,7 +85,6 @@
   (package
     (inherit local-libfabric)
     (version "1.16.1")
-    (name (string-append (package-name gnu:libfabric) "-upstream"))
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -149,21 +94,6 @@
                (base32
                 "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak"))))))
 
-(define-public psm2-upstream-11.2.228
-  (package
-    (inherit gnu:psm2)
-    (name "psm2-upstream")
-    (version "11.2.228")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/cornelisnetworks/opa-psm2")
-                    (commit (string-append "PSM2_" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz"))))))
-
 (define-public psm2-upstream-11.2.230
   (package
     (inherit gnu:psm2)
@@ -185,6 +115,21 @@
 (define-public psm2-latest
   (latest-version local-psm2 gnu:psm2))
 
+(define-public psm2-upstream-11.2.228
+  (package
+    (inherit local-psm2)
+    (version "11.2.228")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/cornelisnetworks/opa-psm2")
+                    (commit (string-append "PSM2_" version))))
+              (file-name (git-file-name "local-psm2" version))
+              (sha256
+               (base32
+                "1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz"))))))
+
+
 (define-public corefreq
   (package
     (inherit gnu:corefreq)