Merge branch 'update-guix' into 'master'

[ci] Update guix channels. See merge request ogs/ogs!5031
ufz · Jun 28, 2024 · 0cb6faf · 0cb6faf
2 parents 15bd126 + fd40af3
commit 0cb6faf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/ci/jobs/build-guix.yml b/scripts/ci/jobs/build-guix.yml
@@ -48,7 +48,7 @@ deploy container:
     - guix describe
     - |
       if [[ "$GUIX_PACKAGE" =~ .*-mkl ]]; then
-        GUIX_ARGS="--with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4 --without-tests=eigen --with-configure-flag=vtk-9.3=-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=OFF"
+        GUIX_ARGS="--with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4 --without-tests=eigen --with-configure-flag=vtk=-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=OFF"
       fi
       # Add openmpi package for mpirun
       if [[ "$GUIX_PACKAGE" =~ .*petsc.* ]]; then

diff --git a/scripts/guix/channels.scm b/scripts/guix/channels.scm
@@ -2,13 +2,13 @@
         (name 'guix-ogs)
         (url "https://gitlab.opengeosys.org/ogs/inf/guix-ogs.git")
         (branch "master")
-        (commit "ccd0acb89265cc743c534bd6326cb76ed802e732"))
+        (commit "bbe79135fb4d6d18f3bb3ba7a3b627ffb20c5b24"))
       (channel
         (name 'guix)
         (url "https://git.savannah.gnu.org/git/guix.git")
         (branch "master")
         (commit
-          "51de844a0ff6ea224367a384092896bce6848b9f")
+          "78b881722f08325c76096557313a0faee847c66f")
         (introduction
           (make-channel-introduction
             "cdf1d7dded027019f0ebbd5d6f0147b13dfdd28d"