Merge branch 'devel' into 'main'

uncomment yade …

See merge request glicid-public/guix-glicid!244
This commit is contained in:
Yann Dupont 2023-03-28 13:31:39 +00:00
commit 89fd51dcff

View file

@ -49,87 +49,89 @@
(home-page "http://loki-lib.sourceforge.net/index.php?n=Main.HomePage") (home-page "http://loki-lib.sourceforge.net/index.php?n=Main.HomePage")
(license gpl3+))) (license gpl3+)))
;(define-public yade ;; was commented out… guix repl is ok… so uncomment right now
; (package
; (name "yade") (define-public yade
; (version "2022.01a") (package
; (source (origin (name "yade")
; (method url-fetch) (version "2022.01a")
; (uri (string-append (source (origin
; "https://gitlab.com/yade-dev/trunk/-/archive/2022.01a/trunk-" (method url-fetch)
; version ".tar.gz")) (uri (string-append
; (sha256 "https://gitlab.com/yade-dev/trunk/-/archive/2022.01a/trunk-"
; (base32 version ".tar.gz"))
; "0k4hnvi70cqzl0q54kkbij6jwxydhfwcacp9s49n3fkaf1dihxiv")))) (sha256
; (build-system cmake-build-system) (base32
; (arguments "0k4hnvi70cqzl0q54kkbij6jwxydhfwcacp9s49n3fkaf1dihxiv"))))
; `(#:configure-flags (list "-DENABLE_POTENTIAL_BLOCKS=OFF" (build-system cmake-build-system)
; (string-append "-DCMAKE_INSTALL_PREFIX=" (arguments
; (assoc-ref %outputs "out")) `(#:configure-flags (list "-DENABLE_POTENTIAL_BLOCKS=OFF"
; (string-append "-DQGLVIEWER_INCLUDE_DIR=" (string-append "-DCMAKE_INSTALL_PREFIX="
; (assoc-ref %build-inputs (assoc-ref %outputs "out"))
; "libqglviewer"))) (string-append "-DQGLVIEWER_INCLUDE_DIR="
; ;; (string-append "-DQGLVIEWER_INCLUDE_DIR=" (assoc-ref %build-inputs
; ;; libqglviewer)))) "libqglviewer")))
; #:phases (modify-phases %standard-phases ;; (string-append "-DQGLVIEWER_INCLUDE_DIR="
; (add-after 'unpack 'post-unpack ;; libqglviewer))))
; (lambda* (#:key outputs inputs #:allow-other-keys) #:phases (modify-phases %standard-phases
; (mkdir-p "./build") (add-after 'unpack 'post-unpack
; (chdir "./build"))) (lambda* (#:key outputs inputs #:allow-other-keys)
; (replace 'configure (mkdir-p "./build")
; (lambda* (#:key inputs outputs configure-flags (chdir "./build")))
; #:allow-other-keys) (replace 'configure
; (let ((out (assoc-ref outputs "out"))) (lambda* (#:key inputs outputs configure-flags
; (apply invoke "cmake" "../" configure-flags))))) #:allow-other-keys)
; #:tests? #f)) (let ((out (assoc-ref outputs "out")))
; ;; (lambda _ (invoke (apply invoke "cmake" "../" configure-flags)))))
; ;; "cmake" "../trunk" #:tests? #f))
; ;; configure-flags)))))) ;; (lambda _ (invoke
; (propagated-inputs `(("gdb" ,gdb) ;; "cmake" "../trunk"
; ("sqlite" ,sqlite) ;; configure-flags))))))
; ("openmpi" ,openmpi) (propagated-inputs `(("gdb" ,gdb)
; ("python" ,python) ("sqlite" ,sqlite)
; ("python-numpy" ,python-numpy) ("openmpi" ,openmpi)
; ("python-matplotlib" ,python-matplotlib) ("python" ,python)
; ("python-sphinx" ,python-sphinx) ("python-numpy" ,python-numpy)
; ("python-ipython" ,python-ipython) ("python-matplotlib" ,python-matplotlib)
; ("python-mpi4py" ,python-mpi4py) ("python-sphinx" ,python-sphinx)
; ("python-mpmath" ,python-mpmath) ("python-ipython" ,python-ipython)
; ("python-pygraphviz" ,python-pygraphviz) ("python-mpi4py" ,python-mpi4py)
; ("python-xlib" ,python-xlib) ("python-mpmath" ,python-mpmath)
; ("python-future" ,python-future) ("python-pygraphviz" ,python-pygraphviz)
; ("python-pyqt" ,python-pyqt) ("python-xlib" ,python-xlib)
; ("python-pyqtwebengine" ,python-pyqtwebengine) ("python-future" ,python-future)
; ("python-qtpy" ,python-qtpy))) ("python-pyqt" ,python-pyqt)
; (inputs `(("boost" ,boost) ("python-pyqtwebengine" ,python-pyqtwebengine)
; ("qtbase-5" ,qtbase-5) ("python-qtpy" ,python-qtpy)))
; ;; ("qt" ,qt) (inputs `(("boost" ,boost)
; ("freeglut" ,freeglut) ("qtbase-5" ,qtbase-5)
; ("gts" ,gts) ;; ("qt" ,qt)
; ("pkg-config" ,pkg-config) ("freeglut" ,freeglut)
; ("libqglviewer" ,libqglviewer) ("gts" ,gts)
; ("eigen" ,eigen) ("pkg-config" ,pkg-config)
; ;; ("loki" ,loki) ("libqglviewer" ,libqglviewer)
; ;; ("vtk" ,vtk) ("eigen" ,eigen)
; ("qtwebkit" ,qtwebkit) ;; ("loki" ,loki)
; ("openblas" ,openblas) ;; ("vtk" ,vtk)
; ("suitesparse" ,suitesparse) ("qtwebkit" ,qtwebkit)
; ("gcc-toolchain" ,gcc-toolchain) ("openblas" ,openblas)
; ("metis" ,metis) ("suitesparse" ,suitesparse)
; ("cgal" ,cgal) ("gcc-toolchain" ,gcc-toolchain)
; ("qtsvg" ,qtsvg) ("metis" ,metis)
; ("qtwebengine" ,qtwebengine) ("cgal" ,cgal)
; ("mpfr" ,mpfr))) ("qtsvg" ,qtsvg)
; ("qtwebengine" ,qtwebengine)
; (synopsis ("mpfr" ,mpfr)))
; "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method.")
; (description (synopsis
; "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method. The computation parts are written in c++ using flexible object model, allowing independent implementation of new algorithms and interfaces. Python is used for rapid and concise scene construction, simulation control, postprocessing and debugging.") "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method.")
; (home-page "https://www.yade-dem.org/") (description
; (license gpl3+))) "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method. The computation parts are written in c++ using flexible object model, allowing independent implementation of new algorithms and interfaces. Python is used for rapid and concise scene construction, simulation control, postprocessing and debugging.")
; (home-page "https://www.yade-dem.org/")
;(define-public yade-glicid-waves (license gpl3+)))
; (package
; (inherit (transform-package ((instead-of "openmpi-glicid-waves" openmpi) (define-public yade-glicid-waves
; yade) "waves")) (package
; (name "yade-glicid-waves"))) (inherit (transform-package ((instead-of "openmpi-glicid-waves" openmpi)
yade) "waves"))
(name "yade-glicid-waves")))