Merge branch 'devel' into 'main'

Devel

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

glicid/packages/linux.scm

@@ -165,9 +165,32 @@
   )
 )
 
+(define-public libfabric-upstream-1.16.0
+  (package
+    (inherit gnu:libfabric)
+    (version "1.16.0")
+    (name (string-append (package-name gnu:libfabric) "-upstream" ))
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2"))
+        (sha256 (base32 "1lk7abv919bc24ak0yr509bdh8dn83sf6ab326kbvs1wdsfln45c"))
+      )
+    )
+;    (inputs `( ("util-linux:lib", util-linux "lib") ;; uuid.h, numa.h
+;               ("numactl", gnu:numactl)
+;  ,@(package-inputs gnu:libfabric)))
+  )
+)
+
+   
+
+
 
 (define local-libfabric libfabric-upstream-1.15.1)
 
+
+
 (define-public libfabric-latest (latest-version local-libfabric gnu:libfabric))
 
 (define-public psm2-upstream-11.2.228
@@ -313,4 +336,4 @@
 ;)
 ;
 ;local-libfabric
-psm2-upstream-11.2.228
+psm2-upstream-11.2.228

glicid/packages/networking.scm

@@ -25,17 +25,16 @@
   )
 )
 
-
 (define-public squid
   (package
     (inherit gnu:squid)
     (name "squid")
-    (version "5.5")
+    (version "5.7")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "http://www.squid-cache.org/Versions/v5/squid-" version ".tar.xz"))
-        (sha256 (base32 "0v0h949l4wd1hl87a8wkk1fkvj8j44wifyxi9myxdgbnci6lh7af"))
+        (sha256 (base32 "10fdgrdiycphs8ciyn1q5p6dcyngmr614rry6gylx72cpam561vb"))
       )
     )
     (inputs
@@ -63,6 +62,21 @@
   )
 )
 
+(define-public squid-5.5
+  (package
+    (inherit squid)
+    (name "squid")
+    (version "5.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "http://www.squid-cache.org/Versions/v5/squid-" version ".tar.xz"))
+        (sha256 (base32 "0v0h949l4wd1hl87a8wkk1fkvj8j44wifyxi9myxdgbnci6lh7af"))
+      )
+    )
+  )
+)
+
 (define-public openvswitch-2.17
   (package
     (inherit gnu:openvswitch)