Skip to content
Snippets Groups Projects
Unverified Commit f972cc11 authored by Lars Bilke's avatar Lars Bilke
Browse files

[guix] Updated channel to build with cpardiso-support.

parent cdb32989
No related branches found
No related tags found
No related merge requests found
...@@ -25,9 +25,11 @@ build guix: ...@@ -25,9 +25,11 @@ build guix:
if [[ "$CI_MERGE_REQUEST_LABELS" =~ .*ci::guix\ only.* ]]; then if [[ "$CI_MERGE_REQUEST_LABELS" =~ .*ci::guix\ only.* ]]; then
guix time-machine -C scripts/guix/channels.scm -- build ogs-serial --with-source=ogs-serial=$PWD guix time-machine -C scripts/guix/channels.scm -- build ogs-serial --with-source=ogs-serial=$PWD
guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc --with-source=ogs-petsc=$PWD guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc --with-source=ogs-petsc=$PWD
guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc-mkl --with-source=ogs-petsc-mkl=$PWD --with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4 --without-tests=eigen --with-configure-flag=vtk=-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=OFF --with-source=vtk=https://www.vtk.org/files/release/9.3/VTK-9.3.1.tar.gz
else else
guix time-machine -C scripts/guix/channels.scm -- build ogs-ssd --with-source=ogs-ssd=$PWD guix time-machine -C scripts/guix/channels.scm -- build ogs-ssd --with-source=ogs-ssd=$PWD
guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc-ssd --with-source=ogs-petsc-ssd=$PWD guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc-ssd --with-source=ogs-petsc-ssd=$PWD
guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc-mkl-ssd --with-source=ogs-petsc-mkl-ssd=$PWD --with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4 --without-tests=eigen --with-configure-flag=vtk=-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=OFF --with-source=vtk=https://www.vtk.org/files/release/9.3/VTK-9.3.1.tar.gz
fi fi
deploy container: deploy container:
...@@ -51,7 +53,7 @@ deploy container: ...@@ -51,7 +53,7 @@ deploy container:
# keep vtk source parameter: default vtk 9.3.0 download misses # keep vtk source parameter: default vtk 9.3.0 download misses
# ThirdParty/eigen/vtkeigen subdirectory. Use explicit download # ThirdParty/eigen/vtkeigen subdirectory. Use explicit download
# from GitHub-tag. # from GitHub-tag.
GUIX_ARGS="--with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4 --without-tests=eigen --with-configure-flag=vtk=-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=OFF --with-source=vtk=https://github.com/Kitware/VTK/archive/refs/tags/v9.3.0.tar.gz" GUIX_ARGS="--with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4 --without-tests=eigen --with-configure-flag=vtk=-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=OFF --with-source=vtk=https://www.vtk.org/files/release/9.3/VTK-9.3.1.tar.gz"
fi fi
# Add openmpi package for mpirun # Add openmpi package for mpirun
if [[ "$GUIX_PACKAGE" =~ .*petsc.* ]]; then if [[ "$GUIX_PACKAGE" =~ .*petsc.* ]]; then
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
(name 'guix-ogs) (name 'guix-ogs)
(url "https://gitlab.opengeosys.org/ogs/inf/guix-ogs.git") (url "https://gitlab.opengeosys.org/ogs/inf/guix-ogs.git")
(branch "master") (branch "master")
(commit "fd7a63510cac0ab7b93b174098e77e118de524cb")) (commit "901d7522bfdb710814f26f7858fb55f57769371f"))
(channel (channel
(name 'guix) (name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git") (url "https://git.savannah.gnu.org/git/guix.git")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment