diff --git a/glicid/packages/science.scm b/glicid/packages/science.scm index 1c86e7e..7347da2 100644 --- a/glicid/packages/science.scm +++ b/glicid/packages/science.scm @@ -49,87 +49,89 @@ (home-page "http://loki-lib.sourceforge.net/index.php?n=Main.HomePage") (license gpl3+))) -;(define-public yade -; (package -; (name "yade") -; (version "2022.01a") -; (source (origin -; (method url-fetch) -; (uri (string-append -; "https://gitlab.com/yade-dev/trunk/-/archive/2022.01a/trunk-" -; version ".tar.gz")) -; (sha256 -; (base32 -; "0k4hnvi70cqzl0q54kkbij6jwxydhfwcacp9s49n3fkaf1dihxiv")))) -; (build-system cmake-build-system) -; (arguments -; `(#:configure-flags (list "-DENABLE_POTENTIAL_BLOCKS=OFF" -; (string-append "-DCMAKE_INSTALL_PREFIX=" -; (assoc-ref %outputs "out")) -; (string-append "-DQGLVIEWER_INCLUDE_DIR=" -; (assoc-ref %build-inputs -; "libqglviewer"))) -; ;; (string-append "-DQGLVIEWER_INCLUDE_DIR=" -; ;; libqglviewer)))) -; #:phases (modify-phases %standard-phases -; (add-after 'unpack 'post-unpack -; (lambda* (#:key outputs inputs #:allow-other-keys) -; (mkdir-p "./build") -; (chdir "./build"))) -; (replace 'configure -; (lambda* (#:key inputs outputs configure-flags -; #:allow-other-keys) -; (let ((out (assoc-ref outputs "out"))) -; (apply invoke "cmake" "../" configure-flags))))) -; #:tests? #f)) -; ;; (lambda _ (invoke -; ;; "cmake" "../trunk" -; ;; configure-flags)))))) -; (propagated-inputs `(("gdb" ,gdb) -; ("sqlite" ,sqlite) -; ("openmpi" ,openmpi) -; ("python" ,python) -; ("python-numpy" ,python-numpy) -; ("python-matplotlib" ,python-matplotlib) -; ("python-sphinx" ,python-sphinx) -; ("python-ipython" ,python-ipython) -; ("python-mpi4py" ,python-mpi4py) -; ("python-mpmath" ,python-mpmath) -; ("python-pygraphviz" ,python-pygraphviz) -; ("python-xlib" ,python-xlib) -; ("python-future" ,python-future) -; ("python-pyqt" ,python-pyqt) -; ("python-pyqtwebengine" ,python-pyqtwebengine) -; ("python-qtpy" ,python-qtpy))) -; (inputs `(("boost" ,boost) -; ("qtbase-5" ,qtbase-5) -; ;; ("qt" ,qt) -; ("freeglut" ,freeglut) -; ("gts" ,gts) -; ("pkg-config" ,pkg-config) -; ("libqglviewer" ,libqglviewer) -; ("eigen" ,eigen) -; ;; ("loki" ,loki) -; ;; ("vtk" ,vtk) -; ("qtwebkit" ,qtwebkit) -; ("openblas" ,openblas) -; ("suitesparse" ,suitesparse) -; ("gcc-toolchain" ,gcc-toolchain) -; ("metis" ,metis) -; ("cgal" ,cgal) -; ("qtsvg" ,qtsvg) -; ("qtwebengine" ,qtwebengine) -; ("mpfr" ,mpfr))) -; -; (synopsis -; "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method.") -; (description -; "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/") -; (license gpl3+))) -; -;(define-public yade-glicid-waves -; (package -; (inherit (transform-package ((instead-of "openmpi-glicid-waves" openmpi) -; yade) "waves")) -; (name "yade-glicid-waves"))) +;; was commented out… guix repl is ok… so uncomment right now + +(define-public yade + (package + (name "yade") + (version "2022.01a") + (source (origin + (method url-fetch) + (uri (string-append + "https://gitlab.com/yade-dev/trunk/-/archive/2022.01a/trunk-" + version ".tar.gz")) + (sha256 + (base32 + "0k4hnvi70cqzl0q54kkbij6jwxydhfwcacp9s49n3fkaf1dihxiv")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DENABLE_POTENTIAL_BLOCKS=OFF" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out")) + (string-append "-DQGLVIEWER_INCLUDE_DIR=" + (assoc-ref %build-inputs + "libqglviewer"))) + ;; (string-append "-DQGLVIEWER_INCLUDE_DIR=" + ;; libqglviewer)))) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'post-unpack + (lambda* (#:key outputs inputs #:allow-other-keys) + (mkdir-p "./build") + (chdir "./build"))) + (replace 'configure + (lambda* (#:key inputs outputs configure-flags + #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (apply invoke "cmake" "../" configure-flags))))) + #:tests? #f)) + ;; (lambda _ (invoke + ;; "cmake" "../trunk" + ;; configure-flags)))))) + (propagated-inputs `(("gdb" ,gdb) + ("sqlite" ,sqlite) + ("openmpi" ,openmpi) + ("python" ,python) + ("python-numpy" ,python-numpy) + ("python-matplotlib" ,python-matplotlib) + ("python-sphinx" ,python-sphinx) + ("python-ipython" ,python-ipython) + ("python-mpi4py" ,python-mpi4py) + ("python-mpmath" ,python-mpmath) + ("python-pygraphviz" ,python-pygraphviz) + ("python-xlib" ,python-xlib) + ("python-future" ,python-future) + ("python-pyqt" ,python-pyqt) + ("python-pyqtwebengine" ,python-pyqtwebengine) + ("python-qtpy" ,python-qtpy))) + (inputs `(("boost" ,boost) + ("qtbase-5" ,qtbase-5) + ;; ("qt" ,qt) + ("freeglut" ,freeglut) + ("gts" ,gts) + ("pkg-config" ,pkg-config) + ("libqglviewer" ,libqglviewer) + ("eigen" ,eigen) + ;; ("loki" ,loki) + ;; ("vtk" ,vtk) + ("qtwebkit" ,qtwebkit) + ("openblas" ,openblas) + ("suitesparse" ,suitesparse) + ("gcc-toolchain" ,gcc-toolchain) + ("metis" ,metis) + ("cgal" ,cgal) + ("qtsvg" ,qtsvg) + ("qtwebengine" ,qtwebengine) + ("mpfr" ,mpfr))) + + (synopsis + "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method.") + (description + "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/") + (license gpl3+))) + +(define-public yade-glicid-waves + (package + (inherit (transform-package ((instead-of "openmpi-glicid-waves" openmpi) + yade) "waves")) + (name "yade-glicid-waves")))