revert glicid.scm

glicid/packages/glicid.scm

@@ -4,10 +4,11 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
-  #:use-module (guix build-system python)
+;  #: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)
@@ -86,12 +87,19 @@
   #: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)
+  
 )
 
+
+;;;;;;;;
+
+
 (define-public glicid-librdkafka-09
  (package 
   (inherit librdkafka) 
@@ -102,10 +110,10 @@
     (method url-fetch)
     (uri (string-append "https://github.com/edenhill/librdkafka/archive/v" version ".tar.gz"))
     (sha256 (base32 "0938yn1msaq8xcj5z7b3jcdy6rslh9kxmvz01r8rdcgbarlvchy2"))
-      )
+   ))
-    )
+))
-  )
+
-)
+
 
 (define-public glicid-x2go
  (package 
@@ -116,14 +124,16 @@
     (method url-fetch)
     (uri (string-append "https://code.x2go.org/releases/source/x2goserver/x2goserver-" version ".tar.gz"))
     (sha256 (base32 "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7"))
-      )
+   ))
-    )
+
     (native-inputs
-      (autoconf automake libtool)
+     `(("autoconf" ,autoconf)
-    )
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
+
    (inputs
-      (perl)
+    `(("perl" , perl)))
-    )
+
    (build-system gnu-build-system)
    (synopsis "X2go")
    (description "X2go")
@@ -132,22 +142,19 @@
   )  
 )
 
+
 (define-public glicid-gromacs-openmpi
  (package
   (inherit gromacs)
   (name "glicid-gromacs-openmpi")
-    (inputs
+  (inputs `(("openmpi", openmpi)
-      `(
+   ;;         ("openssh", openssh) ;; only for tests... disabled now
-        ("openmpi", openmpi)
+                    ,@(package-inputs gromacs)))
-        ,@(package-inputs gromacs)
-      )
-    )
-  )
   (build-system cmake-build-system)
+
    (arguments
        `(#:configure-flags
-      (list
+         (list "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests
-        "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests
                ;; Unbundling
                "-DGMX_USE_LMFIT=EXTERNAL"
                "-DGMX_BUILD_OWN_FFTW=off"
@@ -163,11 +170,12 @@
 	       "-DGMX_DOUBLE=off"
 	       "-DGMX_OPENMP=on"
                "-DGMX_SIMD=AVX2_256"
-        (string-append "-DTinyXML2_DIR=" (assoc-ref %build-inputs "tinyxml2"))
+               (string-append "-DTinyXML2_DIR="
+                              (assoc-ref %build-inputs "tinyxml2"))
                ;; Workaround for cmake/FindSphinx.cmake version parsing that does
                ;; not understand the guix-wrapped `sphinx-build --version' answer
-        (string-append "-DSPHINX_EXECUTABLE_VERSION=",(package-version python-sphinx))
+               (string-append "-DSPHINX_EXECUTABLE_VERSION="
-      )
+                              ,(package-version python-sphinx)))
          #:tests? #f
          #:phases
          (modify-phases %standard-phases
@@ -187,17 +195,21 @@
                (delete-file-recursively "src/external/tng_io")
                (delete-file-recursively "src/external/tinyxml2")
                (delete-file-recursively "src/external/googletest")
-            (copy-recursively (assoc-ref inputs "googletest-source") "src/external/googletest")
+               (copy-recursively (assoc-ref inputs "googletest-source")
+                                 "src/external/googletest")
                ;; This test warns about the build host hardware, disable
-            (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp" (("TEST\\(HardwareTopologyTest, HwlocExecute\\)") "void __guix_disabled()"))
+               (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp"
-            #t
+                 (("TEST\\(HardwareTopologyTest, HwlocExecute\\)")
-          )
+                  "void __guix_disabled()"))
-        )
+               #t)))))
-      )
+
-    )
+
+
   )
+
 )
 
+
 (define-public glicid-python-nbxmpp
  (package 
   (inherit python-nbxmpp) 
@@ -207,24 +219,24 @@
      (origin
        (method url-fetch)
        (uri (pypi-uri "nbxmpp" version))
-        (sha256 (base32 "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr"))
+       (sha256
-      )
+        (base32
-    )
+         "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr"))))
-  )
+
-)
+))
 
 
 (define-public glicid-specific-hdf5
   (package
     (inherit hdf5-1.12)
     (name "glicid-specific-hdf5")
-    (native-inputs
+;    (arguments
-      `(
+;     `(#:tests? #f)
+;   )
+      (native-inputs `(
        ("gcc",gcc-11)
        ("gfortran",gfortran-11)
-        ,@(package-native-inputs hdf5-1.12)
+      ,@(package-native-inputs hdf5-1.12)))
-      )
-    )
   )
 )  
 
@@ -244,7 +256,9 @@
 
 (arguments
      `(#:make-flags
+;;	       #:make-flags
        (list (string-append "PREFIX=" %output)
+;             (string-append "CC=" ,(cc-for-target))
              ;; Xft.h #includes <ft2build.h> without ‘freetype2/’.  The Makefile
              ;; works around this by hard-coding /usr/include & $PREFIX.
              (string-append "CPPFLAGS=-I"
@@ -264,10 +278,12 @@
 	("flex" ,flex)
 	("bison" ,bison)
         ("libxt" ,libxt)))
+
   (synopsis "Motif")
     (description "Motif ")
     (home-page "https://sourceforge.net/untested")
     (license " ")
+
  )
 )
 
@@ -313,12 +329,16 @@
         ("fontconfig", fontconfig)
         ("gfortran", gfortran)
         ("libjpeg-turbo", libjpeg-turbo)
+;;        ("libxmhtml", libxmhtml)
        )
     )
+
+
    (synopsis "Xmgrace")
    (description "xmgrace")
    (home-page "https://sourceforge.net/untested")
    (license " ")
+
  )
 )
 
@@ -326,6 +346,9 @@
 (use-modules (guix download))
 (use-modules (gnu packages ruby))
 (use-modules (guix build-system ruby))
+;(use-modules (guix licenses))
+
+
 
 (define-public ruby-asciidoctor-revealjs
  (package
@@ -343,6 +366,7 @@
  '(#:tests? #f)) 
   (propagated-inputs
     `(("ruby-asciidoctor" ,ruby-asciidoctor)
+;      ("ruby-concurrent-ruby" ,ruby-concurrent-ruby)
        ("ruby-concurrent" ,ruby-concurrent)
        ("ruby-asciidoctor-kroki", ruby-asciidoctor-kroki)
       ("ruby-thread-safe" ,ruby-thread-safe)))
@@ -380,3 +404,7 @@
   (license license:expat)
 )
 )
+
+;; python-glances is now upstreamed as glances in python-xyz
+
+;;; glicid.scm ends here