formatting

glicid/packages/algebra.scm

@@ -1,10 +1,8 @@
 (define-module (glicid packages algebra)
   #:use-module (guix download)
   #:use-module (guix packages)
-  #:use-module (guix utils)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages commencement)
-  #:use-module (gnu packages mpi)
 )
 
 (define-public fftw-openmpi-with-fortran

glicid/packages/gcc.scm

@@ -1,73 +1,12 @@
 (define-module (glicid packages gcc)
-#:use-module (guix build-system cmake)
+;  #:use-module (guix build-system cmake)
-#:use-module (guix build-system gnu)
+  #:use-module (guix build-system gnu)
-#:use-module (guix build-system python)
+;  #:use-module (guix build-system python)
-#:use-module (guix download)
+  #:use-module (guix packages)
-#:use-module (guix git-download)
+  #:use-module (guix utils)
-#:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages commencement)
-#:use-module (guix packages)
+  #:use-module (gnu packages gcc)
-#:use-module (guix utils)
+  #:use-module (srfi srfi-1)
-#:use-module ((guix utils) #:select (target-64bit?))
-#:use-module (gnu packages)
-#:use-module (gnu packages admin)
-#:use-module (gnu packages assembly)
-#:use-module (gnu packages authentication)
-#:use-module (gnu packages autotools)
-#:use-module (gnu packages base)
-#:use-module (gnu packages bdw-gc)
-#:use-module (gnu packages benchmark)
-#:use-module (gnu packages bison)
-#:use-module (gnu packages boost)
-#:use-module (gnu packages chemistry)
-#:use-module (gnu packages cluster)
-#:use-module (gnu packages cmake)
-#:use-module (gnu packages commencement)
-#:use-module (gnu packages compression)
-#:use-module (gnu packages crypto)
-#:use-module (gnu packages cryptsetup)
-#:use-module (gnu packages curl)
-#:use-module (gnu packages databases)
-#:use-module (gnu packages disk)
-#:use-module (gnu packages fabric-management)
-#:use-module (gnu packages flex)
-#:use-module (gnu packages fontutils)
-#:use-module (gnu packages freeipmi)
-#:use-module (gnu packages gawk)
-#:use-module (gnu packages gcc)
-#:use-module (gnu packages gnome)
-#:use-module (gnu packages gperf)
-#:use-module (gnu packages gtk)
-#:use-module (gnu packages image)
-#:use-module (gnu packages jemalloc)
-#:use-module (gnu packages libevent)
-#:use-module (gnu packages linux)
-#:use-module (gnu packages lua)
-#:use-module (gnu packages maths)
-#:use-module (gnu packages messaging)
-#:use-module (gnu packages mpi)
-#:use-module (gnu packages ncurses)
-#:use-module (gnu packages networking)
-#:use-module (gnu packages nss)
-#:use-module (gnu packages openldap)
-#:use-module (gnu packages parallel)
-#:use-module (gnu packages perl)
-#:use-module (gnu packages pkg-config)
-#:use-module (gnu packages pretty-print)
-#:use-module (gnu packages python)
-#:use-module (gnu packages python-science)
-#:use-module (gnu packages python-web)
-#:use-module (gnu packages python-xyz)
-#:use-module (gnu packages readline)
-#:use-module (gnu packages sphinx)
-#:use-module (gnu packages sssd)
-#:use-module (gnu packages storage)
-#:use-module (gnu packages tcl)
-#:use-module (gnu packages tls)
-#:use-module (gnu packages virtualization)
-#:use-module (gnu packages web)
-#:use-module (gnu packages xml)
-#:use-module (gnu packages xorg)
-#:use-module (srfi srfi-1)
 )
 
 (define*

glicid/packages/linux.scm

@@ -5,18 +5,17 @@
 )
 
 (define-public rdma-core-newer-37.1
-(package
+  (package
     (inherit gnu:rdma-core)
     (name (string-append (package-name gnu:rdma-core) "-newer" ))
     (version "37.1")
-    (source (origin
+    (source
+      (origin
         (method url-fetch)
-              (uri (string-append "https://github.com/linux-rdma/rdma-core"
+        (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz"))
-                                  "/releases/download/v" version "/rdma-core-"
+        (sha256 (base32 "1hjwagf5x48vgshy5s01qjlzjr8kmxpflfcvh8pgj3zbj82zzxiz"))
-                                  version ".tar.gz"))
+      )
-              (sha256
+    )
-               (base32
-                "1hjwagf5x48vgshy5s01qjlzjr8kmxpflfcvh8pgj3zbj82zzxiz"))))
   )
 )
 
@@ -25,38 +24,32 @@
     (inherit gnu:rdma-core)
     (name (string-append (package-name gnu:rdma-core) "-newer" ))
     (version "38.0")
-    (source (origin
+    (source
+      (origin
         (method url-fetch)
-              (uri (string-append "https://github.com/linux-rdma/rdma-core"
+        (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz"))
-                                  "/releases/download/v" version "/rdma-core-"
+        (sha256 (base32 "043vybwx9kz4mbbmnj0jzkzsw02vzhkkjc5j3yjdiiqkmsgwr3cs"))
-                                  version ".tar.gz"))
+      )
-              (sha256
+    )
-               (base32
-                "043vybwx9kz4mbbmnj0jzkzsw02vzhkkjc5j3yjdiiqkmsgwr3cs"))))
   )
 )
 
-
 (define local-rdma-core rdma-core-newer-38.0)
+
 (define-public rdma-core-latest local-rdma-core)
 
-
-
 (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)
-       (uri
+        (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2"))
-        (string-append "https://github.com/ofiwg/libfabric/releases/download/v"
+        (sha256 (base32 "03nkhqjjyw3hwhxrn7rg30qc1gzc1r7p7lymyz5s96m3qhwfsvlf"))
-                       version "/libfabric-" version ".tar.bz2"))
+      )
-       (sha256
+    )
-        (base32 "03nkhqjjyw3hwhxrn7rg30qc1gzc1r7p7lymyz5s96m3qhwfsvlf"))))
-
   )
 )
 
@@ -68,16 +61,13 @@
     (source
       (origin
         (method url-fetch)
-       (uri
+        (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2"))
-        (string-append "https://github.com/ofiwg/libfabric/releases/download/v"
+        (sha256 (base32 "16klkzkg04wb699mqpi8mn2r8sqzj35zalynbdazyg4ghj4169pw"))
-                       version "/libfabric-" version ".tar.bz2"))
+      )
-       (sha256
+    )
-        (base32 "16klkzkg04wb699mqpi8mn2r8sqzj35zalynbdazyg4ghj4169pw"))))
-
   )
 )
 
 (define local-libfabric libfabric-newer-1.14.0)
-(define-public libfabric-latest local-libfabric)
 
-;;; glicid/linux.scm ends here
+(define-public libfabric-latest local-libfabric)

glicid/packages/maths.scm

@@ -9,51 +9,36 @@
   #:use-module (gnu packages)
 )
 
-;;;;;;;;
-
-;(define-public scalapack-scivision-newer
-
 (define-public scalapack-newer
-
   (package
     (inherit scalapack) 
     (name "scalapack-newer")
-;    (version "2.1.0.29-upstream") ;; need this for compilation > gcc 9
     (version "2.1.0-new-upstream")
-    (source (origin
+    (source
+      (origin
         (method git-fetch)
-              (uri (git-reference
+        (uri
-;              (url "https://github.com/scivision/scalapack.git")
+          (git-reference
-;               (url "https://github.com/OpenCMISS-Dependencies/newscalapack.git")
             (url "https://oauth2:9i-PgbC2w_JEx6DUUqzf@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/scalapack.git")
-
-;              (commit "dac3cb9eaad9593a2cc7478f5f4ed63437b0993d")
-;	       (commit "f27386ce4d1b4dc99f7bc5917031ef9dc2c00a72")
-; univ	       (commit "9a4c4d7608ab7ac11e526746082a1ffacc2cd365")
             (commit "myv2.0.2")
           )
-)
+        )
         (file-name "scalapack-univ-myv2")
         (patches (search-patches "scalapack-blacs-mpi-deprecations.patch"))
-
+        (sha256 (base32 "1ccic46psf2hl9wsyflvkn5rxg8k17q578m9mzimvm9brbggf0na" ))
-             (sha256
-              (base32
-; univ               "1fp3av7cqb4asfw3ynq4s9kbqgrb7k0lhizzd5isz6xfmrwl1ps6"
-;		     "1cf2mrv9w7zkhwj6q22l1mn2ryfhr8zqgjajfkixr57nqfq2x0k2" ;scivision 
-		     "1ccic46psf2hl9wsyflvkn5rxg8k17q578m9mzimvm9brbggf0na"
       )
     )
-))
-    
-
     (arguments
       `(#:configure-flags `("-DBUILD_SHARED_LIBS:BOOL=YES")
         #:phases (modify-phases %standard-phases
           (add-before 'check 'mpi-setup
-                    ,%openmpi-setup))))
+            ,%openmpi-setup
-
           )
         )
+       )
+    )
+  )
+)
 
 (define-public scalapack-latest scalapack-newer)
 
@@ -66,25 +51,8 @@
       (origin
         (method url-fetch)
         (uri (string-append "https://github.com/xianyi/OpenBLAS/releases/download/v" version "/OpenBLAS-" version ".tar.gz" ))
-;       (file-name (string-append name "-" version ".tar.gz"))
+        (sha256 (base32 "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h"))
-       (sha256
+      )
-        (base32
+    )
-         "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h"))))
-
-   ; (name "glicid-specific-openblas")
-   ;   (inputs `(
-   ;    ("fortran-lib",gfortran-11 "lib")
-   ;   ,@(package-inputs openblas)))
-   ;   (native-inputs `(
-   ;    ("gcc", gcc-11)
-   ;    ("fortran" ,gfortran-11)
-   ;  ,@(package-native-inputs openblas)))
   )
 )
-
-
-
-;; scalapack-scivision-newer
-;;scalapack-newer
-;;; glicid/maths.scm ends here
-

glicid/packages/mpi.scm

@@ -6,62 +6,72 @@
   #:use-module (glicid packages fabric-management)
   #:use-module (glicid utils)
   #:use-module (glicid packages parallel)
-
 )
 
 (define openmpi-latest gnu:openmpi)
 
-
-(define (transform-package original-package suffix)
- (package
-  (inherit original-package)
-  (name (string-append (package-name original-package) "-" suffix ))
- )
-)
-
-
-(define (instead-of package-a-spec package-b) 
- (package-input-rewriting/spec `(
-                                  (,package-a-spec . ,(const package-b)
-                                  ) 
-				;  #:deep? #t
-                                 )
-  )
-)
-
-
 (define-public openmpi-glicid
   (transform-package
-  ((instead-of "slurm" slurm-glicid) openmpi-latest) "glicid"))
+    (
+      (instead-of "slurm" slurm-glicid) openmpi-latest
+    ) "glicid"
+  )
+)
 
 (define-public openmpi-glicid-libfabric
   (transform-package
-  ((instead-of "libfabric" libfabric-latest) openmpi-glicid) "libfabric"))
+    (
+      (instead-of "libfabric" libfabric-latest)
+      openmpi-glicid
+    ) "libfabric"
+  )
+)
 
 (define-public openmpi-glicid-rdma
   (transform-package
-  ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid) "rdma-core"))
+    (
+      (instead-of "rdma-core" rdma-core-latest)
+      openmpi-glicid
+    ) "rdma-core"
+  )
+)
 
 (define-public openmpi-glicid-ucx
   (transform-package
-  ((instead-of "ucx" ucx-latest) openmpi-glicid) "ucx"))
+    (
+      (instead-of "ucx" ucx-latest) openmpi-glicid
+    ) "ucx"
+  )
+)
 
 (define-public openmpi-glicid-libfabric-rdma
   (transform-package
-  ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid-libfabric) "rdma"))
+    (
+      (instead-of "rdma-core" rdma-core-latest)
+      openmpi-glicid-libfabric
+    ) "rdma"
+  )
+)
 
 (define-public openmpi-glicid-libfabric-ucx
   (transform-package
-  ((instead-of "ucx" ucx-latest) openmpi-glicid-libfabric) "ucx"))
+    (
+      (instead-of "ucx" ucx-latest)
+      openmpi-glicid-libfabric
+    ) "ucx"
+  )
+)
 
 (define-public openmpi-glicid-libfabric-rdma-ucx
   (transform-package
-  ((instead-of "ucx" ucx-latest) openmpi-glicid-libfabric-rdma) "ucx"))
+    (
+      (instead-of "ucx" ucx-latest)
+      openmpi-glicid-libfabric-rdma
+    ) "ucx"
+  )
+)
 
-
+(define openmpi-glicid-transform-gcc-11 (gcc11-instead-of-gcc openmpi-glicid))
-
-(define openmpi-glicid-transform-gcc-11
- (gcc11-instead-of-gcc openmpi-glicid))
 
 (define-public openmpi-glicid-gcc-11
   (package
@@ -69,7 +79,3 @@
     (name (string-append (package-name openmpi-glicid-transform-gcc-11) "-gcc-11" ))
   )
 )
-
-
-;;; end
-

glicid/packages/nfs.scm

@@ -4,127 +4,30 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
-;  #:use-module (guix licenses)
-  #:use-module (gnu packages gawk)
-  #:use-module (gnu packages gcc)
-  #:use-module (gnu packages commencement)
-  #:use-module (guix build-system python)
   #:use-module ((guix licenses) #:prefix license:)
-  #:use-module ((guix utils) #:select (target-64bit?))
-  #:use-module (gnu packages)
-  #:use-module (gnu packages admin)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages freeipmi)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages mpi)
   #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages shells)
-  #:use-module (gnu packages parallel)
-  #:use-module (gnu packages storage)
-  #:use-module (gnu packages networking)
-  #:use-module (gnu packages gtk)  
   #:use-module (gnu packages python)
-  #:use-module (gnu packages python-science)
+  #:use-module (gnu packages kerberos)
-  #:use-module (gnu packages python-web)
+  #:use-module (gnu packages gsasl)
-  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages readline)
+  #:use-module (gnu packages onc-rpc)
-  #:use-module (gnu packages tcl)
-  #:use-module (gnu packages tls)
-  #:use-module (gnu packages commencement)
-  #:use-module (gnu packages gcc)
-  #:use-module (gnu packages chemistry)
-  #:use-module (gnu packages sphinx)
-  #:use-module (srfi srfi-1)
-  #:use-module (gnu packages mpi)
-  #:use-module (gnu packages sssd)
-  #:use-module (gnu packages fabric-management)
-  #:use-module (gnu packages benchmark)
-  #:use-module (gnu packages messaging)
-  #:use-module (gnu packages web)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages cluster)  
-  #:use-module (gnu packages libevent)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages bison)
-  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages datastructures)
-  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages file-systems)
-  #:use-module (gnu packages fontutils)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages maths)     
-  #:use-module (guix utils)
-  #:use-module (gnu packages cmake)
-  #:use-module  (gnu packages pretty-print)
-  #:use-module (gnu packages boost)
-  #:use-module (gnu packages curl)
-  #:use-module (gnu packages cryptsetup)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages admin)
-  #:use-module (gnu packages assembly)
-  #:use-module (gnu packages authentication)
-  #:use-module (gnu packages bdw-gc)
-  #:use-module (gnu packages boost) 
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages crypto)
-  #:use-module (gnu packages cryptsetup)
-  #:use-module (gnu packages curl)
-  #:use-module (gnu packages databases)
-  #:use-module (gnu packages disk)
-  #:use-module (gnu packages gperf)
-  #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages lua)     
+  #:use-module (gnu packages jemalloc)
-  #:use-module (gnu packages ncurses) 
+  #:use-module (gnu packages storage)
-  #:use-module (gnu packages networking)
-  #:use-module (gnu packages nss)
-  #:use-module (gnu packages openldap)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages sphinx)
-  #:use-module (gnu packages tls)   
-  #:use-module (gnu packages web)   
-;;  #:use-module (gnu packages glicid)
-  #:use-module (gnu packages pretty-print)
-  #:use-module (gnu packages virtualization)
   #:use-module (glicid packages storage)
-  #:use-module (glicid packages mpi)
-  #:use-module (glicid packages gcc)
-#:use-module (gnu packages image)
-#:use-module (gnu packages perl)
-#:use-module (gnu packages shells)
-#:use-module (gnu packages python)
-#:use-module (gnu packages kerberos)
-#:use-module (gnu packages gsasl)
-#:use-module (gnu packages jemalloc)
-#:use-module (gnu packages storage)
-#:use-module (gnu packages file-systems)
-#:use-module (gnu packages datastructures)
-#:use-module (gnu packages bison)
-#:use-module (gnu packages flex)
-#:use-module (gnu packages onc-rpc)
-  
 )
 
-
-;; https://github.com/nfs-ganesha/nfs-ganesha/archive/refs/tags/V3.5.tar.gz
-
 (define-public nfs-ganesha
   (package
     (name "nfs-ganesha")
     (version "3.5")
-    (source (origin
+    (source
-;              (method url-fetch)
+      (origin
-;               (uri (string-append
-;                "https://github.com/nfs-ganesha/nfs-ganesha/archive/refs/tags/V" version ".tar.gz"))
-;
-;
-;              (sha256 (base32 "0545c6snmx66vpa427ij21md81vi5xa2v77428i4pq6fk6mgm06r"))
-;             )
-;    )
         (method git-fetch)
         (uri
           (git-reference
@@ -135,82 +38,40 @@
         )
         (sha256 (base32 "0rdg3mjqrr4a8mywxkfis25gkbn4fylw42hg1d9cvp4dwrjk3hl4"))
         (file-name (string-append name "-" version "-checkout"))
-  
       )
-)
+    )
     (build-system cmake-build-system)
-     (arguments
+    (arguments `(
-      `(
+      #:configure-flags (list
-;;	#:validate-runpath? #f ;; we should know why
+        (string-append "-DLIB_INSTALL_DIR=" (assoc-ref %outputs "out") "/lib" )
-        #:configure-flags
-        (list ;; Defaults to "lib64" on 64-bit archs.
-             (string-append 
-                ;             "-DCMAKE_INSTALL_LIBDIR="
-                ;            (assoc-ref %outputs "out") "/lib" 
-
-			      "-DLIB_INSTALL_DIR="
-                              (assoc-ref %outputs "out") "/lib"
-
-		;	     "-DCMAKE_INSTALL_RPATH="
-                ;            (assoc-ref %outputs "out")
-                ;             "/lib:"
-                ;            (assoc-ref %outputs "out")
-                ;             "/lib64"
       )
+      #:phases (modify-phases %standard-phases
+        (add-after 'unpack 'chdir (
+          lambda _ (chdir "src")
+          #t
+        )) 
       )
-
+    ))
-         #:phases
+    (inputs `(
-        (modify-phases %standard-phases
-           (add-after 'unpack 'chdir (lambda _ (chdir "src") #t)
-
-
-         ) 
-        )
-       )
-      )
-
-;    (native-search-paths
-;     (list
-;           (search-path-specification
-;            (variable "LIBRARY_PATH")
-;            (files '("lib" "lib64"))
-;           )
-;     )
-;    )
-
-    (inputs
-      `(
       ("perl", perl)
-        ("oksh",oksh)
+      ("oksh", oksh)
-        ("python-3",python-3)
+      ("python-3", python-3)
-        ("mit-krb5",mit-krb5)
+      ("mit-krb5", mit-krb5)
-        ("gss",gss)
+      ("gss", gss)
-        ("pkg-config",pkg-config)
+      ("pkg-config", pkg-config)
-        ("jemalloc",jemalloc)
+      ("jemalloc", jemalloc)
-        ("ceph:lib",ceph "lib") ;; will use latest gnu or glicid ceph
+      ("ceph:lib", ceph "lib")
-        ("libnfsidmap",libnfsidmap)
+      ("libnfsidmap", libnfsidmap)
-        ("libnfs",libnfs)
+      ("libnfs", libnfs)
-;        ("xfsprogs",xfsprogs)
+      ("liburcu", liburcu)
-        ("liburcu",liburcu)
+      ("bison", bison)
-        ("bison",bison)
+      ("flex", flex)
-        ("flex",flex)
+      ("libnsl", libnsl)
-        ("libnsl",libnsl)
+      ("util-linux", util-linux "lib")
-        ("util-linux" ,util-linux "lib") ;; uuid.h
+    ))
-
+    (synopsis "nfs-ganesha")
-       )
+    (description "NFS-Ganesha.")
-    )
-
-;; placeholders
-
-(synopsis "nfs-ganesha")
-    (description
-     "NFS-Ganesha.
- bla.")
     (home-page "https://")
-    (license license:gpl3+))
+    (license license:gpl3+)
-;)
+  )
-
-; )
-;)
 )
-;;; glicid/nfs.scm ends here

glicid/packages/parallel.scm

@@ -10,7 +10,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages mpi)
-  #:use-module (gnu packages haskell-xyz) ; for pandoc
+  #:use-module (gnu packages haskell-xyz)
 )
 
 (define-public openpmix-3.1.5
@@ -28,20 +28,19 @@
     (arguments
       `(#:configure-flags
         (list
-           (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc") )
+          (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc"))
         )
        )
     )
     (synopsis "MPIX lib")
-  (description  "MPIX. More to come. FIXIT")
+    (description"MPIX. More to come. FIXIT")
     (home-page "https://www.gnu.org/software/hello/")
     (license license:gpl3+)
     (inputs `(
       ("libevent", libevent)
       ("hwloc" ,hwloc-2 "lib")
       ("perl", perl)
-           )
+    ))
-  )
   )
 )
 
@@ -59,61 +58,14 @@
     (inputs `(
       ("python", python)
       ("zlib", zlib)
-            ("pandoc", pandoc) ; not mandatory
+      ("pandoc", pandoc)
       ,@(package-inputs openpmix-3.1.5)
-           )
+    ))
-  )              
   )
 )
 
 (define-public openpmix openpmix-4.1.0)
 
-
-;(define-public slurm-19.05-glicid
-; (package 
-;  (inherit slurm) 
-;  (name "slurm-glicid")
-;  (version "19.05.6")
-;  (source 
-;   (origin
-;    (method url-fetch)
-;    (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))
-;    (sha256 (base32 "1kj79r8hng5gp98ickgvj3im4gr19nzd3p3p8g6rl75axb8jin7h"))
-;   ))
-;   (arguments
-;   `(#:configure-flags
-;     (list "--enable-pam" "--sysconfdir=/etc/slurm"
-;            "--disable-static"
-;            (string-append "--with-freeipmi=" (assoc-ref %build-inputs "freeipmi"))
-;            (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc"))
-;            (string-append "--with-json=" (assoc-ref %build-inputs "json-c"))
-;            (string-append "--with-munge=" (assoc-ref %build-inputs "munge"))
-;;            (string-append "--with-pmix=" (assoc-ref %build-inputs "openpmix"))
-;
-;            ;; 32-bit support is marked as deprecated and needs to be
-;            ;; explicitly enabled.
-;            ;;;; ,@(if (target-64bit?) '() '("--enable-deprecated"))
-;      
-;     )
-;    )
-;  )
-;
-;   (inputs `(("gtk+-2" ,gtk+-2)
-;;             ("gcc", gcc-11)
-;;             ("openpmix", openpmix)
-;;             ("glicid-specific-openmpi", glicid-specific-openmpi)
-;                ,@(package-inputs slurm)
-;
-;   
-;  ))
-;;  (propagated-inputs
-;;     `(
-;;       ("sssd" ,sssd)
-;;        ))
-;  
-;))
-
-
 (define-public slurm-20.02-glicid
   (package 
     (inherit slurm-20.02)
@@ -125,11 +77,11 @@
         (method url-fetch)
         (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))
         (sha256 (base32 "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6"))
-   ))
+      )
-
+    )
-  (inputs `(("gtk+-2" ,gtk+-2) ;; for sview
+    (inputs `(
+      ("gtk+-2", gtk+-2)
       ,@(package-inputs slurm-20.02)
-
     ))
   )
 )
@@ -144,7 +96,9 @@
         (method url-fetch)
         (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))
         (sha256 (base32 "1fdjihg1x7ks5l77yjv14a4mg6r0v8c3zk1dcxkhrhq3n4dc9nbs"))
-   ))
+      )
-))
+    )
+  )
+)
 
 (define-public slurm-glicid slurm-20.02-glicid)

glicid/packages/ssh.scm

@@ -4,153 +4,38 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
-;  #:use-module (guix licenses)
-  #:use-module (gnu packages gawk)
-  #:use-module (gnu packages gcc)
-  #:use-module (gnu packages commencement)
-  #:use-module (guix build-system python)
   #:use-module ((guix licenses) #:prefix license:)
-  #:use-module ((guix utils) #:select (target-64bit?))
+  #:use-module (gnu packages ssh)
-  #:use-module (gnu packages)
+  #:use-module (gnu packages hurd)
-  #:use-module (gnu packages admin)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages freeipmi)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages mpi)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages parallel)
-  #:use-module (gnu packages storage)
-  #:use-module (gnu packages networking)
-  #:use-module (gnu packages gtk)  
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages python-science)
-  #:use-module (gnu packages python-web)
-  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages readline)
-  #:use-module (gnu packages tcl)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages commencement)
-  #:use-module (gnu packages gcc)
-  #:use-module (gnu packages chemistry)
-  #:use-module (gnu packages sphinx)
-  #:use-module (srfi srfi-1)
-  #:use-module (gnu packages mpi)
-  #:use-module (gnu packages sssd)
-  #:use-module (gnu packages fabric-management)
-  #:use-module (gnu packages benchmark)
-  #:use-module (gnu packages messaging)
-  #:use-module (gnu packages web)
-  #:use-module (gnu packages gnome)
-  #:use-module (gnu packages cluster)  
-  #:use-module (gnu packages libevent)
-  #:use-module (gnu packages xorg)
-  #:use-module (gnu packages fontutils)
-  #:use-module (gnu packages flex)
-  #:use-module (gnu packages bison)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages fontutils)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages maths)     
-  #:use-module (guix utils)
-  #:use-module (gnu packages cmake)
-  #:use-module  (gnu packages pretty-print)
-  #:use-module (gnu packages boost)
-  #:use-module (gnu packages curl)
-  #:use-module (gnu packages cryptsetup)
-  #:use-module (gnu packages xml)
-  #:use-module (gnu packages admin)
-  #:use-module (gnu packages assembly)
-  #:use-module (gnu packages authentication)
-  #:use-module (gnu packages bdw-gc)
-  #:use-module (gnu packages boost) 
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages crypto)
-  #:use-module (gnu packages cryptsetup)
-  #:use-module (gnu packages curl)
-  #:use-module (gnu packages databases)
-  #:use-module (gnu packages disk)
-  #:use-module (gnu packages gperf)
-  #:use-module (gnu packages jemalloc)
-  #:use-module (gnu packages linux)   
-  #:use-module (gnu packages lua)     
-  #:use-module (gnu packages ncurses) 
-  #:use-module (gnu packages networking)
-  #:use-module (gnu packages nss)
-  #:use-module (gnu packages openldap)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python)
+  #:use-module (gnu packages linux)
-  #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages sphinx)
-  #:use-module (gnu packages tls)   
-  #:use-module (gnu packages web)   
-;;  #:use-module (gnu packages glicid)
-  #:use-module (gnu packages pretty-print)
-  #:use-module (gnu packages virtualization)
-  #:use-module (glicid packages storage)
-  #:use-module (glicid packages mpi)
-  #:use-module (glicid packages gcc)
-  
 )
-
-
-;;;;;;;;
-
-
-
-
-(use-modules (guix packages))
-(use-modules (guix download))
-(use-modules (gnu packages linux))
-(use-modules (gnu packages gcc))
-;;(use-modules (gnu packages glicid))
-(use-modules (gnu packages ssh))
-(use-modules (gnu packages hurd))
-(use-modules (guix build-system gnu))
-(use-modules (guix build-system cmake))
-(use-modules (gnu packages compression))
-(use-modules (gnu packages crypto))
-(use-modules (gnu packages tls))
-;;(use-modules (gnu packages glicid))
-(use-modules (gnu packages pkg-config))
-
-
-(use-modules ((guix licenses) #:prefix license:))
-
-
 (define-public libcbor-0.8.0
   (package
     (name "libcbor")
     (version "0.8.0")
-(source 
+    (source 
       (origin
-
+        (method url-fetch)
-(method url-fetch)
+        (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
-              (uri (string-append
+        (sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))
-               "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
+      )
- (sha256
+    )
-               (base32
+    (build-system cmake-build-system)
-                "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))
+    (arguments
-
+      `(#:configure-flags (list
-))
+         "-DCMAKE_CXX_FLAGS=-fPIE"
-(build-system cmake-build-system)
+         "-DCMAKE_C_FLAGS=-fPIE"
-
+       ))
-(arguments
+    )
-  `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE"
+    (synopsis "libfido2")
-             "-DCMAKE_C_FLAGS=-fPIE")))
+    (description "Todo")
-
+    (home-page "toto")
-
+    (license license:gpl2+)
-(synopsis "libfido2")
+  )
-(description "Todo")
+)
-(home-page "toto")
-(license license:gpl2+)
-
-
-))
-
 
 (define-public libcbor-0.9.0
   (package
@@ -158,7 +43,6 @@
     (version "0.9.0")
     (source 
       (origin
-
         (method url-fetch)
         (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
         (sha256 (base32 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs"))
@@ -171,45 +55,33 @@
 
 (define-public libfido2-1.8.0
   (package
-
     (name "libfido2")
     (version "1.8.0")
     (source 
       (origin
-
+        (method url-fetch)
-(method url-fetch)
+        (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
-              (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-"
+        (sha256 (base32 "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
-                    version ".tar.gz"))
+      )
-;              (file-name (string-append name "-" version ".tar.gz"))
+    )
-              (sha256
-               (base32
-                "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
-
-
-   ))
-
     (build-system cmake-build-system)
-   (arguments '(#:tests? #f))
+    (arguments '(
-
+      #:tests? #f
-
+    ))
-(inputs `(
+    (inputs `(
       ("libcbor",libcbor-latest)
       ("openssl",openssl)
       ("zlib", zlib)
-          ("pkg-config", pkg-config) ; or cmake won't find zlib !
+      ("pkg-config", pkg-config)
       ("eudev", eudev)
-
     ))
-
+    (synopsis "libfido2")
-(synopsis "libfido2")
+    (description "Todo")
-(description "Todo")
+    (home-page "toto")
-(home-page "toto")
+    (license license:gpl2+)
-(license license:gpl2+)
+  )
 )
 
-)
-
-
 (define-public libfido2-1.9.0
   (package
     (inherit libfido2-1.8.0)
@@ -218,7 +90,6 @@
       (origin
         (method url-fetch)
         (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
-;    (file-name (string-append name "-" version ".tar.gz"))
         (sha256 (base32 "1ln2b0zfvl35r03kn2k1i2aw1k3ypvivc71xmp4dzlin6ypy6fds"))
       )
     )
@@ -231,92 +102,79 @@
   (package
     (inherit openssh)
     (name "openssh-with-fido2")
-(arguments
+    (arguments `(
-
+      #:test-target "tests"
-      `(#:test-target "tests"
       ;; Otherwise, the test scripts try to use a nonexistent directory and
       ;; fail.
       #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"")
-
+      #:configure-flags `(
-         #:configure-flags  `("--sysconfdir=/etc/ssh"
+        "--sysconfdir=/etc/ssh"
-
         ;; Default value of 'PATH' used by sshd.
         "--with-default-path=/run/current-system/profile/bin"
-
         ;; configure needs to find krb5-config.
-                          ,(string-append "--with-kerberos5="
+        ,(string-append "--with-kerberos5=" (assoc-ref %build-inputs "mit-krb5") "/bin")
-                                          (assoc-ref %build-inputs "mit-krb5")
-                                          "/bin")
-
         ;; libedit is needed for sftp completion.
         "--with-libedit"
         ;; for u2f
         "--with-security-key-builtin"
-;                          ,(string-append "--with-fido2=" (assoc-ref %build-inputs "libfido2"))
-
         ;; Enable PAM support in sshd.
         ,,@(if (hurd-target?)
           '()
-                               '("--with-pam"))
+          '("--with-pam")
-
+        )
         ;; "make install" runs "install -s" by default,
         ;; which doesn't work for cross-compiled binaries
         ;; because it invokes 'strip' instead of
-                          ;; 'TRIPLET-strip'.  Work around this.
+        ;; 'TRIPLET-strip'.Work around this.
         ,,@(if (%current-target-system)
           '("--disable-strip")
           '()
-))
+        )
-
+      )
-
+      #:phases
-#:phases
         (modify-phases %standard-phases
           (add-after 'configure 'reset-/var/empty
             (lambda* (#:key outputs #:allow-other-keys)
               (let ((out (assoc-ref outputs "out")))
-             (substitute* "Makefile"
+                (substitute*
-               (("PRIVSEP_PATH=/var/empty")
+                  "Makefile"
-                (string-append "PRIVSEP_PATH=" out "/var/empty")))
+                  (("PRIVSEP_PATH=/var/empty") (string-append "PRIVSEP_PATH=" out "/var/empty"))
-             #t)))
+                )
+                #t
+              )
+            )
+          )
           (add-before 'check 'patch-tests
             (lambda _
-           (substitute* "regress/test-exec.sh"
+              (substitute* "regress/test-exec.sh" (("/bin/sh") (which "sh")))
-             (("/bin/sh") (which "sh")))
-
               ;; Remove 't-exec' regress target which requires user 'sshd'.
-           (substitute* (list "Makefile"
+              (substitute*
-                              "regress/Makefile")
+                (list "Makefile" "regress/Makefile")
-             (("^(tests:.*) t-exec(.*)" all pre post)
+                (("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post))
-              (string-append pre post)))
+              )
-           #t))
+              #t
+            )
+          )
           (replace 'install
-         (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
+            (lambda*
+              (
+                #:key outputs (make-flags '())
+                #:allow-other-keys
+              )
               ;; Install without host keys and system configuration files.
               (apply invoke "make" "install-nosysconf" make-flags)
-           (install-file "contrib/ssh-copy-id"
+              (install-file "contrib/ssh-copy-id" (string-append (assoc-ref outputs "out") "/bin/"))
-                         (string-append (assoc-ref outputs "out")
+              (chmod (string-append (assoc-ref outputs "out") "/bin/ssh-copy-id") #o555)
-                                        "/bin/"))
+              (install-file "contrib/ssh-copy-id.1" (string-append (assoc-ref outputs "out") "/share/man/man1/"))
-           (chmod (string-append (assoc-ref outputs "out")
+              #t
-                                 "/bin/ssh-copy-id") #o555)
-           (install-file "contrib/ssh-copy-id.1"
-                         (string-append (assoc-ref outputs "out")
-                                        "/share/man/man1/"))
-           #t))) ; ))
-
-
-)
             )
-
+          )
-(inputs `(("libfido2", libfido2-latest)
+        )
+    ))
+    (inputs `(
+      ("libfido2", libfido2-latest)
       ("libcbor", libcbor-latest)
-      ,@(package-inputs openssh)))
+      ,@(package-inputs openssh)
-
+    ))
-
-
   )
-
-
 )
-
-
-;;; glicid/ssh.scm ends here

glicid/packages/virtualization.scm

@@ -2,49 +2,40 @@
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages virtualization)
-  #:use-module (gnu packages storage) ;; «regular» ceph is defined here
+  #:use-module (gnu packages storage)
-  #:use-module (glicid packages storage) ;; a «more up to date» version MAY be here
+  #:use-module (glicid packages storage)
 )
 
-;;;;;;;;
-
 (define-public qemu-with-rbd
-
   (package
     (inherit qemu) 
     (name "qemu-with-rbd")
     (arguments
-
+      (substitute-keyword-arguments `(
-     (substitute-keyword-arguments
+        #:tests? #f
-         `(#:tests? #f
+        ,@(package-arguments qemu)
-           ,@(package-arguments qemu)))
+      ))
     ) 
-
+    (inputs `(
-    (inputs `(("ceph:lib", ceph "lib" ) ;; will take the more up to date ceph
+      ("ceph:lib", ceph "lib")
-      ,@(package-inputs qemu)))
+      ,@(package-inputs qemu)
-
+    ))
   )
 )
 
 (define-public qemu-minimal-with-rbd
-
   (package
     (inherit qemu-minimal) 
     (name "qemu-minimal-with-rbd")
     (arguments
-
+      (substitute-keyword-arguments `(
-     (substitute-keyword-arguments
+        #:tests? #f
-         `(#:tests? #f
+        ,@(package-arguments qemu-minimal)
-           ,@(package-arguments qemu-minimal)))
+      ))
     ) 
-
+    (inputs `(
-    (inputs `(("ceph:lib", ceph "lib" ) ;; will take the more up to date ceph
+      ("ceph:lib", ceph "lib" )
-      ,@(package-inputs qemu-minimal)))
+      ,@(package-inputs qemu-minimal)
-
+    ))
   )
 )
-
-
-
-
-;;; glicid/virtualizationvirtualization.scm ends here